From 6bc4fbac2655b02e85bc6d715a68cc79140c28bc Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Fri, 10 Nov 2006 19:58:18 +0000 Subject: [PATCH] Add const. Fix warnings. SVN revision: 27037 --- .../src/lib/ecore_desktop/Ecore_Desktop.h | 14 ++++---- .../src/lib/ecore_desktop/ecore_desktop.c | 4 ++- .../lib/ecore_desktop/ecore_desktop_icon.c | 11 +++--- .../lib/ecore_desktop/ecore_desktop_menu.c | 19 +++++----- .../lib/ecore_desktop/ecore_desktop_paths.c | 36 ++++++++++--------- .../lib/ecore_desktop/ecore_desktop_tree.c | 6 ++-- 6 files changed, 48 insertions(+), 42 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h b/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h index 0750bb990f..825e4e91df 100644 --- a/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h +++ b/legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h @@ -166,15 +166,15 @@ extern "C" EAPI int ecore_desktop_paths_init(void); EAPI void ecore_desktop_paths_extras_clear(void); EAPI void ecore_desktop_paths_prepend_user(Ecore_Desktop_Paths_Type - type, char *paths); + type, const char *paths); EAPI void ecore_desktop_paths_prepend_system(Ecore_Desktop_Paths_Type type, - char *paths); + const char *paths); EAPI void ecore_desktop_paths_append_user(Ecore_Desktop_Paths_Type - type, char *paths); + type, const char *paths); EAPI void ecore_desktop_paths_append_system(Ecore_Desktop_Paths_Type type, - char *paths); + const char *paths); EAPI void ecore_desktop_paths_regen(void); char *ecore_desktop_paths_file_find(Ecore_List * paths, const char *file, int sub, @@ -228,16 +228,16 @@ extern "C" EAPI void ecore_desktop_menu_for_each(void (*func) - (char *name, char *path, char *directory, Ecore_Hash * apps)); + (const char *name, const char *path, const char *directory, Ecore_Hash * apps)); Ecore_Desktop_Tree *ecore_desktop_menu_get(char *file); Ecore_Desktop_Tree *ecore_desktop_tree_new(char *buffer); Ecore_Desktop_Tree *ecore_desktop_tree_add(Ecore_Desktop_Tree * tree, - char *element); + const char *element); void ecore_desktop_tree_track(Ecore_Desktop_Tree * tree, void *element); Ecore_Desktop_Tree *ecore_desktop_tree_extend(Ecore_Desktop_Tree * tree, - char *element); + const char *element); Ecore_Desktop_Tree *ecore_desktop_tree_insert(Ecore_Desktop_Tree * tree, int before, void *element, Ecore_Desktop_Tree_Element_Type diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c index f657d03ad8..51fe0c63f5 100644 --- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c +++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c @@ -765,6 +765,7 @@ ecore_desktop_destroy(Ecore_Desktop * desktop) { /* This is just a dummy, because these structures are cached. */ /* Later versions of the cache may reference count, then this will be useful. */ + desktop = NULL; } void @@ -868,7 +869,8 @@ if (files) if (fill) { Ecore_DList *command; - char *p, *t, buf[PATH_MAX + 10], *big_buf = NULL; + char *p, buf[PATH_MAX + 10], *big_buf = NULL; + const char *t; int len = 0; command = ecore_dlist_new(); diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c index b5249fe06b..172b812c61 100644 --- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c +++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c @@ -6,6 +6,7 @@ #include "Ecore_Desktop.h" #include "ecore_desktop_private.h" +#include "ecore_private.h" //#define DEBUG 1 @@ -356,7 +357,7 @@ ecore_desktop_icon_theme_list(void) } static int -_ecore_desktop_icon_theme_list_add(void *data, const char *path) +_ecore_desktop_icon_theme_list_add(void *data __UNUSED__, const char *path) { char icn[PATH_MAX]; @@ -434,11 +435,11 @@ ecore_desktop_icon_shutdown() * @ingroup Ecore_Desktop_Icon_Group */ Ecore_Desktop_Icon_Theme * -ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang) +ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang __UNUSED__) { Ecore_Desktop_Icon_Theme *result = NULL; char *theme_path = NULL, *theme_dir = NULL; - char *value; + const char *value; Ecore_List *Directories; char *directory; @@ -518,7 +519,7 @@ ecore_desktop_icon_theme_get(const char *icon_theme, const char *lang) dir = calloc(1, sizeof (Ecore_Desktop_Icon_Theme_Directory)); if ((dir) && (sub_group)) { - char *size, *minsize, *maxsize, *threshold; + const char *size, *minsize, *maxsize, *threshold; char full_path[PATH_MAX]; dir->path = strdup(directory); @@ -595,6 +596,8 @@ ecore_desktop_icon_theme_destroy(Ecore_Desktop_Icon_Theme * icon_theme) { /* This is just a dummy, because these structures are cached. */ /* Later versions of the cache may reference count, then this will be useful. */ + + icon_theme = NULL; } static void diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c index ceb3f2dd5c..353da04bf3 100644 --- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c +++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c @@ -11,6 +11,7 @@ #include "Ecore_Desktop.h" #include "ecore_desktop_private.h" +#include "ecore_private.h" #include #include @@ -61,7 +62,7 @@ static int _ecore_desktop_menu_make_apps(const void *data, static Ecore_Desktop_Tree *_ecore_desktop_menu_get0(char *file, Ecore_Desktop_Tree * merge_stack, int level); -static Ecore_Desktop_Tree *_ecore_desktop_menu_create_menu(); +static Ecore_Desktop_Tree *_ecore_desktop_menu_create_menu(void); static int _ecore_desktop_menu_unxml(const void *data, Ecore_Desktop_Tree * tree, int element, int level); @@ -79,8 +80,8 @@ static void _ecore_desktop_menu_unxml_rules(Ecore_Desktop_Tree * rules, static void _ecore_desktop_menu_unxml_moves(Ecore_Desktop_Tree * menu, Ecore_Desktop_Tree * tree); static void _ecore_desktop_menu_add_dirs(Ecore_Desktop_Tree * tree, - Ecore_List * paths, char *pre, - char *post, char *extra, + Ecore_List * paths, const char *pre, + const char *post, char *extra, int element); static int _ecore_desktop_menu_expand_apps(struct _ecore_desktop_menu_unxml_data @@ -119,7 +120,7 @@ static int _ecore_desktop_menu_apply_rules(struct EAPI void ecore_desktop_menu_for_each(void (*func) - (char *name, char *path, char *directory, Ecore_Hash * apps)) + (const char *name, const char *path, const char *directory, Ecore_Hash * apps)) { char *menu_file; @@ -162,7 +163,7 @@ ecore_desktop_menu_for_each(void (*func) static int _ecore_desktop_menu_make_apps(const void *data, Ecore_Desktop_Tree * tree, - int element, int level) + int element, int level __UNUSED__) { if (tree->elements[element].type == ECORE_DESKTOP_TREE_ELEMENT_TYPE_STRING) { @@ -592,9 +593,7 @@ _ecore_desktop_menu_unxml(const void *data, Ecore_Desktop_Tree * tree, (((char *)sub->elements[1]. element)[0] != '<')) { - char - - temp[PATH_MAX]; + char temp[PATH_MAX]; sprintf(temp, "%s %s", (char *)sub-> @@ -1043,7 +1042,7 @@ _ecore_desktop_menu_unxml_moves(Ecore_Desktop_Tree * menu, static void _ecore_desktop_menu_add_dirs(Ecore_Desktop_Tree * tree, Ecore_List * paths, - char *pre, char *post, char *extra, int element) + const char *pre, const char *post __UNUSED__, char *extra, int element __UNUSED__) { char t[PATH_MAX], *this_path; @@ -1362,7 +1361,7 @@ _ecore_desktop_menu_merge(const void *data, Ecore_Desktop_Tree * tree, static int _ecore_desktop_menu_expand_default_dirs(const void *data, Ecore_Desktop_Tree * tree, int element, - int level) + int level __UNUSED__) { struct _ecore_desktop_menu_unxml_data *unxml_data; Ecore_Desktop_Tree *merge; diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c index 3c5fa9ce00..3e2a39ab2d 100644 --- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c +++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c @@ -47,17 +47,17 @@ Ecore_List *ecore_desktop_paths_xsessions = NULL; static Ecore_List *_ecore_desktop_paths_get(Ecore_Desktop_Paths_Type path_type, - char *before, char *env_home, - char *env, char *env_home_default, - char *env_default, char *type, - char *gnome_extra, char *kde); + const char *before, const char *env_home, + const char *env, const char *env_home_default, + const char *env_default, const char *type, + const char *gnome_extra, const char *kde); static void _ecore_desktop_paths_massage_path(char *path, char *home, char *first, char *second); static void _ecore_desktop_paths_check_and_add(Ecore_List * paths, - char *path); -static void _ecore_desktop_paths_create(); -static void _ecore_desktop_paths_destroy(); + const char *path); +static void _ecore_desktop_paths_create(void); +static void _ecore_desktop_paths_destroy(void); static Ecore_List *gnome_data = NULL; static Ecore_List *prepend_user_paths[ECORE_DESKTOP_PATHS_MAX]; @@ -325,28 +325,28 @@ ecore_desktop_paths_extras_clear(void) } EAPI void -ecore_desktop_paths_prepend_user(Ecore_Desktop_Paths_Type type, char *paths) +ecore_desktop_paths_prepend_user(Ecore_Desktop_Paths_Type type, const char *paths) { if (prepend_user_paths[type]) ecore_list_append(prepend_user_paths[type], strdup(paths)); } EAPI void -ecore_desktop_paths_prepend_system(Ecore_Desktop_Paths_Type type, char *paths) +ecore_desktop_paths_prepend_system(Ecore_Desktop_Paths_Type type, const char *paths) { if (prepend_system_paths[type]) ecore_list_append(prepend_system_paths[type], strdup(paths)); } EAPI void -ecore_desktop_paths_append_user(Ecore_Desktop_Paths_Type type, char *paths) +ecore_desktop_paths_append_user(Ecore_Desktop_Paths_Type type, const char *paths) { if (append_user_paths[type]) ecore_list_append(append_user_paths[type], strdup(paths)); } EAPI void -ecore_desktop_paths_append_system(Ecore_Desktop_Paths_Type type, char *paths) +ecore_desktop_paths_append_system(Ecore_Desktop_Paths_Type type, const char *paths) { if (append_system_paths[type]) ecore_list_append(append_system_paths[type], strdup(paths)); @@ -413,9 +413,9 @@ icons=pathlist static Ecore_List * _ecore_desktop_paths_get(Ecore_Desktop_Paths_Type path_type, - char *before, char *env_home, char *env, - char *env_home_default, char *env_default, char *type, - char *gnome_extra, char *kde) + const char *before, const char *env_home, const char *env, + const char *env_home_default, const char *env_default, const char *type, + const char *gnome_extra, const char *kde) { Ecore_List *paths = NULL; Ecore_List *types = NULL; @@ -441,6 +441,8 @@ _ecore_desktop_paths_get(Ecore_Desktop_Paths_Type path_type, #ifdef KDE_SUPPORT if (kde) kdes = ecore_desktop_paths_to_list(kde); +#else + kde = NULL; #endif if (before) @@ -477,7 +479,7 @@ _ecore_desktop_paths_get(Ecore_Desktop_Paths_Type path_type, if (env_home) { - char *value; + const char *value; value = getenv(env_home); if ((value == NULL) || (value[0] == '\0')) @@ -538,7 +540,7 @@ _ecore_desktop_paths_get(Ecore_Desktop_Paths_Type path_type, if (env) { - char *value; + const char *value; value = getenv(env); if ((value == NULL) || (value[0] == '\0')) @@ -703,7 +705,7 @@ _ecore_desktop_paths_massage_path(char *path, char *home, char *first, } static void -_ecore_desktop_paths_check_and_add(Ecore_List * paths, char *path) +_ecore_desktop_paths_check_and_add(Ecore_List * paths, const char *path) { struct stat path_stat; char *this_path; diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_tree.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_tree.c index 4f4253df73..e8bf09ef77 100644 --- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_tree.c +++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_tree.c @@ -51,7 +51,7 @@ ecore_desktop_tree_new(char *buffer) } Ecore_Desktop_Tree * -ecore_desktop_tree_add(Ecore_Desktop_Tree * tree, char *element) +ecore_desktop_tree_add(Ecore_Desktop_Tree * tree, const char *element) { tree->elements = (Ecore_Desktop_Tree_Element *) realloc(tree->elements, @@ -59,13 +59,13 @@ ecore_desktop_tree_add(Ecore_Desktop_Tree * tree, char *element) 1) * sizeof (Ecore_Desktop_Tree_Element)); - tree->elements[tree->size].element = element; + tree->elements[tree->size].element = (char*)element; tree->elements[tree->size++].type = ECORE_DESKTOP_TREE_ELEMENT_TYPE_STRING; return tree; } Ecore_Desktop_Tree * -ecore_desktop_tree_extend(Ecore_Desktop_Tree * tree, char *element) +ecore_desktop_tree_extend(Ecore_Desktop_Tree * tree, const char *element) { tree->buffers = (char **)realloc(tree->buffers,