[MPlayer-dev-eng] [PATCH] Gui/skin/skin.c

[Björn Sandell]

Userland symbols should not start with __, such names should be reserved
for compiler/system usage.


Björn Sandell       DCE/DFS Sysadmin       IT department
Chalmers University of Technology    www.dce.chalmers.se
-------------- next part --------------
Index: Gui/skin/skin.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/skin/skin.c,v
retrieving revision 1.17
diff -u -r1.17 skin.c
--- Gui/skin/skin.c	28 May 2002 14:12:33 -0000	1.17
+++ Gui/skin/skin.c	12 Jun 2002 13:26:03 -0000
@@ -74,7 +74,7 @@
  return i;
 }
 
-int __section( char * in )
+int skin__section( char * in )
 {
  strlower( in );
  defList=NULL;
@@ -83,7 +83,7 @@
  return 0;
 }
 
-int __end( char * in )
+int skin__end( char * in )
 {
  if ( strlen( winList ) ) winList[0]=0;
   else defList=NULL;
@@ -91,7 +91,7 @@
  return 0;
 }
 
-int __window( char * in )
+int skin__window( char * in )
 {
  CHECKDEFLIST( "window" );
 
@@ -101,7 +101,7 @@
  return 0;
 }
 
-int __base( char * in )
+int skin__base( char * in )
 {
  unsigned char fname[512];
  unsigned char tmp[512];
@@ -188,7 +188,7 @@
  return 0;
 }
 
-int __background( char * in )
+int skin__background( char * in )
 {
  CHECKDEFLIST( "background" );
  CHECKWINLIST( "background" );
@@ -203,7 +203,7 @@
  return 0;
 }
 
-int __button( char * in )
+int skin__button( char * in )
 {
  unsigned char   fname[512];
  unsigned char   tmp[512];
@@ -246,7 +246,7 @@
  return 0;
 }
 
-int __selected( char * in )
+int skin__selected( char * in )
 {
  unsigned char   fname[512];
  unsigned char   tmp[512];
@@ -265,7 +265,7 @@
  return 0;
 }
 
-int __menu( char * in )
+int skin__menu( char * in )
 { // menu = number,x,y,sx,sy,msg
  int             x,y,sx,sy,msg;
  unsigned char   tmp[64];
@@ -297,7 +297,7 @@
  return 0;
 }
 
-int __hpotmeter( char * in )
+int skin__hpotmeter( char * in )
 { // hpotmeter=buttonbitmaps,sx,sy,phasebitmaps,phases,default value,x,y,sx,sy,msg
  int             x,y,psx,psy,ph,sx,sy,msg,d;
  unsigned char   tmp[512];
@@ -354,7 +354,7 @@
  return 0;
 }
 
-int __potmeter( char * in )
+int skin__potmeter( char * in )
 { // potmeter=phasebitmaps,phases,default value,x,y,sx,sy,msg
  int             x,y,ph,sx,sy,msg,d;
  unsigned char   tmp[512];
@@ -397,7 +397,7 @@
  return 0;
 }
 
-int __font( char * in )
+int skin__font( char * in )
 { // font=fontname,fontid
  char    name[512];
  char    id[512];
@@ -426,7 +426,7 @@
  return 0;
 }
 
-int __slabel( char * in )
+int skin__slabel( char * in )
 {
  char    tmp[512];
  char    sid[63];
@@ -460,7 +460,7 @@
  return 0;
 }
 
-int __dlabel( char * in )
+int skin__dlabel( char * in )
 { // dlabel=x,y,sx,align,fontid,string ...
  char    tmp[512];
  char    sid[63];
@@ -496,7 +496,7 @@
  return 0;
 }
 
-int __decoration( char * in )
+int skin__decoration( char * in )
 {
  char    tmp[512];
 
@@ -521,20 +521,20 @@
 
 _item skinItem[] =
  {
-  { "section",     __section     },
-  { "end",         __end         },
-  { "window",      __window      },
-  { "base",        __base        },
-  { "button",      __button      },
-  { "selected",    __selected    },
-  { "background",  __background  },
-  { "hpotmeter",   __hpotmeter   },
-  { "potmeter",    __potmeter    },
-  { "font",        __font        },
-  { "slabel",      __slabel      },
-  { "dlabel",      __dlabel      },
-  { "decoration",  __decoration  },
-  { "menu",        __menu        }
+  { "section",     skin__section     },
+  { "end",         skin__end         },
+  { "window",      skin__window      },
+  { "base",        skin__base        },
+  { "button",      skin__button      },
+  { "selected",    skin__selected    },
+  { "background",  skin__background  },
+  { "hpotmeter",   skin__hpotmeter   },
+  { "potmeter",    skin__potmeter    },
+  { "font",        skin__font        },
+  { "slabel",      skin__slabel      },
+  { "dlabel",      skin__dlabel      },
+  { "decoration",  skin__decoration  },
+  { "menu",        skin__menu        }
  };
 
 #define ITEMS (int)( sizeof( skinItem )/sizeof( _item ) )