Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        E.h Makefile.am comms.c dock.c file.c ipc.c menus.c pager.c 
        session.c settings.c startup.c 


Log Message:
Use (v)snprintf from libc when available + assiociated fixups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- E.h 7 Dec 2003 09:54:37 -0000       1.155
+++ E.h 9 Dec 2003 20:25:16 -0000       1.156
@@ -344,6 +344,10 @@
 }
 #endif
 
+#ifdef HAVE_SNPRINTF
+#define Evsnprintf vsnprintf
+#define Esnprintf snprintf
+#else /* HAVE_SNPRINTF */
 int                 Evsnprintf(char *str, size_t count, const char *fmt,
                               va_list args);
 
@@ -352,8 +356,8 @@
 
 #else
 int                 Esnprintf(va_alist);
-
 #endif
+#endif /* HAVE_SNPRINTF */
 
 #define Esetenv(var, val, overwrite) \
 { \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- Makefile.am 18 Nov 2003 19:14:52 -0000      1.23
+++ Makefile.am 9 Dec 2003 20:25:16 -0000       1.24
@@ -1,6 +1,6 @@
 SUBDIRS = themes
 
-EXTRA_DIST = README ChangeLog ewmh.c gnome.c
+EXTRA_DIST = README ChangeLog ewmh.c gnome.c snprintf.c
 
 bin_PROGRAMS = enlightenment
 
@@ -10,6 +10,9 @@
 if ENABLE_GNOME
 SRCS_GNOME = gnome.c            
 endif
+if USE_ESNPRINTF
+SRCS_SNPRINTF = snprintf.c            
+endif
 enlightenment_SOURCES = \
        E.h                     \
        timestamp.h             \
@@ -68,7 +71,6 @@
        size.c                  \
        slideout.c              \
        snaps.c                 \
-       snprintf.c              \
        sound.c                 \
        startup.c               \
        sticky.c                \
@@ -83,7 +85,8 @@
        windowmatch.c           \
        x.c                     \
        zoom.c                  \
-       $(SRCS_EWMH) $(SRCS_GNOME)
+       $(SRCS_EWMH) $(SRCS_GNOME) \
+       $(SRCS_SNPRINTF)
 
 
 LDADD = \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/comms.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- comms.c     7 Dec 2003 09:18:55 -0000       1.35
+++ comms.c     9 Dec 2003 20:25:16 -0000       1.36
@@ -686,7 +686,7 @@
                            if (a->action->params)
                               Esnprintf(buf2, sizeof(buf2), "%s %i %i %s\n",
                                         key, mod, a->action->Type,
-                                        a->action->params);
+                                        (char *)a->action->params);
                            else
                               Esnprintf(buf2, sizeof(buf2), "%s %i %i\n", key,
                                         mod, a->action->Type);
@@ -1652,8 +1652,9 @@
                            "MWM_MENU:               %5i\n"
                            "MWM_MINIMIZE:           %5i\n"
                            "MWM_MAXIMIZE:           %5i\n"
-                           "APP_STATE:              %5i\n", ewin->client.win,
-                           ewin->win, ewin->x, ewin->y, ewin->w, ewin->h,
+                           "APP_STATE:              %5i\n",
+                           (unsigned)ewin->client.win, (unsigned)ewin->win,
+                           ewin->x, ewin->y, ewin->w, ewin->h,
                            ewin->border->name, ewin->border->border.left,
                            ewin->border->border.right,
                            ewin->border->border.top,
@@ -1662,8 +1663,10 @@
                            ewin->visible, ewin->iconified, ewin->shaded,
                            ewin->active, ewin->layer, ewin->never_use_area,
                            ewin->floating, ewin->client.w, ewin->client.h,
-                           ewin->client.icon_win, ewin->client.icon_pmap,
-                           ewin->client.icon_mask, ewin->client.group,
+                           (unsigned)ewin->client.icon_win,
+                           (unsigned)ewin->client.icon_pmap,
+                           (unsigned)ewin->client.icon_mask,
+                           (unsigned)ewin->client.group,
                            ewin->client.need_input, ewin->client.transient,
                            ewin->client.title, ewin->client.class,
                            ewin->client.name, ewin->client.command,
