From ac8f08e9fa12e6312775cc19836ff727533f5b9a Mon Sep 17 00:00:00 2001 From: sebastid Date: Fri, 4 Nov 2005 07:49:12 +0000 Subject: [PATCH] Don't use strlen when we are just interested in the first element. SVN revision: 18267 --- src/bin/e_apps.c | 5 ++--- src/bin/e_int_border_remember.c | 16 +++++++-------- src/bin/e_ipc_handlers.h | 36 ++++++++++++++++----------------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c index 9bc24c84f..69893dc99 100644 --- a/src/bin/e_apps.c +++ b/src/bin/e_apps.c @@ -1851,7 +1851,7 @@ _e_app_cb_expire_timer(void *data) static void _e_app_cache_copy(E_App_Cache *ac, E_App *a) { -#define IF_DUP(x) if ((ac->x) && (strlen(ac->x) > 0)) a->x = strdup(ac->x) +#define IF_DUP(x) if ((ac->x) && (ac->x[0] != 0)) a->x = strdup(ac->x) IF_DUP(name); IF_DUP(generic); IF_DUP(comment); @@ -2019,7 +2019,6 @@ _e_app_cache_new(E_App_Cache *ac, char *path, int scan_subdirs) static int _e_app_exe_valid_get(char *exe) { - if (!exe) return 0; - if (strlen(exe) == 0) return 0; + if ((!exe) || (!exe[0])) return 0; return 1; } diff --git a/src/bin/e_int_border_remember.c b/src/bin/e_int_border_remember.c index bc51f82af..bf6980fbe 100644 --- a/src/bin/e_int_border_remember.c +++ b/src/bin/e_int_border_remember.c @@ -215,8 +215,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) if ((cfdata->border->client.icccm.name) && (cfdata->border->client.icccm.class) && - (strlen(cfdata->border->client.icccm.name) > 0) && - (strlen(cfdata->border->client.icccm.class) > 0)) + (cfdata->border->client.icccm.name[0] != 0) && + (cfdata->border->client.icccm.class[0] != 0)) matches = _check_matches(cfdata->border, E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT); else matches = _check_matches(cfdata->border, E_REMEMBER_MATCH_TITLE | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT); @@ -262,8 +262,8 @@ _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { if ((cfdata->border->client.icccm.name) && (cfdata->border->client.icccm.class) && - (strlen(cfdata->border->client.icccm.name) > 0) && - (strlen(cfdata->border->client.icccm.class) > 0)) + (cfdata->border->client.icccm.name[0] != 0) && + (cfdata->border->client.icccm.class[0] != 0)) cfdata->border->remember->match = E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT; else cfdata->border->remember->match = E_REMEMBER_MATCH_TITLE | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT; @@ -444,8 +444,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) of = e_widget_framelist_add(evas, _("Remember using"), 0); if ((cfdata->border->client.icccm.name) && (cfdata->border->client.icccm.class) && - (strlen(cfdata->border->client.icccm.name) > 0) && - (strlen(cfdata->border->client.icccm.class) > 0)) + (cfdata->border->client.icccm.name[0] != 0) && + (cfdata->border->client.icccm.class[0] != 0)) { ob = e_widget_check_add(evas, _("Window name and class"), &(cfdata->remember.match_name)); e_widget_framelist_object_append(of, ob); @@ -455,7 +455,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) cfdata->remember.match_name = 0; cfdata->remember.match_class = 0; } - if (strlen(e_border_name_get(cfdata->border)) > 0) + if ((e_border_name_get(cfdata->border))[0] != 0) { ob = e_widget_check_add(evas, _("Title"), &(cfdata->remember.match_title)); e_widget_framelist_object_append(of, ob); @@ -465,7 +465,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) cfdata->remember.match_title = 0; } if ((cfdata->border->client.icccm.window_role) && - (strlen(cfdata->border->client.icccm.window_role) > 0)) + (cfdata->border->client.icccm.window_role[0] != 0)) { ob = e_widget_check_add(evas, _("Window Role"), &(cfdata->remember.match_role)); e_widget_framelist_object_append(of, ob); diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h index b1cfec981..7a30f3555 100644 --- a/src/bin/e_ipc_handlers.h +++ b/src/bin/e_ipc_handlers.h @@ -1357,7 +1357,7 @@ break; /* TODO: Check if language exists */ E_FREE(e_config->language); e_config->language = strdup(s); - if ((e_config->language) && (strlen(e_config->language) > 0)) + if ((e_config->language) && (e_config->language[0] != 0)) e_intl_language_set(e_config->language); else e_intl_language_set(NULL); @@ -2349,7 +2349,7 @@ break; else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL; else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -2364,7 +2364,7 @@ break; else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN; else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -2455,7 +2455,7 @@ break; else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL; else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -2470,7 +2470,7 @@ break; else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN; else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -2672,7 +2672,7 @@ break; else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL; else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -2687,7 +2687,7 @@ break; else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN; else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -2777,7 +2777,7 @@ break; else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL; else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -2792,7 +2792,7 @@ break; else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN; else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -5500,7 +5500,7 @@ break; STRING(s, HDL); E_FREE(e_config->input_method); e_config->input_method = strdup(s); - if ((e_config->input_method) && (strlen(e_config->input_method) > 0)) + if ((e_config->input_method) && (e_config->input_method[0] != 0)) e_intl_input_method_set(e_config->input_method); else e_intl_input_method_set(NULL); @@ -5764,7 +5764,7 @@ break; else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL; else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT4 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -5779,7 +5779,7 @@ break; else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN; else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT4 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -5871,7 +5871,7 @@ break; else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL; else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -5886,7 +5886,7 @@ break; else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN; else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -6093,7 +6093,7 @@ break; else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL; else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT4 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -6108,7 +6108,7 @@ break; else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN; else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT4 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -6200,7 +6200,7 @@ break; else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL; else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n"); @@ -6215,7 +6215,7 @@ break; else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT; else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN; else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE; - else if (strlen(pp) > 0) + else if (pp[0] != 0) { printf("OPT3 moidifier unknown. Must be or mask of:\n" " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");