[MPlayer-cvslog] r33867 - in trunk: Makefile gui/win32/interface.c

[ib]

Author: ib
Date: Sun Jul 10 17:42:09 2011
New Revision: 33867

Log:
Remove duplicated string code from the Win32 GUI.

Use common code.

Patch by Stephen Sheldon, sfsheldo gmail com.

Modified:
   trunk/Makefile
   trunk/gui/win32/interface.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Jul 10 14:59:43 2011	(r33866)
+++ trunk/Makefile	Sun Jul 10 17:42:09 2011	(r33867)
@@ -517,7 +517,8 @@ SRCS_MPLAYER-$(GL_SDL)       += libvo/sd
 SRCS_MPLAYER-$(GL_WIN32)     += libvo/w32_common.c
 SRCS_MPLAYER-$(GL_X11)       += libvo/x11_common.c
 SRCS_MPLAYER-$(MATRIXVIEW)   += libvo/vo_matrixview.c libvo/matrixview.c
-SRCS_MPLAYER-$(GUI)          += gui/util/bitmap.c
+SRCS_MPLAYER-$(GUI)          += gui/util/bitmap.c \
+                                gui/util/string.c
 SRCS_MPLAYER-$(GUI_GTK)      += gui/app.c \
                                 gui/cfg.c \
                                 gui/interface.c \
@@ -542,7 +543,6 @@ SRCS_MPLAYER-$(GUI_GTK)      += gui/app.
                                 gui/ui/widgets.c \
                                 gui/util/cut.c \
                                 gui/util/list.c \
-                                gui/util/string.c \
                                 gui/wm/ws.c \
                                 gui/wm/wsxdnd.c \
 

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Sun Jul 10 14:59:43 2011	(r33866)
+++ trunk/gui/win32/interface.c	Sun Jul 10 17:42:09 2011	(r33867)
@@ -94,25 +94,6 @@ int parse_filename(char *file, play_tree
     return 0;
 }
 
-char *gstrdup(const char *str)
-{
-    if (!str) return NULL;
-    return strdup(str);
-}
-
-void setdup (char **old, const char *str)
-{
-  free(*old);
-  *old = gstrdup(str);
-}
-
-void setddup (char **old, const char *dir, const char *name)
-{
-  free(*old);
-  *old = malloc(strlen(dir) + strlen(name) + 2);
-  if (*old) sprintf(*old, "%s/%s", dir, name);
-}
-
 /**
  * \brief this actually creates a new list containing only one element...
  */