@@ -1731,15 +1734,18 @@
                            "MWM_MENU:               %5i\n"
                            "MWM_MINIMIZE:           %5i\n"
                            "MWM_MAXIMIZE:           %5i\n"
-                           "APP_STATE:              %5i\n", ewin->client.win,
-                           ewin->win, ewin->x, ewin->y, ewin->w, ewin->h, none,
-                           0, 0, 0, 0, ewin->desktop, ewin->num_groups,
-                           ewin->docked, ewin->sticky, ewin->visible,
-                           ewin->iconified, ewin->shaded, ewin->active,
-                           ewin->layer, ewin->never_use_area, ewin->floating,
+                           "APP_STATE:              %5i\n",
+                           (unsigned)ewin->client.win, (unsigned)ewin->win,
+                           ewin->x, ewin->y, ewin->w, ewin->h, none, 0, 0, 0,
+                           0, ewin->desktop, ewin->num_groups, ewin->docked,
+                           ewin->sticky, ewin->visible, ewin->iconified,
+                           ewin->shaded, ewin->active, ewin->layer,
+                           ewin->never_use_area, ewin->floating,
                            ewin->client.w, ewin->client.h,
-                           ewin->client.icon_win, ewin->client.icon_pmap,
-                           ewin->client.icon_mask, ewin->client.group,
+                           (unsigned)ewin->client.icon_win,
+                           (unsigned)ewin->client.icon_pmap,
+                           (unsigned)ewin->client.icon_mask,
+                           (unsigned)ewin->client.group,
                            ewin->client.need_input, ewin->client.transient,
                            ewin->client.title, ewin->client.class,
                            ewin->client.name, ewin->client.command,
@@ -1795,19 +1801,19 @@
        if (mode.ewin)
          {
             Esnprintf(buf2, sizeof(buf2), "mode.ewin - %8x\n",
-                      mode.ewin->client.win);
+                      (unsigned)mode.ewin->client.win);
             strcat(buf, buf2);
          }
        if (mode.focuswin)
          {
             Esnprintf(buf3, sizeof(buf3), "mode.focuswin - %8x\n",
-                      mode.focuswin->client.win);
+                      (unsigned)mode.focuswin->client.win);
             strcat(buf, buf3);
          }
        if (mode.realfocuswin)
          {
             Esnprintf(buf4, sizeof(buf4), "mode.realfocuswin - %8x\n",
-                      mode.realfocuswin->client.win);
+                      (unsigned)mode.realfocuswin->client.win);
             strcat(buf, buf4);
          }
        if (mode.cur_menu_mode)
@@ -1817,7 +1823,7 @@
        if (mode.context_ewin)
          {
             Esnprintf(buf5, sizeof(buf5), "context_ewin - %8x\n",
-                      mode.context_ewin->client.win);
+                      (unsigned)mode.context_ewin->client.win);
             strcat(buf, buf5);
          }
        CommsSend(c, buf);
@@ -1891,10 +1897,10 @@
                            "MWM_MENU:               %5i\n"
                            "MWM_MINIMIZE:           %5i\n"
                            "MWM_MAXIMIZE:           %5i\n"
-                           "APP_STATE:              %5i\n", lst[i]->client.win,
-                           lst[i]->win, lst[i]->x, lst[i]->y, lst[i]->w,
-                           lst[i]->h, lst[i]->border->name,
-                           lst[i]->border->border.left,
+                           "APP_STATE:              %5i\n",
+                           (unsigned)lst[i]->client.win, (unsigned)lst[i]->win,
+                           lst[i]->x, lst[i]->y, lst[i]->w, lst[i]->h,
+                           lst[i]->border->name, lst[i]->border->border.left,
                            lst[i]->border->border.right,
                            lst[i]->border->border.top,
                            lst[i]->border->border.bottom, lst[i]->desktop,
@@ -1903,8 +1909,10 @@
                            lst[i]->active, lst[i]->layer,
                            lst[i]->never_use_area, lst[i]->floating,
                            lst[i]->client.w, lst[i]->client.h,
