# HG changeset patch # User alex # Date 1053254523 0 # Node ID 228a767a51fd2353951a8a90a59c13137a9f0ce7 # Parent cbb862b8363dfe218a0af37abfdeac842fc177ca 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) diff -r cbb862b8363d -r 228a767a51fd unrarlib.c --- a/unrarlib.c Sun May 18 00:26:13 2003 +0000 +++ b/unrarlib.c Sun May 18 10:42:03 2003 +0000 @@ -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))); }