E CVS: e kwo

[enlightenment-cvs]

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        econfig.c 


Log Message:
Avoid confusion with edb. Fix null string item problem.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/econfig.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- econfig.c   19 Mar 2005 16:40:01 -0000      1.4
+++ econfig.c   24 Mar 2005 08:37:27 -0000      1.5
@@ -44,7 +44,7 @@
 #define E_DB_File ECfgFile
 
 static ECfgFile    *
-e_db_open(const char *name)
+e16_db_open(const char *name)
 {
    ECfgFile           *ecf;
    FILE               *fs;
@@ -66,7 +66,7 @@
 }
 
 static ECfgFile    *
-e_db_open_read(const char *name)
+e16_db_open_read(const char *name)
 {
    ECfgFile           *ecf;
    FILE               *fs;
@@ -111,7 +111,7 @@
 }
 
 static void
-e_db_close(ECfgFile * ecf)
+e16_db_close(ECfgFile * ecf)
 {
    int                 i;
 
@@ -130,7 +130,7 @@
 }
 
 static void
-e_db_flush(void)
+e16_db_flush(void)
 {
 }
 
@@ -147,7 +147,7 @@
 }
 
 static int
-e_db_int_get(ECfgFile * ecf, const char *key, int *pint)
+e16_db_int_get(ECfgFile * ecf, const char *key, int *pint)
 {
    const char         *value;
 
@@ -162,7 +162,7 @@
 }
 
 static int
-e_db_float_get(ECfgFile * ecf, const char *key, float *pflt)
+e16_db_float_get(ECfgFile * ecf, const char *key, float *pflt)
 {
    const char         *value;
 
@@ -177,7 +177,7 @@
 }
 
 static char        *
-e_db_str_get(ECfgFile * ecf, const char *key)
+e16_db_str_get(ECfgFile * ecf, const char *key)
 {
    const char         *value;
 
@@ -189,21 +189,21 @@
 }
 
 static void
-e_db_int_set(ECfgFile * ecf, const char *key, int value)
+e16_db_int_set(ECfgFile * ecf, const char *key, int value)
 {
    fprintf(ecf->fs, "%s = %d\n", key, value);
 }
 
 static void
-e_db_float_set(ECfgFile * ecf, const char *key, float value)
+e16_db_float_set(ECfgFile * ecf, const char *key, float value)
 {
    fprintf(ecf->fs, "%s = %f\n", key, value);
 }
 
 static void
-e_db_str_set(ECfgFile * ecf, const char *key, const char *value)
+e16_db_str_set(ECfgFile * ecf, const char *key, const char *value)
 {
-   fprintf(ecf->fs, "%s = %s\n", key, value);
+   fprintf(ecf->fs, "%s = %s\n", key, (value) ? value : "");
 }
 
 /*
@@ -233,22 +233,22 @@
    switch (ci->type)
      {
      case ITEM_TYPE_BOOL:
-       if (!edf || !e_db_int_get(edf, name, &my_int))
+       if (!edf || !e16_db_int_get(edf, name, &my_int))
           my_int = (ci->dflt) ? 1 : 0;
        *((char *)ci->ptr) = my_int;
        break;
      case ITEM_TYPE_INT:
-       if (!edf || !e_db_int_get(edf, name, &my_int))
+       if (!edf || !e16_db_int_get(edf, name, &my_int))
           my_int = ci->dflt;
        *((int *)ci->ptr) = my_int;
        break;
      case ITEM_TYPE_FLOAT:
-       if (!edf || !e_db_float_get(edf, name, &my_float))
+       if (!edf || !e16_db_float_get(edf, name, &my_float))
           my_float = ci->dflt;
        *((float *)ci->ptr) = my_float;
        break;
      case ITEM_TYPE_STRING:
-       s = (edf) ? e_db_str_get(edf, name) : NULL;
+       s = (edf) ? e16_db_str_get(edf, name) : NULL;
        *((char **)ci->ptr) = s;
        break;
      }
@@ -275,19 +275,17 @@
    switch (ci->type)
      {
      case ITEM_TYPE_BOOL:
-       e_db_int_set(edf, name, *((char *)ci->ptr));
+       e16_db_int_set(edf, name, *((char *)ci->ptr));
        break;
      case ITEM_TYPE_INT:
-       e_db_int_set(edf, name, *((int *)ci->ptr));
+       e16_db_int_set(edf, name, *((int *)ci->ptr));
        break;
      case ITEM_TYPE_FLOAT:
-       e_db_float_set(edf, name, *((float *)ci->ptr));
+       e16_db_float_set(edf, name, *((float *)ci->ptr));
        break;
      case ITEM_TYPE_STRING:
        s = *(char **)(ci->ptr);
-       if (!s)
-          break;
-       e_db_str_set(edf, name, s);
+       e16_db_str_set(edf, name, s);
        break;
      }
 }
@@ -310,7 +308,7 @@
 
    memset(&Conf, 0, sizeof(EConf));
 
-   edf = e_db_open_read(ConfigurationGetFile(buf, sizeof(buf)));
+   edf = e16_db_open_read(ConfigurationGetFile(buf, sizeof(buf)));
    /* NB! We have to assign the defaults even if it doesn't exist */
 
    /* Load module configs */
@@ -326,7 +324,7 @@
    ModuleListFree(pml);
 
    if (edf)
-      e_db_close(edf);
+      e16_db_close(edf);
 }
 
 void
@@ -338,7 +336,7 @@
    char                buf[4096];
    E_DB_File          *edf;
 
-   edf = e_db_open(ConfigurationGetFile(buf, sizeof(buf)));
+   edf = e16_db_open(ConfigurationGetFile(buf, sizeof(buf)));
    if (edf == NULL)
       return;
 
@@ -354,8 +352,8 @@
      }
    ModuleListFree(pml);
 
-   e_db_close(edf);
-   e_db_flush();
+   e16_db_close(edf);
+   e16_db_flush();
 }
 
 const CfgItem      *




-------------------------------------------------------
This SF.net email is sponsored by Microsoft Mobile & Embedded DevCon 2005
Attend MEDC 2005 May 9-12 in Vegas. Learn more about the latest Windows
Embedded(r) & Windows Mobile(tm) platforms, applications & content.  Register
by 3/29 & save $300 http://ads.osdn.com/?ad_id=6883&alloc_id=15149&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs