[Mplayer-cvslog] CVS: main unrarlib.c,1.3,1.4

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv17524

Modified Files:
	unrarlib.c 
Log Message:
avoid symbol clash with never samba versions (btw, unrarlib.c is full of global variables, with common names :( and it's a bit bloated, I think)

Index: unrarlib.c
===================================================================
RCS file: /cvsroot/mplayer/main/unrarlib.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unrarlib.c	14 Mar 2003 17:42:21 -0000	1.3
+++ unrarlib.c	18 May 2003 10:42:03 -0000	1.4
@@ -360,7 +360,7 @@
 static void MakeDecodeTables(unsigned char *LenTab,
                              struct Decode *Dec,
                              int Size);
-int stricomp(char *Str1,char *Str2);
+static int my_stricomp(char *Str1,char *Str2);
 /* ------------------------------------------------------------------------ */
 
 
@@ -964,7 +964,7 @@
     }
 
 
-    if(TRUE == (FileFound=(stricomp(ArgName, ArcFileName) == 0)))
+    if(TRUE == (FileFound=(my_stricomp(ArgName, ArcFileName) == 0)))
     /* *** file found! ***                                                  */
     {
       {
@@ -1038,7 +1038,7 @@
 #else
     if (ArcPtr!=NULL) tseek(ArcPtr,NextBlockPos,SEEK_SET);
 #endif
-  } while(stricomp(ArgName, ArcFileName) != 0);/* exit if file is extracted */
+  } while(my_stricomp(ArgName, ArcFileName) != 0);/* exit if file is extracted */
 
   /* free memory, clear password and close archive                          */
   free(UnpMemory);
@@ -1119,7 +1119,7 @@
 #endif
 
 
-char* strupper(char *Str)
+static char* my_strupper(char *Str)
 {
   char *ChPtr;
   for (ChPtr=Str;*ChPtr;ChPtr++)
@@ -1127,8 +1127,8 @@
   return(Str);
 }
 
-
-int stricomp(char *Str1,char *Str2)
+ 
+static int my_stricomp(char *Str1,char *Str2)
 /* compare strings without regard of '\' and '/'                            */
 {
   char S1[512],S2[512];
@@ -1157,7 +1157,7 @@
     *chptr = '_';
   }
 
-  return(strcmp(strupper(S1),strupper(S2)));
+  return(strcmp(my_strupper(S1),my_strupper(S2)));
 }