X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=11946c38a4f619986b1dca5152528608cedbf716;hb=6630f5b4dc744c984086bc9dd8f8b17303fa39f6;hp=202d35129ab9c1da8bbbb3c66fe57f255d199ecc;hpb=b9bbdf9c3eb24d29c3181c693204d7cb790bc318;p=idzebra-moved-to-github.git

diff --git a/util/res.c b/util/res.c
index 202d351..11946c3 100644
--- a/util/res.c
+++ b/util/res.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994-1998, Index Data ApS
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.23  1998-10-28 15:18:55  adam
+ * Revision 1.26  1999-10-07 09:48:36  adam
+ * Allow res_get / res_get_def with NULL res.
+ *
+ * Revision 1.25  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.24  1999/02/02 14:51:42  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.23  1998/10/28 15:18:55  adam
  * Fix for DOS-formatted configuration files.
  *
  * Revision 1.22  1998/01/12 15:04:32  adam
@@ -79,7 +88,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -93,10 +102,11 @@ static struct res_entry *add_entry (Res r)
     struct res_entry *resp;
 
     if (!r->first)
-        resp = r->last = r->first = xmalloc (sizeof(*resp));
+        resp = r->last = r->first =
+	    (struct res_entry *) xmalloc (sizeof(*resp));
     else
     {
-        resp = xmalloc (sizeof(*resp));
+        resp = (struct res_entry *) xmalloc (sizeof(*resp));
         r->last->next = resp;
         r->last = resp;
     }
@@ -116,7 +126,7 @@ static void reread (Res r)
     assert (r);
     r->init = 1;
 
-    val_buf = xmalloc (val_max);
+    val_buf = (char*) xmalloc (val_max);
 
     fr = fopen (r->name, "r");
     if (!fr)
@@ -138,7 +148,7 @@ static void reread (Res r)
             fr_buf[no] = '\0';
 
             resp = add_entry (r);
-            resp->name = xmalloc (no+1);
+            resp->name = (char*) xmalloc (no+1);
             resp->value = NULL;
             strcpy (resp->name, fr_buf);
         }
@@ -160,7 +170,7 @@ static void reread (Res r)
                 continue;
             fr_buf[no++] = '\0';
             resp = add_entry (r);
-            resp->name = xmalloc (no);
+            resp->name = (char*) xmalloc (no);
             strcpy (resp->name, fr_buf);
             
             while (strchr (" \t", fr_buf[no]))
@@ -175,7 +185,7 @@ static void reread (Res r)
                                val_buf[val_size-1] == '\t'))
                         val_size--;
                     val_buf[val_size++] = '\0';
-                    resp->value = xmalloc (val_size);
+                    resp->value = (char*) xmalloc (val_size);
                     strcpy (resp->value, val_buf);
                     logf (LOG_DEBUG, "(name=%s,value=%s)",
                          resp->name, resp->value);
@@ -186,7 +196,7 @@ static void reread (Res r)
                     line = fgets (fr_buf, sizeof(fr_buf)-1, fr);
                     if (!line)
                     {
-                        resp->value = xmalloc (val_size);
+                        resp->value = (char*) xmalloc (val_size);
                         strcpy (resp->value, val_buf);
                         break;
                     }
@@ -199,7 +209,7 @@ static void reread (Res r)
                     {
                         char *nb;
 
-                        nb = xmalloc (val_max+=1024);
+                        nb = (char*) xmalloc (val_max+=1024);
                         memcpy (nb, val_buf, val_size);
                         xfree (val_buf);
                         val_buf = nb;
@@ -215,7 +225,7 @@ static void reread (Res r)
 Res res_open (const char *name)
 {
     Res r;
-#ifdef WINDOWS
+#ifdef WIN32
     if (access (name, 4))
 #else
     if (access (name, R_OK))
@@ -224,7 +234,7 @@ Res res_open (const char *name)
         logf (LOG_LOG|LOG_ERRNO, "Cannot access resource file `%s'", name);
 	return NULL;
     }
-    r = xmalloc (sizeof(*r));
+    r = (Res) xmalloc (sizeof(*r));
     r->init = 0;
     r->first = r->last = NULL;
     r->name = xstrdup (name);
@@ -255,7 +265,8 @@ char *res_get (Res r, const char *name)
 {
     struct res_entry *re;
 
-    assert (r);
+    if (!r)
+	return NULL;
     if (!r->init)
         reread (r);
     for (re = r->first; re; re=re->next)