Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/src Modified Files: Tag: branch-exp econfig.c Log Message: No longer necessary to wrap edb functions. =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/Attic/econfig.c,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -3 -r1.1.2.6 -r1.1.2.7 --- econfig.c 24 Aug 2004 23:37:52 -0000 1.1.2.6 +++ econfig.c 2 Sep 2004 21:43:49 -0000 1.1.2.7 @@ -27,16 +27,6 @@ #include <Edb.h> -/* Work around missing const in API */ -#define eX_db_int_get(edf, name, ptr) e_db_int_get(edf, (char*)name, ptr) -#define eX_db_float_get(edf, name, ptr) e_db_float_get(edf, (char*)name, ptr) -#define eX_db_str_get(edf, name) e_db_str_get(edf, (char*)name) -#define eX_db_int_set(edf, name, val) e_db_int_set(edf, (char*)name, val) -#define eX_db_float_set(edf, name, val) e_db_float_set(edf, (char*)name, val) -#define eX_db_str_set(edf, name, val) e_db_str_set(edf, (char*)name, val) -#define eX_db_open_read(file) e_db_open_read((char*)file) -#define eX_db_open(file) e_db_open((char*)file) - static void CfgItemLoad(E_DB_File * edf, const char *prefix, const CfgItem * ci) { @@ -56,22 +46,22 @@ switch (ci->type) { case ITEM_TYPE_BOOL: - if (!edf || !eX_db_int_get(edf, name, &my_int)) + if (!edf || !e_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 || !eX_db_int_get(edf, name, &my_int)) + if (!edf || !e_db_int_get(edf, name, &my_int)) my_int = ci->dflt; *((int *)ci->ptr) = my_int; break; case ITEM_TYPE_FLOAT: - if (!edf || !eX_db_float_get(edf, name, &my_float)) + if (!edf || !e_db_float_get(edf, name, &my_float)) my_float = ci->dflt; *((float *)ci->ptr) = my_float; break; case ITEM_TYPE_STRING: - *((char **)ci->ptr) = (edf) ? eX_db_str_get(edf, name) : NULL; + *((char **)ci->ptr) = (edf) ? e_db_str_get(edf, name) : NULL; break; } } @@ -93,16 +83,16 @@ switch (ci->type) { case ITEM_TYPE_BOOL: - eX_db_int_set(edf, name, *((char *)ci->ptr)); + e_db_int_set(edf, name, *((char *)ci->ptr)); break; case ITEM_TYPE_INT: - eX_db_int_set(edf, name, *((int *)ci->ptr)); + e_db_int_set(edf, name, *((int *)ci->ptr)); break; case ITEM_TYPE_FLOAT: - eX_db_float_set(edf, name, *((float *)ci->ptr)); + e_db_float_set(edf, name, *((float *)ci->ptr)); break; case ITEM_TYPE_STRING: - eX_db_str_set(edf, name, ci->ptr); + e_db_str_set(edf, name, ci->ptr); break; } } @@ -125,7 +115,7 @@ memset(&Conf, 0, sizeof(EConf)); - edf = eX_db_open_read(ConfigurationGetFile(buf, sizeof(buf))); + edf = e_db_open_read(ConfigurationGetFile(buf, sizeof(buf))); /* NB! We have to assign the defaults even if it doesn't exist */ /* Load module configs */ @@ -153,7 +143,7 @@ char buf[4096]; E_DB_File *edf; - edf = eX_db_open(ConfigurationGetFile(buf, sizeof(buf))); + edf = e_db_open(ConfigurationGetFile(buf, sizeof(buf))); if (edf == NULL) return; ------------------------------------------------------- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click _______________________________________________ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs