From af6c5795db5c0d12fd001a39dec10839d3b9a1c9 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 16 Jun 2004 02:11:33 +0000
Subject: [PATCH] #define ROOT_SECTION NULL
---
src/sbbs3/js_file.c | 8 ++++----
src/xpdev/ini_file.c | 6 +++---
src/xpdev/ini_file.h | 1 +
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/sbbs3/js_file.c b/src/sbbs3/js_file.c
index 494ced3ef1..22ff044ee5 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 5db98336c9..f141e932c9 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 d650c84a82..992edfb838 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;
--
GitLab