Changeset 7f42e055f359bbb4d136c1b5c554baa2b23b52a2

Timestamp:

10/21/07 13:06:37 (11 months ago)

Author:

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

git-committer:

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

git-parent:

[6ea1a2709641da5ec5c27367ff9110823fc08c82]

git-author:

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

Message:

Changing the order of parameters may be needed, but changing the parameters themselves is definitely not (it would crash in some cases anyway): add some const qualifiers

Files:

• include/main.h (modified) (1 diff)
• include/vlc/vlc.h (modified) (1 diff)
• src/control/core.c (modified) (1 diff)
• src/control/libvlc_internal.h (modified) (1 diff)
• src/libvlc-common.c (modified) (4 diffs)
• src/libvlc.c (modified) (1 diff)
• src/modules/configuration.c (modified) (3 diffs)
• src/modules/configuration.h (modified) (1 diff)
• src/vlc.c (modified) (1 diff)

include/main.h

@@ -38 +38 @@
-    /* Global properties */
-    int                    i_argc;           ///< command line arguments count
-har **      
+onst char **
-
-    char *                 psz_homedir;      ///< user's home directory

include/vlc/vlc.h

@@ -251 +251 @@
- *  \return VLC_SUCCESS on success
- */
-
+onst c
-
-/**

src/control/core.c

@@ -91 +91 @@
-    if( !p_new ) RAISENULL( "Out of memory" );
-
+    const char *my_argv[argc + 2];
+
+    my_argv[0] = "libvlc"; /* dummy arg0, skipped by getopt() et al */
+    for( int i = 0; i < argc; i++ )
+         my_argv[i + 1] = argv[i];
+    my_argv[argc + 1] = NULL; /* C calling conventions require a NULL */
+
-    /** \todo Look for interface settings. If we don't have any, add -I dummy */
-    /* Because we probably don't want a GUI by default */
-
-, 
+ + 1, my_
-        RAISENULL( "VLC initialization failed" );
-

src/control/libvlc_internal.h

@@ -40 +40 @@
- ***************************************************************************/
-VLC_EXPORT (libvlc_int_t *, libvlc_InternalCreate, ( void ) );
-
+onst c
-VLC_EXPORT (int, libvlc_InternalCleanup, ( libvlc_int_t * ) );
-VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, vlc_bool_t ) );

src/libvlc-common.c

@@ -106 +106 @@
-#endif
-static inline int LoadMessages (void);
-
+onst c
-static void Help          ( libvlc_int_t *, char const *psz_help_name );
-static void Usage         ( libvlc_int_t *, char const *psz_module_name );
@@ -236 +236 @@
- *  - configuration and commandline parsing
- */
-
+
+
-{
-    char         p_capabilities[200];
@@ -1239 +1240 @@
- * An option always follows its associated input and begins with a ":".
- *****************************************************************************/
-
+onst c
-{
-    int i_opt, i_options;
@@ -1260 +1261 @@
-
-        VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt],
-char const **)(
+
-                                        NULL ), i_options,
-                       PLAYLIST_INSERT, 0 );

src/libvlc.c

@@ -116 +116 @@
- *  - configuration and commandline parsing
- *****************************************************************************/
-
+onst c
-{
-    int i_ret;

src/modules/configuration.c

@@ -1402 +1402 @@
- * options used (ie. exported) by each module.
- *****************************************************************************/
-
+
+
-                          vlc_bool_t b_ignore_errors )
-{
@@ -1481 +1482 @@
-    if( b_ignore_errors )
-    {
-
+onst c
-        if( ppsz_argv == NULL )
-        {
@@ -1589 +1590 @@
-    opterr = 0;
-    optind = 0; /* set to 0 to tell GNU getopt to reinitialize */
-
+(char **)
-                                  p_longopts, &i_index ) ) != -1 )
-    {

src/modules/configuration.h

@@ -43 +43 @@
-#define config_LoadConfigFile(a,b) __config_LoadConfigFile(VLC_OBJECT(a),b)
-
-
+onst c
-char *config_GetHomeDir    ( void );
-char *config_GetConfigDir  ( libvlc_int_t * );

src/vlc.c

@@ -60 +60 @@
- * main: parse command line, start interface and spawn threads.
- *****************************************************************************/
-
+onst c
-{
-    int i_ret;