-                           lst[i]->client.icon_win, lst[i]->client.icon_pmap,
-                           lst[i]->client.icon_mask, lst[i]->client.group,
+                           (unsigned)lst[i]->client.icon_win,
+                           (unsigned)lst[i]->client.icon_pmap,
+                           (unsigned)lst[i]->client.icon_mask,
+                           (unsigned)lst[i]->client.group,
                            lst[i]->client.need_input, lst[i]->client.transient,
                            lst[i]->client.title, lst[i]->client.class,
                            lst[i]->client.name, lst[i]->client.command,
@@ -1973,16 +1981,18 @@
                            "MWM_MENU:               %5i\n"
                            "MWM_MINIMIZE:           %5i\n"
                            "MWM_MAXIMIZE:           %5i\n"
-                           "APP_STATE:              %5i\n", lst[i]->client.win,
-                           lst[i]->win, lst[i]->x, lst[i]->y, lst[i]->w,
-                           lst[i]->h, none, 0, 0, 0, 0, lst[i]->desktop,
-                           lst[i]->num_groups, lst[i]->docked, lst[i]->sticky,
-                           lst[i]->visible, lst[i]->iconified, lst[i]->shaded,
-                           lst[i]->active, lst[i]->layer,
-                           lst[i]->never_use_area, lst[i]->floating,
-                           lst[i]->client.w, lst[i]->client.h,
-                           lst[i]->client.icon_win, lst[i]->client.icon_pmap,
-                           lst[i]->client.icon_mask, lst[i]->client.group,
+                           "APP_STATE:              %5i\n",
+                           (unsigned)lst[i]->client.win, (unsigned)lst[i]->win,
+                           lst[i]->x, lst[i]->y, lst[i]->w, lst[i]->h, none, 0,
+                           0, 0, 0, lst[i]->desktop, lst[i]->num_groups,
+                           lst[i]->docked, lst[i]->sticky, lst[i]->visible,
+                           lst[i]->iconified, lst[i]->shaded, lst[i]->active,
+                           lst[i]->layer, lst[i]->never_use_area,
+                           lst[i]->floating, lst[i]->client.w,
+                           lst[i]->client.h, (unsigned)lst[i]->client.icon_win,
+                           (unsigned)lst[i]->client.icon_pmap,
+                           (unsigned)lst[i]->client.icon_mask,
+                           (unsigned)lst[i]->client.group,
                            lst[i]->client.need_input, lst[i]->client.transient,
                            lst[i]->client.title, lst[i]->client.class,
                            lst[i]->client.name, lst[i]->client.command,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dock.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- dock.c      7 Dec 2003 09:18:55 -0000       1.11
+++ dock.c      9 Dec 2003 20:25:16 -0000       1.12
@@ -31,7 +31,7 @@
    char                id[32];
 
    EDBUG(3, "DockIt");
-   Esnprintf(id, sizeof(id), "%i", ewin->client.win);
+   Esnprintf(id, sizeof(id), "%i", (unsigned)ewin->client.win);
    ac = 0;
    ic = FindItem("DEFAULT_DOCK_BUTTON", 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
    if (mode.dockstartx >= 0)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/file.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- file.c      9 Nov 2003 23:17:15 -0000       1.50
+++ file.c      9 Dec 2003 20:25:16 -0000       1.51
@@ -53,7 +53,7 @@
    EDBUG(9, "Etmp");
    if (!n_calls)
       n_calls = (unsigned long)time(NULL) + (unsigned long)getpid();
-   Esnprintf(s, 1024, "%s/TMP_%Xl", UserEDir(), n_calls);
+   Esnprintf(s, 1024, "%s/TMP_%lX", UserEDir(), n_calls);
    n_calls++;
    EDBUG_RETURN_;
 }
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- ipc.c       7 Dec 2003 09:54:37 -0000       1.118
+++ ipc.c       9 Dec 2003 20:25:16 -0000       1.119
@@ -792,10 +792,12 @@
                  if ((returncode = UnloadModule(param2)))
                    {
                       strcat(buf, ModuleErrorCodeToString(returncode));
+#if 0                          /* What ?!? */
                       if (!buf[0])
                         {
                            Esnprintf(buf, sizeof(buf), "");
                         }
+#endif
                    }
               }
          }
