diff options
author | wm4 <wm4@nowhere> | 2013-07-23 00:45:23 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-23 00:45:23 +0200 |
commit | e83cbde1a4b816a64cefde1fb8bdbac403079600 (patch) | |
tree | 1ac71b13723174ab48465915fd5e9916faa7df35 /demux/mf.c | |
parent | 78ebb3c6fa637206bb369349ba93328b36895e2b (diff) | |
download | mpv-e83cbde1a4b816a64cefde1fb8bdbac403079600.tar.bz2 mpv-e83cbde1a4b816a64cefde1fb8bdbac403079600.tar.xz |
Fix some -Wshadow warnings
In general, this warning can hint to actual bugs. We don't enable it
yet, because it would conflict with some unmerged code, and we should
check with clang too (this commit was done by testing with gcc).
Diffstat (limited to 'demux/mf.c')
-rw-r--r-- | demux/mf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/demux/mf.c b/demux/mf.c index 21c3fad186..726bc8f394 100644 --- a/demux/mf.c +++ b/demux/mf.c @@ -96,20 +96,20 @@ mf_t* open_mf_pattern(char * filename) { bstr bfname; bstr_split_tok(bfilename, ",", &bfname, &bfilename); - char *fname = bstrdup0(NULL, bfname); + char *fname2 = bstrdup0(NULL, bfname); - if ( !mp_path_exists( fname ) ) + if ( !mp_path_exists( fname2 ) ) { - mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname ); + mp_msg( MSGT_STREAM,MSGL_V,"[mf] file not found: '%s'\n",fname2 ); } else { mf->names=realloc( mf->names,( mf->nr_of_files + 1 ) * sizeof( char* ) ); - mf->names[mf->nr_of_files] = strdup(fname); + mf->names[mf->nr_of_files] = strdup(fname2); // mp_msg( MSGT_STREAM,MSGL_V,"[mf] added file %d.: %s\n",mf->nr_of_files,mf->names[mf->nr_of_files] ); mf->nr_of_files++; } - talloc_free(fname); + talloc_free(fname2); } mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d\n",mf->nr_of_files ); |