git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4a8900b
)
* sub.c : fixed a warning.
author
Laurent Aimar
<fenrir@videolan.org>
Sun, 24 Aug 2003 00:36:38 +0000
(
00:36
+0000)
committer
Laurent Aimar
<fenrir@videolan.org>
Sun, 24 Aug 2003 00:36:38 +0000
(
00:36
+0000)
modules/demux/util/sub.c
patch
|
blob
|
history
diff --git
a/modules/demux/util/sub.c
b/modules/demux/util/sub.c
index
7406e08
..
340034b
100644
(file)
--- a/
modules/demux/util/sub.c
+++ b/
modules/demux/util/sub.c
@@
-2,7
+2,7
@@
* sub.c
*****************************************************************************
* Copyright (C) 1999-2003 VideoLAN
* sub.c
*****************************************************************************
* Copyright (C) 1999-2003 VideoLAN
- * $Id: sub.c,v 1.2
2 2003/08/23 22:02:45 hartman
Exp $
+ * $Id: sub.c,v 1.2
3 2003/08/24 00:36:38 fenrir
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
@@
-243,7
+243,8
@@
char* sub_detect( subtitle_demux_t *p_sub, char *psz_filename)
DIR *p_dir_handle;
struct dirent *p_dir_afile;
char * ppsz_sub_exts[] = { "sub", "srt", "smi", "ssa", NULL};
DIR *p_dir_handle;
struct dirent *p_dir_afile;
char * ppsz_sub_exts[] = { "sub", "srt", "smi", "ssa", NULL};
- char *psz_result, *psz_basename, *psz_dir, *psz_file_noext, *psz_extension;
+ char *psz_result, *psz_basename, *psz_dir = NULL;
+ char *psz_file_noext, *psz_extension;
int i;
size_t i_dirlen = 0;
int i;
size_t i_dirlen = 0;
@@
-264,20
+265,20
@@
char* sub_detect( subtitle_demux_t *p_sub, char *psz_filename)
return "";
}
strncpy( psz_dir, psz_filename, i_dirlen );
return "";
}
strncpy( psz_dir, psz_filename, i_dirlen );
- psz_dir[i_dirlen] = '\0';
+ psz_dir[i_dirlen] = '\0';
++psz_basename;
}
else
{
psz_basename = psz_filename;
}
++psz_basename;
}
else
{
psz_basename = psz_filename;
}
-
+
psz_extension = strrchr( psz_basename , '.' );
psz_extension = strrchr( psz_basename , '.' );
-
+
if( psz_extension )
{
size_t i_baselen = ( 1 + psz_extension ) - psz_basename;
if( psz_extension )
{
size_t i_baselen = ( 1 + psz_extension ) - psz_basename;
-
+
psz_file_noext = (char*)malloc( i_baselen + 1 );
if( !psz_file_noext )
{
psz_file_noext = (char*)malloc( i_baselen + 1 );
if( !psz_file_noext )
{
@@
-288,14
+289,14
@@
char* sub_detect( subtitle_demux_t *p_sub, char *psz_filename)
++psz_extension;
}
else return "";
++psz_extension;
}
else return "";
-
- p_dir_handle = opendir( psz_dir );
- if( p_dir_handle ) {
+
+ p_dir_handle = opendir( psz_dir
? psz_dir : ""
);
+
if( p_dir_handle ) {
int i_found = 0;
int i_found = 0;
- while(( p_dir_afile = readdir( p_dir_handle ))) {
+
while(( p_dir_afile = readdir( p_dir_handle ))) {
char* psz_afile_ext = strrchr( p_dir_afile->d_name, '.' );
char* psz_afile_ext = strrchr( p_dir_afile->d_name, '.' );
-
+
if( psz_afile_ext )
{
++psz_afile_ext;
if( psz_afile_ext )
{
++psz_afile_ext;
@@
-323,7
+324,6
@@
char* sub_detect( subtitle_demux_t *p_sub, char *psz_filename)
}
closedir( p_dir_handle );
}
}
closedir( p_dir_handle );
}
-
}
return "";
}
}
return "";
}