Commit 8d03d6b5 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

remove newline from Warning calls

parent 01664144
......@@ -2108,7 +2108,7 @@ void gridChangeType(int gridID, int gridtype)
grid_check_ptr(gridID, gridptr);
Message("Changed grid type from %s to %s\n",
Message("Changed grid type from %s to %s",
gridNamePtr(gridptr->type),
gridNamePtr(gridtype));
......
......@@ -1292,7 +1292,7 @@ void cdfDefXaxis(int streamID, int gridID)
gridInqXstdname(gridID, stdname);
gridInqXunits(gridID, units);
if ( axisname[0] == 0 ) Error("axis name undefined!\n");
if ( axisname[0] == 0 ) Error("axis name undefined!");
for ( index = 0; index < ngrids; index++ )
{
......@@ -1420,7 +1420,7 @@ void cdfDefYaxis(int streamID, int gridID)
gridInqYstdname(gridID, stdname);
gridInqYunits(gridID, units);
if ( axisname[0] == 0 ) Error("axis name undefined!\n");
if ( axisname[0] == 0 ) Error("axis name undefined!");
for ( index = 0; index < ngrids; index++ )
{
......@@ -4308,7 +4308,7 @@ void scanVarAttributes(int fileID, int nvars, ncvar_t *ncvars, ncdim_t *ncdims,
/*
if ( atttype != NC_BYTE && atttype != NC_SHORT && atttype != NC_INT )
if ( ncvars[ncvarid].addoffset != 0 )
Warning("attribute add_offset not supported for atttype %d\n", atttype);
Warning("attribute add_offset not supported for atttype %d", atttype);
*/
cdfSetVar(ncvars, ncvarid, TRUE);
}
......@@ -4321,7 +4321,7 @@ void scanVarAttributes(int fileID, int nvars, ncvar_t *ncvars, ncdim_t *ncdims,
/*
if ( atttype != NC_BYTE && atttype != NC_SHORT && atttype != NC_INT )
if ( ncvars[ncvarid].scalefactor != 1 )
Warning("attribute scale_factor not supported for atttype %d\n", atttype);
Warning("attribute scale_factor not supported for atttype %d", atttype);
*/
cdfSetVar(ncvars, ncvarid, TRUE);
}
......@@ -6610,7 +6610,7 @@ void cdfDefVars(int streamID)
vlistID = streamInqVlist(streamID);
if ( vlistID == UNDEFID )
Error("Internal problem! vlist undefined for streamID %d\n", streamID);
Error("Internal problem! vlist undefined for streamID %d", streamID);
nvars = vlistNvars(vlistID);
ngrids = vlistNgrids(vlistID);
......
......@@ -1128,7 +1128,7 @@ int cgribexScanTimestep(int streamID)
rstatus = gribRead(fileID, gribbuffer, &readsize);
if ( rstatus )
{
Error("Inconsistent timestep %d (GRIB record %d/%d)!\n", tsID+1, rindex+1,
Error("Inconsistent timestep %d (GRIB record %d/%d)!", tsID+1, rindex+1,
streamptr->tsteps[tsID].recordSize);
break;
}
......@@ -1311,7 +1311,7 @@ int cgribexScanTimestep(int streamID)
if ( nrecs > 0 && nrecs < streamptr->tsteps[tsID].nrecs )
{
Warning("Incomplete timestep. Stop scanning at timestep %d.\n", tsID);
Warning("Incomplete timestep. Stop scanning at timestep %d.", tsID);
streamptr->ntsteps = tsID;
}
......@@ -1369,13 +1369,13 @@ int cgribexDecode(unsigned char *gribbuffer, int gribsize, double *data, int gri
gribsize = gribUnzip(gribbuffer, unzipsize, itmpbuffer, gribsize);
if ( gribsize <= 0 )
Error("Decompression problem!\n");
Error("Decompression problem!");
free(itmpbuffer);
}
else
{
Error("Decompression for %d not implemented!\n", izip);
Error("Decompression for %d not implemented!", izip);
}
}
......@@ -1889,7 +1889,7 @@ void cgribexDefLevel(int *isec1, int *isec2, double *fsec2, int zaxisID, int lev
if ( zaxistype == ZAXIS_GENERIC && ltype == 0 )
{
Message("Changed zaxis type from %s to %s\n",
Message("Changed zaxis type from %s to %s",
zaxisNamePtr(zaxistype),
zaxisNamePtr(ZAXIS_PRESSURE));
zaxistype = ZAXIS_PRESSURE;
......
......@@ -806,7 +806,7 @@ int extScanTimestep(int streamID)
if ( nrecs > 0 && nrecs < streamptr->tsteps[tsID].nrecs )
{
Warning("Incomplete timestep. Stop scanning at timestep %d.\n", tsID);
Warning("Incomplete timestep. Stop scanning at timestep %d.", tsID);
streamptr->ntsteps = tsID;
}
......
......@@ -1494,7 +1494,7 @@ int gribapiScanTimestep(int streamID)
rstatus = gribRead(fileID, gribbuffer, &readsize);
if ( rstatus )
{
Error("Inconsistent timestep %d (GRIB record %d/%d)!\n", tsID+1, rindex+1,
Error("Inconsistent timestep %d (GRIB record %d/%d)!", tsID+1, rindex+1,
streamptr->tsteps[tsID].recordSize);
break;
}
......@@ -1728,7 +1728,7 @@ int gribapiScanTimestep(int streamID)
if ( nrecs > 0 && nrecs < streamptr->tsteps[tsID].nrecs )
{
Warning("Incomplete timestep. Stop scanning at timestep %d.\n", tsID);
Warning("Incomplete timestep. Stop scanning at timestep %d.", tsID);
streamptr->ntsteps = tsID;
}
......@@ -1758,7 +1758,7 @@ int gribapiDecode(unsigned char *gribbuffer, int gribsize, double *data, int gri
if ( lwarn )
{
lwarn = 0;
Warning("Conversion of gaussian reduced grids unsupported!\n");
Warning("Conversion of gaussian reduced grids unsupported!");
}
}
......@@ -1775,7 +1775,7 @@ int gribapiDecode(unsigned char *gribbuffer, int gribsize, double *data, int gri
// printf("values_size = %d numberOfPoints = %ld\n", datasize, numberOfPoints);
if ( gridsize != (int) datasize )
Error("Internal problem: gridsize(%d) != datasize(%d)!\n", gridsize, datasize);
Error("Internal problem: gridsize(%d) != datasize(%d)!", gridsize, datasize);
dummy = datasize;
GRIB_CHECK(grib_get_double_array(gh, "values", data, &dummy), 0);
......@@ -1862,7 +1862,7 @@ void gribapiDefParam(grib_handle *gh, int param, const char *name)
len = strlen(name);
status = grib_set_string(gh, "shortName", name, &len);
if ( status != 0 )
Warning("grib_api: No match for shortName=%s\n", name);
Warning("grib_api: No match for shortName=%s", name);
}
else
{
......@@ -2339,7 +2339,7 @@ void gribapiDefLevel(grib_handle *gh, int param, int zaxisID, int levelID)
if ( zaxistype == ZAXIS_GENERIC && ltype == 0 )
{
Message("Changed zaxis type from %s to %s\n",
Message("Changed zaxis type from %s to %s",
zaxisNamePtr(zaxistype),
zaxisNamePtr(ZAXIS_PRESSURE));
zaxistype = ZAXIS_PRESSURE;
......
......@@ -375,7 +375,7 @@ void iegDefLevel(int *pdb, int *gdb, double *vct, int zaxisID, int levelID)
if ( leveltype == ZAXIS_GENERIC )
{
Message("Changed zaxis type from %s to %s\n",
Message("Changed zaxis type from %s to %s",
zaxisNamePtr(leveltype),
zaxisNamePtr(ZAXIS_PRESSURE));
leveltype = ZAXIS_PRESSURE;
......@@ -1326,7 +1326,7 @@ int iegScanTimestep(int streamID)
if ( nrecs > 0 && nrecs < streamptr->tsteps[tsID].nrecs )
{
Warning("Incomplete timestep. Stop scanning at timestep %d.\n", tsID);
Warning("Incomplete timestep. Stop scanning at timestep %d.", tsID);
streamptr->ntsteps = tsID;
}
......
......@@ -809,7 +809,7 @@ int srvScanTimestep(int streamID)
if ( nrecs > 0 && nrecs < streamptr->tsteps[tsID].nrecs )
{
Warning("Incomplete timestep. Stop scanning at timestep %d.\n", tsID);
Warning("Incomplete timestep. Stop scanning at timestep %d.", tsID);
streamptr->ntsteps = tsID;
}
......
......@@ -690,7 +690,7 @@ int vlistInqVarID(int vlistID, int code)
if ( varID == vlistptr->nvars )
{
/*
Warning("varID not found for param %d\n", param);
Warning("varID not found for param %d", param);
*/
varID = CDI_UNDEFID;
}
......
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