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

file.c: remove declaration of getpagesize

parent 4bc2d503
2006-08-?? Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* file.c: remove declaration of getpagesize (report: Mark Hadfield)
* tableWrite: bug fix for undefined strings
* Version 1.0.1 released
2006-06-15 Uwe Schulzweida <schulzweida@dkrz.de>
* using GRIB library version 1.0.0
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for cdi 1.0.0.
# Generated by GNU Autoconf 2.59 for cdi 1.0.1.
#
# Report bugs to <Uwe.Schulzweida@zmaw.de>.
#
......@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.0.0'
PACKAGE_STRING='cdi 1.0.0'
PACKAGE_VERSION='1.0.1'
PACKAGE_STRING='cdi 1.0.1'
PACKAGE_BUGREPORT='Uwe.Schulzweida@zmaw.de'
# Factoring default headers for most tests.
......@@ -795,7 +795,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.0.0 to adapt to many kinds of systems.
\`configure' configures cdi 1.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -862,7 +862,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.0.0:";;
short | recursive ) echo "Configuration of cdi 1.0.1:";;
esac
cat <<\_ACEOF
......@@ -1006,7 +1006,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.0.0
cdi configure 1.0.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
......@@ -1020,7 +1020,7 @@ cat >&5 <<_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.0.0, which was
It was created by cdi $as_me 1.0.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
......@@ -1707,7 +1707,7 @@ fi
# Define the identity of the package.
PACKAGE=cdi
VERSION=1.0.0
VERSION=1.0.1
cat >>confdefs.h <<_ACEOF
......@@ -6400,7 +6400,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by cdi $as_me 1.0.0, which was
This file was extended by cdi $as_me 1.0.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -6463,7 +6463,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
cdi config.status 1.0.0
cdi config.status 1.0.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
......
# Process this file with autoconf to produce a configure script.
AC_INIT(cdi, 1.0.0, Uwe.Schulzweida@zmaw.de)
AC_INIT(cdi, 1.0.1, Uwe.Schulzweida@zmaw.de)
CONFIG_ABORT=yes
......
......@@ -11,9 +11,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
int getpagesize(void);
/*
size_t getpagesize(void);
*/
#include "dmemory.h"
#include "error.h"
#include "file.h"
......
......@@ -156,7 +156,7 @@ void cdiInitialize(void)
if ( envString ) cdiDefaultMissval = atof(envString);
envString = getenv("NC_MISSING_VALUE");
if ( envString ) cdiNcMissingValue = atof(envString);
if ( envString ) cdiNcMissingValue = atoi(envString);
}
}
......
......@@ -577,6 +577,7 @@ void tableWrite(const char *ptfile, int tableID)
FILE *ptfp;
int tablenum, modelID, instID = CDI_UNDEFID;
int center = 0, subcenter = 0;
char *name, *longname, *units;
char *instnameptr = NULL, *modelnameptr = NULL;
if ( CDI_Debug )
......@@ -596,12 +597,23 @@ void tableWrite(const char *ptfile, int tableID)
for ( item = 0; item < npars; item++)
{
lenname = strlen(parTable[tableID].pars[item].name);
lenlname = strlen(parTable[tableID].pars[item].longname);
lenunits = strlen(parTable[tableID].pars[item].units);
if ( lenname > maxname ) maxname = lenname;
if ( lenlname > maxlname ) maxlname = lenlname;
if ( lenunits > maxunits ) maxunits = lenunits;
if ( parTable[tableID].pars[item].name )
{
lenname = strlen(parTable[tableID].pars[item].name);
if ( lenname > maxname ) maxname = lenname;
}
if ( parTable[tableID].pars[item].longname )
{
lenlname = strlen(parTable[tableID].pars[item].longname);
if ( lenlname > maxlname ) maxlname = lenlname;
}
if ( parTable[tableID].pars[item].units )
{
lenunits = strlen(parTable[tableID].pars[item].units);
if ( lenunits > maxunits ) maxunits = lenunits;
}
}
tablenum = tableInqNum(tableID);
......@@ -647,14 +659,17 @@ void tableWrite(const char *ptfile, int tableID)
for ( item = 0; item < npars; item++)
{
name = parTable[tableID].pars[item].name;
longname = parTable[tableID].pars[item].longname;
units = parTable[tableID].pars[item].units;
if ( name == NULL ) name = " ";
if ( longname == NULL ) longname = " ";
if ( units == NULL ) units = " ";
fprintf(ptfp, "%4d | %-*s | %-*s | %-*s\n",
parTable[tableID].pars[item].id,
maxname,
parTable[tableID].pars[item].name,
maxlname,
parTable[tableID].pars[item].longname,
maxunits,
parTable[tableID].pars[item].units);
maxname, name,
maxlname, longname,
maxunits, units);
}
fclose(ptfp);
......@@ -689,18 +704,23 @@ void tableWriteC(const char *filename, int tableID)
for ( item = 0; item < npars; item++)
{
lenname = strlen(parTable[tableID].pars[item].name);
if ( parTable[tableID].pars[item].name )
{
lenname = strlen(parTable[tableID].pars[item].name);
if ( lenname > maxname ) maxname = lenname;
}
if ( parTable[tableID].pars[item].longname )
lenlname = strlen(parTable[tableID].pars[item].longname);
else
lenlname = 0;
{
lenlname = strlen(parTable[tableID].pars[item].longname);
if ( lenlname > maxlname ) maxlname = lenlname;
}
if ( parTable[tableID].pars[item].units )
lenunits = strlen(parTable[tableID].pars[item].units);
else
lenunits = 0;
if ( lenname > maxname ) maxname = lenname;
if ( lenlname > maxlname ) maxlname = lenlname;
if ( lenunits > maxunits ) maxunits = lenunits;
{
lenunits = strlen(parTable[tableID].pars[item].units);
if ( lenunits > maxunits ) maxunits = lenunits;
}
}
strcpy(tablename, parTable[tableID].name);
......
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