RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Get rid of pointless tmppath variable in set_path_env(). 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30895 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-03-14 23:42:03 +00:00
parent ee2ac03ccc
commit 6ca07e4c8b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
get_path.c
View File

@ -159,11 +159,9 @@ char *get_path(const char *filename){
void set_path_env(void) void set_path_env(void)
{ {
/*make our codec dirs available for LoadLibraryA()*/ /*make our codec dirs available for LoadLibraryA()*/
char tmppath[MAX_PATH*2 + 1];
char win32path[MAX_PATH]; char win32path[MAX_PATH];
#ifdef __CYGWIN__ #ifdef __CYGWIN__
cygwin_conv_to_full_win32_path(BINARY_CODECS_PATH, win32path); cygwin_conv_to_full_win32_path(BINARY_CODECS_PATH, win32path);
strcpy(tmppath,win32path);
#else /*__CYGWIN__*/ #else /*__CYGWIN__*/
/* Expand to absolute path unless it's already absolute */ /* Expand to absolute path unless it's already absolute */
if (!strstr(BINARY_CODECS_PATH,":") && BINARY_CODECS_PATH[0] != '\\') { if (!strstr(BINARY_CODECS_PATH,":") && BINARY_CODECS_PATH[0] != '\\') {
@ -171,10 +169,9 @@ void set_path_env(void)
strcpy(strrchr(win32path, '\\') + 1, BINARY_CODECS_PATH); strcpy(strrchr(win32path, '\\') + 1, BINARY_CODECS_PATH);
} }
else strcpy(win32path, BINARY_CODECS_PATH); else strcpy(win32path, BINARY_CODECS_PATH);
strcpy(tmppath,win32path);
#endif /*__CYGWIN__*/ #endif /*__CYGWIN__*/
mp_msg(MSGT_WIN32, MSGL_V,"Setting PATH to %s\n",tmppath); mp_msg(MSGT_WIN32, MSGL_V, "Setting PATH to %s\n", win32path);
if (!SetEnvironmentVariableA("PATH", tmppath)) if (!SetEnvironmentVariableA("PATH", win32path))
mp_msg(MSGT_WIN32, MSGL_WARN, "Cannot set PATH!"); mp_msg(MSGT_WIN32, MSGL_WARN, "Cannot set PATH!");
} }
#endif /* (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL) */ #endif /* (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL) */