[MPlayer-cvslog] r37506 - in branches/1.2: . gui/skin/font.c gui/skin/skin.c gui/util/string.c gui/util/string.h

[ib]

Author: ib
Date: Tue Sep  8 23:02:05 2015
New Revision: 37506

Log:
Merge r37489 from trunk:

Cosmetic: Rename trim() despace().

Modified:
   branches/1.2/   (props changed)
   branches/1.2/gui/skin/font.c
   branches/1.2/gui/skin/skin.c
   branches/1.2/gui/util/string.c
   branches/1.2/gui/util/string.h

Modified: branches/1.2/gui/skin/font.c
==============================================================================
--- branches/1.2/gui/skin/font.c	Tue Sep  8 22:57:39 2015	(r37505)
+++ branches/1.2/gui/skin/font.c	Tue Sep  8 23:02:05 2015	(r37506)
@@ -127,7 +127,7 @@ int fntRead(char *path, char *fname)
 
     while (fgetstr(buf, sizeof(buf), file)) {
         strswap(buf, '\t', ' ');
-        trim(buf);
+        despace(buf);
         decomment(buf);
 
         if (!*buf)

Modified: branches/1.2/gui/skin/skin.c
==============================================================================
--- branches/1.2/gui/skin/skin.c	Tue Sep  8 22:57:39 2015	(r37505)
+++ branches/1.2/gui/skin/skin.c	Tue Sep  8 23:02:05 2015	(r37506)
@@ -1224,7 +1224,7 @@ int skinRead(char *sname)
         linenumber++;
 
         strswap(line, '\t', ' ');
-        trim(line);
+        despace(line);
         decomment(line);
 
         if (!*line)

Modified: branches/1.2/gui/util/string.c
==============================================================================
--- branches/1.2/gui/util/string.c	Tue Sep  8 22:57:39 2015	(r37505)
+++ branches/1.2/gui/util/string.c	Tue Sep  8 23:02:05 2015	(r37506)
@@ -109,7 +109,7 @@ char *strswap(char *in, char from, char
  *
  * @note This is an in-place processing.
  */
-char *trim(char *in)
+char *despace(char *in)
 {
     char *src, *dest;
     int freeze = False;

Modified: branches/1.2/gui/util/string.h
==============================================================================
--- branches/1.2/gui/util/string.h	Tue Sep  8 22:57:39 2015	(r37505)
+++ branches/1.2/gui/util/string.h	Tue Sep  8 23:02:05 2015	(r37506)
@@ -31,6 +31,7 @@
 int cutInt(char *in, char sep, int num);
 void cutString(char *in, char *out, char sep, int num, size_t maxout);
 char *decomment(char *in);
+char *despace(char *in);
 char *gstrchr(const char *str, int c);
 int gstrcmp(const char *a, const char *b);
 char *gstrdup(const char *str);
@@ -40,6 +41,5 @@ void setdup(char **old, const char *str)
 char *strlower(char *in);
 char *strswap(char *in, char from, char to);
 char *strupper(char *in);
-char *trim(char *in);
 
 #endif /* MPLAYER_GUI_STRING_H */