changeset 4:e5c04a3a2610

slightly more verbose error message
author Nina Engelhardt
date Mon, 29 Aug 2011 13:57:31 +0200
parents cf0a327945e6
children a8744027c1a9
files Param.h ReadParamsFromFile.c
diffstat 2 files changed, 58 insertions(+), 57 deletions(-) [+]
line diff
     1.1 --- a/Param.h	Sat Sep 11 08:14:47 2010 -0700
     1.2 +++ b/Param.h	Mon Aug 29 13:57:31 2011 +0200
     1.3 @@ -1,56 +1,56 @@
     1.4 -/* 
     1.5 - * 
     1.6 - * Author: SeanHalle@yahoo.com
     1.7 - *
     1.8 - * Created on November 19, 2009, 6:30 PM
     1.9 - */
    1.10 -
    1.11 -#ifndef _PARAM_H
    1.12 -#define	_PARAM_H
    1.13 -
    1.14 -typedef
    1.15 -struct
    1.16 - { int type;
    1.17 -   int intValue;
    1.18 -   char * strValue;
    1.19 -   float floatValue;
    1.20 - }
    1.21 -ParamStruc;
    1.22 -
    1.23 -#define INT_PARAM_TYPE    0
    1.24 -#define STRING_PARAM_TYPE 1
    1.25 -#define FLOAT_PARAM_TYPE  2
    1.26 -
    1.27 -#define PARAM_BAG_HASHSIZE 1024
    1.28 -
    1.29 -typedef struct _ParamBagHashEntry ParamBagHashEntry;
    1.30 -
    1.31 -struct _ParamBagHashEntry
    1.32 - {
    1.33 -   char       *key;
    1.34 -   ParamStruc *param;
    1.35 -   struct _ParamBagHashEntry *next;
    1.36 - }
    1.37 -/*ParamBagHashEntry*/;
    1.38 -
    1.39 -
    1.40 -typedef
    1.41 -struct
    1.42 - { int bagSz;
    1.43 -   ParamBagHashEntry* *entries;
    1.44 - }
    1.45 -ParamBag;
    1.46 -
    1.47 -
    1.48 -ParamBag    *makeParamBag();
    1.49 -void         readParamFileIntoBag( char *paramFileName, ParamBag * bag );
    1.50 -ParamStruc  *getParamFromBag( char *key, ParamBag * bag );
    1.51 -int          addParamToBag( char* key, ParamStruc *param, ParamBag *bag );
    1.52 -void         freeParamBag( ParamBag *bag );
    1.53 -//char        *paramBagToString( ParamBag * bag );
    1.54 -ParamStruc  *makeParamStruc();
    1.55 -ParamStruc  *makeParamFromStrs( char * type, char *value );
    1.56 -ssize_t      getline( char **lineptr, size_t *n, FILE *stream );
    1.57 -
    1.58 -#endif	/* _PARAM_H */
    1.59 -
    1.60 +/* 
    1.61 + * 
    1.62 + * Author: SeanHalle@yahoo.com
    1.63 + *
    1.64 + * Created on November 19, 2009, 6:30 PM
    1.65 + */
    1.66 +
    1.67 +#ifndef _PARAM_H
    1.68 +#define	_PARAM_H
    1.69 +
    1.70 +typedef
    1.71 +struct
    1.72 + { int type;
    1.73 +   int intValue;
    1.74 +   char * strValue;
    1.75 +   float floatValue;
    1.76 + }
    1.77 +ParamStruc;
    1.78 +
    1.79 +#define INT_PARAM_TYPE    0
    1.80 +#define STRING_PARAM_TYPE 1
    1.81 +#define FLOAT_PARAM_TYPE  2
    1.82 +
    1.83 +#define PARAM_BAG_HASHSIZE 1024
    1.84 +
    1.85 +typedef struct _ParamBagHashEntry ParamBagHashEntry;
    1.86 +
    1.87 +struct _ParamBagHashEntry
    1.88 + {
    1.89 +   char       *key;
    1.90 +   ParamStruc *param;
    1.91 +   struct _ParamBagHashEntry *next;
    1.92 + }
    1.93 +/*ParamBagHashEntry*/;
    1.94 +
    1.95 +
    1.96 +typedef
    1.97 +struct
    1.98 + { int bagSz;
    1.99 +   ParamBagHashEntry* *entries;
   1.100 + }
   1.101 +ParamBag;
   1.102 +
   1.103 +
   1.104 +ParamBag    *makeParamBag();
   1.105 +void         readParamFileIntoBag( char *paramFileName, ParamBag * bag );
   1.106 +ParamStruc  *getParamFromBag( char *key, ParamBag * bag );
   1.107 +int          addParamToBag( char* key, ParamStruc *param, ParamBag *bag );
   1.108 +void         freeParamBag( ParamBag *bag );
   1.109 +//char        *paramBagToString( ParamBag * bag );
   1.110 +ParamStruc  *makeParamStruc();
   1.111 +ParamStruc  *makeParamFromStrs( char * type, char *value );
   1.112 +ssize_t      getline( char **lineptr, size_t *n, FILE *stream );
   1.113 +
   1.114 +#endif	/* _PARAM_H */
   1.115 +
     2.1 --- a/ReadParamsFromFile.c	Sat Sep 11 08:14:47 2010 -0700
     2.2 +++ b/ReadParamsFromFile.c	Mon Aug 29 13:57:31 2011 +0200
     2.3 @@ -51,7 +51,8 @@
     2.4     
     2.5     
     2.6     paramFile = fopen( paramFileName, "r" );
     2.7 -   if( paramFile == NULL ) {printf("\ncouldn't open file\n"); exit(0);}
     2.8 +   if( paramFile == NULL ) 
     2.9 +    { printf("\ncouldn't open param file: %s\n", paramFileName); exit(0); }
    2.10     fseek( paramFile, 0, SEEK_SET );
    2.11     while( !feof( paramFile ) )
    2.12      { while( getline( &line, &lineSz, paramFile ) != -1 )