# HG changeset patch # User Nina Engelhardt # Date 1314619051 -7200 # Node ID e5c04a3a2610466eaa836be41d81ed54e44b8aed # Parent cf0a327945e66689ced24f03a7bc719ec1d14a37 slightly more verbose error message diff -r cf0a327945e6 -r e5c04a3a2610 Param.h --- a/Param.h Sat Sep 11 08:14:47 2010 -0700 +++ b/Param.h Mon Aug 29 13:57:31 2011 +0200 @@ -1,56 +1,56 @@ -/* - * - * Author: SeanHalle@yahoo.com - * - * Created on November 19, 2009, 6:30 PM - */ - -#ifndef _PARAM_H -#define _PARAM_H - -typedef -struct - { int type; - int intValue; - char * strValue; - float floatValue; - } -ParamStruc; - -#define INT_PARAM_TYPE 0 -#define STRING_PARAM_TYPE 1 -#define FLOAT_PARAM_TYPE 2 - -#define PARAM_BAG_HASHSIZE 1024 - -typedef struct _ParamBagHashEntry ParamBagHashEntry; - -struct _ParamBagHashEntry - { - char *key; - ParamStruc *param; - struct _ParamBagHashEntry *next; - } -/*ParamBagHashEntry*/; - - -typedef -struct - { int bagSz; - ParamBagHashEntry* *entries; - } -ParamBag; - - -ParamBag *makeParamBag(); -void readParamFileIntoBag( char *paramFileName, ParamBag * bag ); -ParamStruc *getParamFromBag( char *key, ParamBag * bag ); -int addParamToBag( char* key, ParamStruc *param, ParamBag *bag ); -void freeParamBag( ParamBag *bag ); -//char *paramBagToString( ParamBag * bag ); -ParamStruc *makeParamStruc(); -ParamStruc *makeParamFromStrs( char * type, char *value ); -ssize_t getline( char **lineptr, size_t *n, FILE *stream ); - -#endif /* _PARAM_H */ - +/* + * + * Author: SeanHalle@yahoo.com + * + * Created on November 19, 2009, 6:30 PM + */ + +#ifndef _PARAM_H +#define _PARAM_H + +typedef +struct + { int type; + int intValue; + char * strValue; + float floatValue; + } +ParamStruc; + +#define INT_PARAM_TYPE 0 +#define STRING_PARAM_TYPE 1 +#define FLOAT_PARAM_TYPE 2 + +#define PARAM_BAG_HASHSIZE 1024 + +typedef struct _ParamBagHashEntry ParamBagHashEntry; + +struct _ParamBagHashEntry + { + char *key; + ParamStruc *param; + struct _ParamBagHashEntry *next; + } +/*ParamBagHashEntry*/; + + +typedef +struct + { int bagSz; + ParamBagHashEntry* *entries; + } +ParamBag; + + +ParamBag *makeParamBag(); +void readParamFileIntoBag( char *paramFileName, ParamBag * bag ); +ParamStruc *getParamFromBag( char *key, ParamBag * bag ); +int addParamToBag( char* key, ParamStruc *param, ParamBag *bag ); +void freeParamBag( ParamBag *bag ); +//char *paramBagToString( ParamBag * bag ); +ParamStruc *makeParamStruc(); +ParamStruc *makeParamFromStrs( char * type, char *value ); +ssize_t getline( char **lineptr, size_t *n, FILE *stream ); + +#endif /* _PARAM_H */ + diff -r cf0a327945e6 -r e5c04a3a2610 ReadParamsFromFile.c --- a/ReadParamsFromFile.c Sat Sep 11 08:14:47 2010 -0700 +++ b/ReadParamsFromFile.c Mon Aug 29 13:57:31 2011 +0200 @@ -51,7 +51,8 @@ paramFile = fopen( paramFileName, "r" ); - if( paramFile == NULL ) {printf("\ncouldn't open file\n"); exit(0);} + if( paramFile == NULL ) + { printf("\ncouldn't open param file: %s\n", paramFileName); exit(0); } fseek( paramFile, 0, SEEK_SET ); while( !feof( paramFile ) ) { while( getline( &line, &lineSz, paramFile ) != -1 )