@@ -1859,7 +1861,7 @@
                                            1);
                            queue_up = pq;
                            Esnprintf(buf, sizeof(buf), "0x%08x 0x%08x",
-                                     pmm.pmap, pmm.mask);
+                                     (unsigned)pmm.pmap, (unsigned)pmm.mask);
 /*                         FreePmapMask(&pmm);         ??? */
                         }
                    }
@@ -2221,7 +2223,7 @@
             if (my_focused_win)
               {
                  Esnprintf(buf, sizeof(buf), "focused: %8x",
-                           my_focused_win->client.win);
+                           (unsigned)my_focused_win->client.win);
               }
             else
               {
@@ -2655,7 +2657,7 @@
                  if (lst[i]->pager)
                    {
                       Esnprintf(buf2, sizeof(buf2), "%8x\n",
-                                lst[i]->client.win);
+                                (unsigned)lst[i]->client.win);
                       strcat(buf, buf2);
                    }
               }
@@ -2667,7 +2669,7 @@
                  if (lst[i]->menu)
                    {
                       Esnprintf(buf2, sizeof(buf2), "%8x\n",
-                                lst[i]->client.win);
+                                (unsigned)lst[i]->client.win);
                       strcat(buf, buf2);
                    }
               }
@@ -2679,7 +2681,7 @@
                  if (lst[i]->dialog)
                    {
                       Esnprintf(buf2, sizeof(buf2), "%8x\n",
-                                lst[i]->client.win);
+                                (unsigned)lst[i]->client.win);
                       strcat(buf, buf2);
                    }
               }
@@ -2691,7 +2693,7 @@
                  if (lst[i]->internal)
                    {
                       Esnprintf(buf2, sizeof(buf2), "%8x\n",
-                                lst[i]->client.win);
+                                (unsigned)lst[i]->client.win);
                       strcat(buf, buf2);
                    }
               }
