E SVN: kwo trunk/E16/e/src

[Enlightenment S. <no-...@en...>]

Log:
  Eliminate dup in fullfileof().

Author:       kwo
Date:         2008-10-10 12:49:06 -0700 (Fri, 10 Oct 2008)
New Revision: 36574

Modified:
  trunk/E16/e/src/backgrounds.c trunk/E16/e/src/file.c trunk/E16/e/src/file.h trunk/E16/e/src/menus-misc.c trunk/E16/e/src/theme.c 

Modified: trunk/E16/e/src/backgrounds.c
===================================================================
--- trunk/E16/e/src/backgrounds.c	2008-10-10 17:35:19 UTC (rev 36573)
+++ trunk/E16/e/src/backgrounds.c	2008-10-10 19:49:06 UTC (rev 36574)
@@ -1517,15 +1517,13 @@
 static void
 BG_DialogSetFileName(DItem * di)
 {
-   char               *stmp = NULL;
+   const char         *stmp;
    char                s[1024];
 
-   if (BackgroundGetBgFile(tmp_bg))
-      stmp = fullfileof(BackgroundGetBgFile(tmp_bg));
+   stmp = fullfileof(BackgroundGetBgFile(tmp_bg));
    Esnprintf(s, sizeof(s),
 	     _("Background definition information:\nName: %s\nFile: %s\n"),
 	     BackgroundGetName(tmp_bg), (stmp) ? stmp : _("-NONE-"));
-   Efree(stmp);
    DialogItemSetText(di, s);
 }
 

Modified: trunk/E16/e/src/file.c
===================================================================
--- trunk/E16/e/src/file.c	2008-10-10 17:35:19 UTC (rev 36573)
+++ trunk/E16/e/src/file.c	2008-10-10 19:49:06 UTC (rev 36574)
@@ -267,13 +267,15 @@
    return Estrndup(s1, s2 - s1);
 }
 
-char               *
+const char         *
 fullfileof(const char *path)
 {
    const char         *s;
 
+   if (!path)
+      return NULL;
    s = strrchr(path, '/');
-   return Estrdup((s) ? s + 1 : path);
+   return (s) ? s + 1 : path;
 }
 
 char               *

Modified: trunk/E16/e/src/file.h
===================================================================
--- trunk/E16/e/src/file.h	2008-10-10 17:35:19 UTC (rev 36573)
+++ trunk/E16/e/src/file.h	2008-10-10 19:49:06 UTC (rev 36574)
@@ -56,7 +56,7 @@
 int                 isabspath(const char *s);
 const char         *fileext(const char *s);
 char               *fileof(const char *s);
-char               *fullfileof(const char *s);
+const char         *fullfileof(const char *s);
 
 char               *path_test(const char *file, unsigned int test);
 int                 path_canexec(const char *file);

Modified: trunk/E16/e/src/menus-misc.c
===================================================================
--- trunk/E16/e/src/menus-misc.c	2008-10-10 17:35:19 UTC (rev 36573)
+++ trunk/E16/e/src/menus-misc.c	2008-10-10 19:49:06 UTC (rev 36574)
@@ -538,7 +538,8 @@
 {
    char              **lst;
    int                 i, num;
-   char                ss[4096], *s;
+   char                ss[4096];
+   const char         *s;
    MenuItem           *mi;
 
    if (MenuGetTimestamp(m))
@@ -551,7 +552,6 @@
 	s = fullfileof(lst[i]);
 	Esnprintf(ss, sizeof(ss), "theme use %s", s);
 	mi = MenuItemCreate(s, NULL, ss, NULL);
-	Efree(s);
 	MenuAddItem(m, mi);
      }
    if (lst)

Modified: trunk/E16/e/src/theme.c
===================================================================
--- trunk/E16/e/src/theme.c	2008-10-10 17:35:19 UTC (rev 36573)
+++ trunk/E16/e/src/theme.c	2008-10-10 19:49:06 UTC (rev 36574)
@@ -425,7 +425,7 @@
      }
 
    Efree(Conf.theme.name);
-   Conf.theme.name = (theme) ? fullfileof(theme) : NULL;
+   Conf.theme.name = Estrdup(fullfileof(theme));
 
    Efree(Mode.theme.path);
    Mode.theme.path = (theme) ? theme : Estrdup("-");