diff options
Diffstat (limited to 'preference/preference.c')
| -rwxr-xr-x | preference/preference.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/preference/preference.c b/preference/preference.c index 4e26dca..558faf4 100755 --- a/preference/preference.c +++ b/preference/preference.c @@ -139,7 +139,7 @@ static inline void _preference_keynode_set_value_string(keynode_t *keynode, cons keynode->value.s = strdup(value); } -inline keynode_t *_preference_keynode_new(void) +__attribute__ ((gnu_inline)) inline keynode_t *_preference_keynode_new(void) { keynode_t *keynode; keynode = calloc(1, sizeof(keynode_t)); @@ -147,7 +147,7 @@ inline keynode_t *_preference_keynode_new(void) return keynode; } -inline void _preference_keynode_free(keynode_t *keynode) +__attribute__ ((gnu_inline)) inline void _preference_keynode_free(keynode_t *keynode) { if (keynode) { if (keynode->keyname) @@ -1307,8 +1307,7 @@ API int preference_remove_all(void) int err_retry = PREFERENCE_ERROR_RETRY_CNT; int func_ret = PREFERENCE_ERROR_NONE; DIR *dir; - struct dirent dent; - struct dirent *result = NULL; + struct dirent *dent = NULL; char *pref_dir_path = NULL; char err_buf[ERR_LEN] = {0,}; const char *entry; @@ -1337,8 +1336,8 @@ API int preference_remove_all(void) return PREFERENCE_ERROR_OUT_OF_MEMORY; } - while (readdir_r(dir, &dent, &result) == 0 && result != NULL) { - entry = dent.d_name; + while ((dent = readdir(dir)) != NULL) { + entry = dent->d_name; if (entry[0] == '.') continue; @@ -1521,8 +1520,7 @@ API int preference_foreach_item(preference_item_cb callback, void *user_data) { int ret = 0; DIR *dir; - struct dirent dent; - struct dirent *result = NULL; + struct dirent *dent = NULL; char *pref_dir_path = NULL; char err_buf[ERR_LEN] = {0,}; const char *entry; @@ -1546,8 +1544,8 @@ API int preference_foreach_item(preference_item_cb callback, void *user_data) return PREFERENCE_ERROR_IO_ERROR; } - while (readdir_r(dir, &dent, &result) == 0 && result != NULL) { - entry = dent.d_name; + while ((dent = readdir(dir)) != NULL) { + entry = dent->d_name; if (entry[0] == '.') continue; |