@@ -3623,14 +3625,14 @@
               {
                  Esnprintf(buf, sizeof(buf),
                            "0x%x : %s :: %d : %d %d : %d %d %dx%d\n",
-                           e->client.win, e->client.title,
+                           (unsigned)e->client.win, e->client.title,
                            (e->sticky) ? -1 : e->desktop, e->area_x, e->area_y,
                            e->x, e->y, e->w, e->h);
               }
             else
               {
-                 Esnprintf(buf, sizeof(buf), "0x%x : %s\n", e->client.win,
-                           e->client.title);
+                 Esnprintf(buf, sizeof(buf), "0x%x : %s\n",
+                           (unsigned)e->client.win, e->client.title);
               }
             if (!ret)
               {
@@ -4913,7 +4915,7 @@
                  "      iconify: %d\n" "         kill: %d\n"
                  "         move: %d\n" "        raise: %d\n"
                  "   set_border: %d\n" "        stick: %d\n"
-                 "        shade: %d\n", "       mirror: %d\n",
+                 "        shade: %d\n" "       mirror: %d\n",
                  groups[i]->index, groups[i]->num_members,
                  groups[i]->cfg.iconify, groups[i]->cfg.kill,
                  groups[i]->cfg.move, groups[i]->cfg.raise,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- menus.c     7 Dec 2003 09:18:55 -0000       1.89
+++ menus.c     9 Dec 2003 20:25:17 -0000       1.90
@@ -2024,7 +2024,8 @@
             mm = CreateMenu();
             mm->name = duplicate("__SUBMENUGROUP_E");
             mm->style = ms;
-            Esnprintf(s, sizeof(s), "%i", lst[i]->members[0]->client.win);
+            Esnprintf(s, sizeof(s), "%i",
+                      (unsigned)lst[i]->members[0]->client.win);
             mi = CreateMenuItem(_("Show/Hide this group"), NULL,
                                 ACTION_SHOW_HIDE_GROUP, s, NULL);
             AddItemToMenu(mm, mi);
@@ -2034,7 +2035,8 @@
 
             for (j = 0; j < lst[i]->num_members; j++)
               {
-                 Esnprintf(s, sizeof(s), "%i", lst[i]->members[j]->client.win);
+                 Esnprintf(s, sizeof(s), "%i",
+                           (unsigned)lst[i]->members[j]->client.win);
                  mi = CreateMenuItem(lst[i]->members[j]->client.title, NULL,
                                      ACTION_FOCUS_SET, s, NULL);
                  AddItemToMenu(mm, mi);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- pager.c     4 Dec 2003 16:57:48 -0000       1.48
+++ pager.c     9 Dec 2003 20:25:17 -0000       1.49
@@ -45,7 +45,7 @@
    static int          offsets[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
 
    p = (Pager *) data;
-   Esnprintf(s, sizeof(s), "__.%x", p->win);
+   Esnprintf(s, sizeof(s), "__.%x", (unsigned)p->win);
    /* prevent runaway pager timeouts - dont knwo how it happens - but hack */
    /* around to stop it */
    cur_time = GetTime();
@@ -327,7 +327,7 @@
        RememberImportantInfoForEwin(ewin);
        if (mode.pager_snap)
          {
-            Esnprintf(s, sizeof(s), "__.%x", p->win);
+            Esnprintf(s, sizeof(s), "__.%x", (unsigned)p->win);
             if (mode.pager_scanspeed > 0)
                DoIn(s, 1 / ((double)mode.pager_scanspeed), PagerUpdateTimeout,
                     0, p);
@@ -344,7 +344,7 @@
    char                s[4096];
 
    RemoveItem("PAGER", p->win, LIST_FINDBY_ID, LIST_TYPE_PAGER);
-   Esnprintf(s, sizeof(s), "__.%x", p->win);
+   Esnprintf(s, sizeof(s), "__.%x", (unsigned)p->win);
    RemoveTimerEvent(s);
    if (p->name)
       Efree(p->name);
@@ -885,7 +885,7 @@
        pw_menu->style =
           FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_MENU_STYLE);
 
-       Esnprintf(s, sizeof(s), "%i", ewin->client.win);
+       Esnprintf(s, sizeof(s), "%i", (unsigned)ewin->client.win);
        mi = CreateMenuItem(_("Iconify"), NULL, ACTION_ICONIFY, s, NULL);
        AddItemToMenu(pw_menu, mi);
 
@@ -1488,7 +1488,7 @@
             PagerForceUpdate(pl[i]);
             if (mode.pager_snap)
               {
-                 Esnprintf(s, sizeof(s), "__.%x", pl[i]->win);
+                 Esnprintf(s, sizeof(s), "__.%x", (unsigned)pl[i]->win);
                  if (mode.pager_scanspeed > 0)
                     DoIn(s, 1 / ((double)mode.pager_scanspeed),
                          PagerUpdateTimeout, 0, pl[i]);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- session.c   15 Nov 2003 21:44:13 -0000      1.44
+++ session.c   9 Dec 2003 20:25:17 -0000       1.45
@@ -758,7 +758,7 @@
 
 #if USE_DISCARD_PROPERTY
    /* Tell session manager how to clean up our old data */
-   Esnprintf(buf, sizeof(buf) / sizeof(char), "rm %s*.clients.*", sm_file);
+   Esnprintf(buf, sizeof(buf), "rm %s*.clients.*", sm_file);
 
    discardVal[0].length = strlen(sh);
    discardVal[0].value = sh;
@@ -778,7 +778,7 @@
      }
    if (restarting)
      {
-       Esnprintf(buf, sizeof(buf) / sizeof(char), "%i", init_win_ext);
+       Esnprintf(buf, sizeof(buf), "%i", (unsigned)init_win_ext);
 
        restartVal[n].length = strlen(extinitwin);
        restartVal[n++].value = extinitwin;
@@ -1202,13 +1202,13 @@
                          "exec %s -single -ext_init_win %i -theme %s "
                          "-econfdir %s -ecachedir %s "
                          "-smfile %s -smid %s", command,
-                         init_win_ext, themename, UserEDir(), UserCacheDir(),
-                         sm_file, sm_client_id);
+                         (unsigned)init_win_ext, themename, UserEDir(),
+                         UserCacheDir(), sm_file, sm_client_id);
             else
                Esnprintf(s, sizeof(s),
                          "exec %s -single -ext_init_win %i -theme %s "
                          "-econfdir %s -ecachedir %s "
-                         "-smfile %s", command, init_win_ext,
+                         "-smfile %s", command, (unsigned)init_win_ext,
                          themename, UserEDir(), UserCacheDir(), sm_file);
             execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
          }
@@ -1219,13 +1219,13 @@
                          "exec %s -single -ext_init_win %i "
                          "-econfdir %s -ecachedir %s "
                          "-smfile %s -smid %s", command,
-                         init_win_ext, UserEDir(), UserCacheDir(), sm_file,
-                         sm_client_id);
+                         (unsigned)init_win_ext, UserEDir(), UserCacheDir(),
+                         sm_file, sm_client_id);
             else
                Esnprintf(s, sizeof(s),
                          "exec %s -single -ext_init_win %i"
                          "-econfdir %s -ecachedir %s "
-                         "-smfile %s", command, init_win_ext,
+                         "-smfile %s", command, (unsigned)init_win_ext,
                          UserEDir(), UserCacheDir(), sm_file);
             execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
          }
