RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 15:52:25 +00:00
Code Issues Releases Wiki Activity

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)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10128 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-05-18 10:42:03 +00:00
parent cea5e940fe
commit 652cf76466
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unrarlib.c
View File

@ -360,7 +360,7 @@ static void ReadLastTables(void);
static void MakeDecodeTables(unsigned char *LenTab, static void MakeDecodeTables(unsigned char *LenTab,
struct Decode *Dec, struct Decode *Dec,
int Size); int Size);
int stricomp(char *Str1,char *Str2); static int my_stricomp(char *Str1,char *Str2);
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
@ -964,7 +964,7 @@ BOOL ExtrFile(void)
} }
if(TRUE == (FileFound=(stricomp(ArgName, ArcFileName) == 0))) if(TRUE == (FileFound=(my_stricomp(ArgName, ArcFileName) == 0)))
/* *** file found! *** */ /* *** file found! *** */
{ {
{ {
@ -1038,7 +1038,7 @@ BOOL ExtrFile(void)
#else #else
if (ArcPtr!=NULL) tseek(ArcPtr,NextBlockPos,SEEK_SET); if (ArcPtr!=NULL) tseek(ArcPtr,NextBlockPos,SEEK_SET);
#endif #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 memory, clear password and close archive */
free(UnpMemory); free(UnpMemory);
@ -1119,7 +1119,7 @@ int tseek(void *stream,long offset,int fromwhere)
#endif #endif
char* strupper(char *Str) static char* my_strupper(char *Str)
{ {
char *ChPtr; char *ChPtr;
for (ChPtr=Str;*ChPtr;ChPtr++) for (ChPtr=Str;*ChPtr;ChPtr++)
@ -1127,8 +1127,8 @@ char* strupper(char *Str)
return(Str); return(Str);
} }
int stricomp(char *Str1,char *Str2) static int my_stricomp(char *Str1,char *Str2)
/* compare strings without regard of '\' and '/' */ /* compare strings without regard of '\' and '/' */
{ {
char S1[512],S2[512]; char S1[512],S2[512];
@ -1157,7 +1157,7 @@ int stricomp(char *Str1,char *Str2)
*chptr = '_'; *chptr = '_';
} }
return(strcmp(strupper(S1),strupper(S2))); return(strcmp(my_strupper(S1),my_strupper(S2)));
} }