Changeset 45915c74f0baaaed6527dc888f3e4263fb50e7d7

Timestamp:

21/08/07 20:02:43 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1187719363 +0000

git-parent:

[9b84d144a7c957beab0f5ba38fd48b481984014e]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1187719363 +0000

Message:

Fix utf8_readdir usage

Files:

• modules/control/http/util.c (modified) (4 diffs)
• modules/demux/mkv.cpp (modified) (1 diff)
• modules/gui/ncurses.c (modified) (6 diffs)
• src/text/unicode.c (modified) (1 diff)

modules/control/http/util.c

@@ -150 +150 @@
-    msg_Dbg( p_intf, "dir=%s", psz_dir );
-
-printf( dir
+nprintf( dir, sizeof( dir )
-    if( ( file = utf8_fopen( dir, "r" ) ) != NULL )
-    {
@@ -184 +184 @@
-    }
-
-printf( dir
+nprintf( dir, sizeof( dir )
-    p_acl = ACL_Create( p_intf, VLC_FALSE );
-    if( ACL_LoadFile( p_acl, dir ) )
@@ -194 +194 @@
-    for( ;; )
-    {
-onst c
+
-        /* parse psz_src dir */
-        if( ( psz_filename = utf8_readdir( p_dir ) ) == NULL )
@@ -203 +203 @@
-        if( ( psz_filename[0] == '.' )
-         || ( i_dirlen + strlen( psz_filename ) > MAX_DIR_SIZE ) )
+        {
+            free( psz_filename );
-            continue;
-
-
-
+
+
+
+
-
-        if( E_(ParseDirectory)( p_intf, psz_root, dir ) )

modules/demux/mkv.cpp

@@ -1533 +1533 @@
-                        if (!s_filename.compare(p_demux->psz_path))
-#endif
+                        {
+                            free (psz_file);
-                            continue; // don't reuse the original opened file
+                        }
-
-#if defined(__GNUC__) && (__GNUC__ < 3)

modules/gui/ncurses.c

@@ -28 +28 @@
- * Preamble
- *****************************************************************************/
+#include <vlc/vlc.h>
+
-#include <errno.h>                                                 /* ENOMEM */
-#include <time.h>
@@ -33 +35 @@
-#include <curses.h>
-
-#include <vlc/vlc.h>
-#include <vlc_interface.h>
-#include <vlc_vout.h>
@@ -1928 +1929 @@
-        p_sys->i_dir_entries = 0;
-
-        /* get the first directory entry */
-        psz_entry = utf8_readdir( p_current_dir );
-
-        /* while we still have entries in the directory */
-psz_entry
+( psz_entry = utf8_readdir( p_current_dir ) )
-        {
-#if defined( S_ISDIR )
@@ -1947 +1945 @@
-            {
-                free( psz_entry );
-                psz_entry = utf8_readdir( p_current_dir );
-                continue;
-            }
@@ -1956 +1953 @@
-            if( !( p_dir_entry = malloc( sizeof( struct dir_entry_t) ) ) )
-            {
-
-
+
+
+
-            }
-
-#if defined( S_ISDIR )
-utf8_stat( psz_uri, &stat_data );
-if(
+if( !utf8_stat( psz_uri, &stat_data )
+ &&
-/*#elif defined( DT_DIR )
-            if( p_dir_content->d_type & DT_DIR )*/
@@ -1984 +1982 @@
-            free( psz_uri );
-            free( psz_entry );
-            /* Read next entry */
-            psz_entry = utf8_readdir( p_current_dir );
-        }
-

src/text/unicode.c

@@ -417 +417 @@
- * @param dir The directory that is being read
- *
-LocaleFree() to free this memory
+free() to free this memory.
- */
-char *utf8_readdir( DIR *dir )