Commit 406e7976 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Fix typo.

parent 88c4ea3d
Pipeline #4665 passed with stages
in 16 minutes and 39 seconds
......@@ -233,7 +233,7 @@ zaxis_read_attributes(size_t natts, size_t nkv, KVMap *kvmap, int zaxisID)
{
for (int n = 0; n < num_rkeys; ++n)
if (key == reserved_keys[n])
cdoAbort("Found reserved key word >%s< in attribute names! Check name or position of >%s<.", key.c_str(), attkey0);
cdoAbort("Found reserved keyword >%s< in attribute names! Check name or position of >%s<.", key.c_str(), attkey0);
}
const auto dtype = literalsFindDatatype(nvalues, values);
......@@ -277,11 +277,11 @@ zaxisFromFile(FILE *zfp, const char *filename)
for (auto &kv : kvlist)
{
if (ik == 0 && kv.key != firstKey)
cdoAbort("First zaxis description key word must be >%s< (found: %s)!", firstKey, kv.key.c_str());
cdoAbort("First zaxis description keyword must be >%s< (found: %s)!", firstKey, kv.key.c_str());
if (kv.nvalues == 0)
{
cdoWarning("Z-axis description key word %s has no values, skipped!", kv.key.c_str());
cdoWarning("Z-axis description keyword %s has no values, skipped!", kv.key.c_str());
}
else
{
......
......@@ -247,7 +247,7 @@ grid_read_data(size_t ikv, size_t nkv, KVMap *kvmap, GridDesciption &grid, size_
break;
}
else
cdoAbort("Invalid key word >%s< (grid description file: %s)", key.c_str(), dname);
cdoAbort("Invalid keyword >%s< (grid description file: %s)", key.c_str(), dname);
// clang-format on
}
}
......@@ -315,11 +315,11 @@ grid_read(FILE *gfp, const char *dname)
for (auto &kv : kvlist)
{
if (ik == 0 && kv.key != firstKey)
cdoAbort("First grid description key word must be >%s< (found: %s)!", firstKey, kv.key.c_str());
cdoAbort("First grid description keyword must be >%s< (found: %s)!", firstKey, kv.key.c_str());
if (kv.nvalues == 0)
{
cdoWarning("Grid description key word %s has no values, skipped!", kv.key.c_str());
cdoWarning("Grid description keyword %s has no values, skipped!", kv.key.c_str());
}
else
{
......
......@@ -77,10 +77,10 @@ main(int argc, char *argv[])
fprintf(stderr, "Namelist error: End of string not found in %s (line=%u)!\n", filename, p.lineno);
break;
case NamelistError::INKEY:
fprintf(stderr, "Namelist error: Invalid key word in %s (line=%u)!\n", filename, p.lineno);
fprintf(stderr, "Namelist error: Invalid keyword in %s (line=%u)!\n", filename, p.lineno);
break;
case NamelistError::INTYP:
fprintf(stderr, "Namelist error: Invalid key word type in %s (line=%u)!\n", filename, p.lineno);
fprintf(stderr, "Namelist error: Invalid keyword type in %s (line=%u)!\n", filename, p.lineno);
break;
case NamelistError::INOBJ: fprintf(stderr, "Namelist error: Invalid object in %s (line=%u)!\n", filename, p.lineno); break;
case NamelistError::EMKEY: fprintf(stderr, "Namelsit error: Emtry key name in %s (line=%u)!\n", filename, p.lineno); break;
......
......@@ -312,8 +312,8 @@ parseListBuffer(NamelistParser &p, ListBuffer &listBuffer)
listBuffer.buffer[p.pos], (unsigned char)listBuffer.buffer[p.pos]);
break;
case NamelistError::PART: fprintf(stderr, "%s: End of string not found in %s (line=%d)!\n", errMsg, name, p.lineno); break;
case NamelistError::INKEY: fprintf(stderr, "%s: Invalid key word in %s (line=%d)!\n", errMsg, name, p.lineno); break;
case NamelistError::INTYP: fprintf(stderr, "%s: Invalid key word type in %s (line=%d)!\n", errMsg, name, p.lineno); break;
case NamelistError::INKEY: fprintf(stderr, "%s: Invalid keyword in %s (line=%d)!\n", errMsg, name, p.lineno); break;
case NamelistError::INTYP: fprintf(stderr, "%s: Invalid keyword type in %s (line=%d)!\n", errMsg, name, p.lineno); break;
case NamelistError::INOBJ: fprintf(stderr, "%s: Invalid object in %s (line=%d)!\n", errMsg, name, p.lineno); break;
case NamelistError::EMKEY: fprintf(stderr, "%s: Empty key name in %s (line=%d)!\n", errMsg, name, p.lineno); break;
default: fprintf(stderr, "%s in %s (line=%d)!\n", errMsg, name, p.lineno); break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment