Skip to content

GitLab

Commit f1501c05 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

convert param to string for prints

parent 7b08cf44
Hide whitespace changes
Inline Side-by-side
configure
View file @ f1501c05
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for cdi 1.4.1.3.
# Generated by GNU Autoconf 2.61 for cdi 1.4.1.4.
#
# Report bugs to <Uwe.Schulzweida@zmaw.de>.
#
......@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.4.1.3'
PACKAGE_STRING='cdi 1.4.1.3'
PACKAGE_VERSION='1.4.1.4'
PACKAGE_STRING='cdi 1.4.1.4'
PACKAGE_BUGREPORT='Uwe.Schulzweida@zmaw.de'
# Factoring default headers for most tests.
......@@ -1258,7 +1258,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures cdi 1.4.1.3 to adapt to many kinds of systems.
\`configure' configures cdi 1.4.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1329,7 +1329,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.4.1.3:";;
short | recursive ) echo "Configuration of cdi 1.4.1.4:";;
esac
cat <<\_ACEOF
......@@ -1462,7 +1462,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.4.1.3
cdi configure 1.4.1.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1476,7 +1476,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by cdi $as_me 1.4.1.3, which was
It was created by cdi $as_me 1.4.1.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -2303,7 +2303,7 @@ fi
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.4.1.3'
VERSION='1.4.1.4'
cat >>confdefs.h <<_ACEOF
......@@ -9031,7 +9031,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by cdi $as_me 1.4.1.3, which was
This file was extended by cdi $as_me 1.4.1.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -9084,7 +9084,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
cdi config.status 1.4.1.3
cdi config.status 1.4.1.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
configure.ac
View file @ f1501c05
# Process this file with autoconf to produce a configure script.
AC_INIT(cdi, 1.4.1.3, Uwe.Schulzweida@zmaw.de)
AC_INIT(cdi, 1.4.1.4, Uwe.Schulzweida@zmaw.de)
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
......
src/stream_cgribex.c
View file @ f1501c05
......@@ -658,7 +658,9 @@ void cgribexScanTimestep1(int streamID)
if ( warn_time )
if ( memcmp(&datetime, &datetime0, sizeof(DateTime)) != 0 )
{
Warning(func, "Inconsistent verification time (param %d level %d)", param, level1);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "Inconsistent verification time (param=%s level=%d)", paramstr, level1);
warn_time = FALSE;
}
}
......@@ -668,7 +670,9 @@ void cgribexScanTimestep1(int streamID)
if ( recID < nrecs )
{
Warning(func, "Param %d level %d already exist, skipped!", param, level1);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "Param=%s level=%d already exist, skipped!", paramstr, level1);
continue;
}
}
......@@ -931,7 +935,9 @@ int cgribexScanTimestep2(int streamID)
if ( recID == nrecords )
{
Warning(func, "Param %d level %d not defined at timestep 1!", param, level1);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "Param=%s level=%d not defined at timestep 1!", paramstr, level1);
return (CDI_EUFSTRUCT);
}
......@@ -951,9 +957,12 @@ int cgribexScanTimestep2(int streamID)
{
if ( streamptr->tsteps[tsID].records[recID].used )
{
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
if ( memcmp(&datetime, &datetime0, sizeof(DateTime)) != 0 ) break;
Warning(func, "Param %d level %d already exist, skipped!", param, level1);
Warning(func, "Param=%s level=%d already exist, skipped!", paramstr, level1);
continue;
}
else
......@@ -1204,7 +1213,9 @@ int cgribexScanTimestep(int streamID)
if ( vrecID == nrecs )
{
Warning(func, "Param %d level %d not available at timestep %d!", param, level1, tsID+1);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "Param=%s level=%d not available at timestep %d!", paramstr, level1, tsID+1);
if ( cdiInventoryMode == 1 )
return (CDI_EUFSTRUCT);
......@@ -1221,10 +1232,13 @@ int cgribexScanTimestep(int streamID)
{
if ( streamptr->tsteps[tsID].records[recID].used )
{
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
if ( memcmp(&datetime, &datetime0, sizeof(DateTime)) != 0 ) break;
if ( CDI_Debug )
Warning(func, "Param %d level %d already exist, skipped!", param, level1);
Warning(func, "Param=%s level=%d already exist, skipped!", paramstr, level1);
continue;
}
......@@ -1269,10 +1283,10 @@ int cgribexScanTimestep(int streamID)
if ( vrecID < nrecs )
{
Warning(func, "Param %d level %d not found at timestep %d!",
streamptr->tsteps[tsID].records[recID].param,
streamptr->tsteps[tsID].records[recID].ilevel,
tsID+1);
char paramstr[32];
cdiParamToString(streamptr->tsteps[tsID].records[recID].param, paramstr, sizeof(paramstr));
Warning(func, "Param=%s level=%d not found at timestep %d!",
paramstr, streamptr->tsteps[tsID].records[recID].ilevel, tsID+1);
return (CDI_EUFSTRUCT);
}
......@@ -1439,7 +1453,9 @@ void cgribexDefParam(int *isec1, int param, int tabnum)
if ( pdis != 255 && lwarn )
{
Warning(func, "Can not convert GRIB2 parameter number (%d) to GRIB1", param);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "Can not convert GRIB2 parameter (%s) to GRIB1!", paramstr);
lwarn = FALSE;
}
......
src/stream_gribapi.c
View file @ f1501c05
......@@ -754,7 +754,9 @@ void gribapiScanTimestep1(int streamID)
if ( warn_time )
if ( memcmp(&datetime, &datetime0, sizeof(DateTime)) != 0 )
{
Warning(func, "Inconsistent verification time (param %d level %d)", param, level1);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "Inconsistent verification time (param=%s level=%d)", paramstr, level1);
warn_time = FALSE;
}
}
......@@ -764,7 +766,9 @@ void gribapiScanTimestep1(int streamID)
if ( recID < nrecs )
{
Warning(func, "Param %d level %d already exist, skipped!", param, level1);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "Param=%s level=%d already exist, skipped!", paramstr, level1);
continue;
}
}
......@@ -1083,7 +1087,9 @@ int gribapiScanTimestep2(int streamID)
if ( recID == nrecords )
{
Warning(func, "Param %d level %d not found at timestep %d!", param, level1, tsID+1);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "Param=%s level=%d not defined at timestep 1!", param, level1);
return (CDI_EUFSTRUCT);
}
......@@ -1103,9 +1109,12 @@ int gribapiScanTimestep2(int streamID)
{
if ( streamptr->tsteps[tsID].records[recID].used )
{
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
if ( memcmp(&datetime, &datetime0, sizeof(DateTime)) != 0 ) break;
Warning(func, "Param %d level %d already exist, skipped!", param, level1);
Warning(func, "Param=%s level=%d already exist, skipped!", paramstr, level1);
continue;
}
else
......@@ -1414,7 +1423,9 @@ int gribapiScanTimestep(int streamID)
if ( vrecID == nrecs )
{
Warning(func, "Param %d level %d not available at timestep %d!", param, level1, tsID+1);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "Param=%s level=%d not available at timestep %d!", paramstr, level1, tsID+1);
if ( cdiInventoryMode == 1 )
return (CDI_EUFSTRUCT);
......@@ -1431,10 +1442,13 @@ int gribapiScanTimestep(int streamID)
{
if ( streamptr->tsteps[tsID].records[recID].used )
{
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
if ( memcmp(&datetime, &datetime0, sizeof(DateTime)) != 0 ) break;
if ( CDI_Debug )
Warning(func, "Param %d level %d already exist, skipped!", param, level1);
Warning(func, "Param=%s level=%d already exist, skipped!", paramstr, level1);
continue;
}
......@@ -1479,10 +1493,10 @@ int gribapiScanTimestep(int streamID)
if ( vrecID < nrecs )
{
char paramstr[32];
cdiParamToString(streamptr->tsteps[tsID].records[recID].param, paramstr, sizeof(paramstr));
Warning(func, "Param %d level %d not found at timestep %d!",
streamptr->tsteps[tsID].records[recID].param,
streamptr->tsteps[tsID].records[recID].ilevel,
tsID+1);
paramstr, streamptr->tsteps[tsID].records[recID].ilevel, tsID+1);
return (CDI_EUFSTRUCT);
}
......@@ -1918,7 +1932,9 @@ void gribapiDefLevel(grib_handle *gh, int param, int zaxisID, int levelID)
vctsize = zaxisInqVctSize(zaxisID);
if ( vctsize == 0 && warning )
{
Warning(func, "VCT missing. ( param = %d, zaxisID = %d )", param, zaxisID);
char paramstr[32];
cdiParamToString(param, paramstr, sizeof(paramstr));
Warning(func, "VCT missing ( param = %s, zaxisID = %d )", paramstr, zaxisID);
warning = 0;
}
GRIB_CHECK(grib_set_long(gh, "PVPresent", 1), 0);
......
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

Imprint | Privacy Policy