@@ -1248,14 +1248,14 @@
           Esnprintf(s, sizeof(s),
                     "exec %s -single -ext_init_win %i -theme %s "
                     "-econfdir %s -ecachedir %s "
-                    "-smfile %s -smid %s", command, init_win_ext,
+                    "-smfile %s -smid %s", command, (unsigned)init_win_ext,
                     userthemepath, UserEDir(), UserCacheDir(), sm_file,
                     sm_client_id);
        else
           Esnprintf(s, sizeof(s),
                     "exec %s -ext_init_win %i -theme %s "
                     "-econfdir %s -ecachedir %s "
-                    "-smfile %s -single", command, init_win_ext,
+                    "-smfile %s -single", command, (unsigned)init_win_ext,
                     userthemepath, UserEDir(), UserCacheDir(), sm_file);
        execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
      }
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- settings.c  7 Dec 2003 09:18:55 -0000       1.82
+++ settings.c  9 Dec 2003 20:25:17 -0000       1.83
@@ -2658,7 +2658,7 @@
    Background         *bg;
    int                 lower, upper;
 
-   Esnprintf(s, sizeof(s), "__NEWBG_%i\n", time(NULL));
+   Esnprintf(s, sizeof(s), "__NEWBG_%i\n", (unsigned)time(NULL));
    ESetColor(&xclr, tmp_bg_r, tmp_bg_g, tmp_bg_b);
    bg = CreateDesktopBG(s, &xclr, tmp_bg->bg.file, tmp_bg_tile,
                        tmp_bg_keep_aspect, tmp_bg_xjust, 1024 - tmp_bg_yjust,
@@ -3275,7 +3275,7 @@
      {
        char                s[1024];
 
-       Esnprintf(s, sizeof(s), "__NEWBG_%i\n", time(NULL));
+       Esnprintf(s, sizeof(s), "__NEWBG_%i\n", (unsigned)time(NULL));
        bg = CreateDesktopBG(s, NULL, NULL, 1, 1, 0, 0, 0, 0, NULL, 1, 512, 512,
                             0, 0);
        AddItem(bg, bg->name, 0, LIST_TYPE_BACKGROUND);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- startup.c   15 Nov 2003 22:27:17 -0000      1.29
+++ startup.c   9 Dec 2003 20:25:17 -0000       1.30
@@ -50,7 +50,7 @@
 
    Esnprintf(tmp, 2048, "%s/estrt_%i",
             (getenv("TMPDIR") == NULL) ? "/tmp" : getenv("TMPDIR"),
-            time(NULL));
+            (unsigned)time(NULL));
    f1 = fopen(file, "r");
    if (!f1)
       EDBUG_RETURN(0);




-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to