Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_int_border_remember.c e_ipc_handlers.h
Log Message:
Don't use strlen when we are just interested in the first element.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- e_apps.c 31 Oct 2005 09:31:04 -0000 1.100
+++ e_apps.c 4 Nov 2005 07:49:12 -0000 1.101
@@ -1851,7 +1851,7 @@
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 @@
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;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_remember.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_border_remember.c 28 Oct 2005 09:08:00 -0000 1.3
+++ e_int_border_remember.c 4 Nov 2005 07:49:12 -0000 1.4
@@ -215,8 +215,8 @@
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 @@
{
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 @@
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 @@
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 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- e_ipc_handlers.h 23 Oct 2005 04:56:51 -0000 1.103
+++ e_ipc_handlers.h 4 Nov 2005 07:49:12 -0000 1.104
@@ -1357,7 +1357,7 @@
/* 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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");
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
