diff --git a/src/sbbs3/js_file.c b/src/sbbs3/js_file.c index 494ced3ef1768c995e2eda23c32125c3b06aca05..22ff044ee5aec3f86604171322ade8cb78d2c7c9 100644 --- a/src/sbbs3/js_file.c +++ b/src/sbbs3/js_file.c @@ -445,7 +445,7 @@ static jsval get_value(JSContext *cx, char* value) static JSBool js_iniGetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { - char* section=NULL; + char* section=ROOT_SECTION; char* key; char** list; char buf[INI_MAX_VALUE_LEN]; @@ -511,7 +511,7 @@ js_iniGetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva static JSBool js_iniSetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { - char* section=NULL; + char* section=ROOT_SECTION; char* key; char* result=NULL; int32 i; @@ -607,7 +607,7 @@ js_iniGetSections(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * static JSBool js_iniGetKeys(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { - char* section=NULL; + char* section=ROOT_SECTION; char** list; jsint i; jsval val; @@ -641,7 +641,7 @@ js_iniGetKeys(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval static JSBool js_iniGetObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { - char* section=NULL; + char* section=ROOT_SECTION; jsint i; JSObject* object; private_t* p; diff --git a/src/xpdev/ini_file.c b/src/xpdev/ini_file.c index 5db98336c9865b10dd31adb2cee64e00e2ec8dc0..f141e932c94797367fdc6f1e8c90f394c22be61e 100644 --- a/src/xpdev/ini_file.c +++ b/src/xpdev/ini_file.c @@ -86,7 +86,7 @@ static BOOL find_section(FILE* fp, const char* section) rewind(fp); - if(section==NULL) + if(section==ROOT_SECTION) return(TRUE); while(!feof(fp)) { @@ -106,7 +106,7 @@ static size_t find_section_index(str_list_t list, const char* section) char str[INI_MAX_VALUE_LEN]; size_t i; - if(section==NULL) + if(section==ROOT_SECTION) return(0); for(i=0; list[i]!=NULL; i++) { @@ -198,7 +198,7 @@ size_t iniAddSection(str_list_t* list, const char* section char str[INI_MAX_LINE_LEN]; size_t i; - if(section==NULL) + if(section==ROOT_SECTION) return(0); i=find_section_index(*list, section); diff --git a/src/xpdev/ini_file.h b/src/xpdev/ini_file.h index d650c84a8221838926c350e90aac74116ff81789..992edfb8382d82a73d32bebd212f9f046f88fb42 100644 --- a/src/xpdev/ini_file.h +++ b/src/xpdev/ini_file.h @@ -42,6 +42,7 @@ #include "str_list.h" /* strList_t */ #define INI_MAX_VALUE_LEN 1024 /* Maximum value length, includes '\0' */ +#define ROOT_SECTION NULL typedef struct { ulong bit;