Changeset 3e6aa513530fc81c4df84736ff983194e213a7dd

Timestamp:

02/28/06 13:45:37 (3 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1141130737 +0000

git-parent:

[7e7d587a44280a84914474364c6806f948af17cb]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1141130737 +0000

Message:

Use VLC stream functions to load vlm configs. Refs #567

Files:

• src/misc/vlm.c (modified) (3 diffs)

src/misc/vlm.c

@@ -216 +216 @@
-int vlm_Load( vlm_t *p_vlm, const char *psz_file )
-{
-FILE *file
+stream_t *p_stream
-    int64_t i_size;
-    char *psz_buffer;
@@ -222 +222 @@
-    if( !p_vlm || !psz_file ) return 1;
-
-file = utf8_fopen( psz_file, "r"
-file
-
-fseek( file, 0, SEEK_END
-
-fclose( file
+p_stream = stream_UrlNew( p_vlm, psz_file
+p_stream
+
+stream_Seek( p_stream, 0 
+
+stream_Delete( p_stream
-        return 2;
-    }
-
-ftell( file
-
+stream_Size( p_stream
+
-    psz_buffer = malloc( i_size + 1 );
-    if( !psz_buffer )
-    {
-fclose( file
+stream_Delete( p_stream
-        return 2;
-    }
-
+
+
-    psz_buffer[ i_size ] = '\0';
+
+    stream_Delete( p_stream );
+
-    if( Load( p_vlm, psz_buffer ) )
-    {
-        fclose( file );
-        free( psz_buffer );
-        return 3;
@@ -249 +252 @@
-
-    free( psz_buffer );
-    fclose( file );
-
-    return 0;