Remove OS/X warning re: get_string

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@843 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/humperdink/client.c b/src/humperdink/client.c
index b5ace3dedda178897efa0e3bcb5734d59f16ab65..4f93f2c752d24cc060c437f5e7c66f0e634bd1f8 100644 (file)
--- a/src/humperdink/client.c
+++ b/src/humperdink/client.c
@@ -423,7 +423,7 @@ valerie_error_code dv_demo_execute( dv_demo demo )
                terminated = 1;
                printf( "Command> " );
 
-               if ( chomp( get_string( command, 10240, "" ) ) != NULL )
+               if ( chomp( io_get_string( command, 10240, "" ) ) != NULL )
                {
                        if ( strcmp( command, "" ) )
                        {

diff --git a/src/humperdink/io.c b/src/humperdink/io.c
index 90999cc15451de187df7240fba009ee8fd394e96..a9bcf41b27055b44997ab7bc4d6c49e93a02eb9a 100644 (file)
--- a/src/humperdink/io.c
+++ b/src/humperdink/io.c
@@ -72,7 +72,7 @@ char *strip_quotes( char *input )
        return input;
 }
 
-char *get_string( char *output, int maxlength, char *use )
+char *io_get_string( char *output, int maxlength, char *use )
 {
        char *value = NULL;
        strcpy( output, use );

diff --git a/src/humperdink/io.h b/src/humperdink/io.h
index 6c4b609a1e4c48414bdd238b01c7484c229f592e..c5ad8129e6d59c2967107c3721964143540f19dc 100644 (file)
--- a/src/humperdink/io.h
+++ b/src/humperdink/io.h
@@ -24,7 +24,7 @@
 extern char *chomp( char * );
 extern char *trim( char * );
 extern char *strip_quotes( char * );
-extern char *get_string( char *, int, char * );
+extern char *io_get_string( char *, int, char * );
 extern int *get_int( int *, int );
 extern void term_init( );
 extern int term_read( );

diff --git a/src/humperdink/remote.c b/src/humperdink/remote.c
index 9306b21577237f26474331fa065522cffc964745..cdcad066ac652e65805444a743529e62cce4c9e1 100644 (file)
--- a/src/humperdink/remote.c
+++ b/src/humperdink/remote.c
@@ -42,7 +42,7 @@ static valerie_parser create_parser( )
 
        printf( "Server [localhost]: " );
 
-       if ( get_string( server, sizeof( server ), "localhost" ) != NULL )
+       if ( io_get_string( server, sizeof( server ), "localhost" ) != NULL )
        {
                printf( "Port        [5250]: " );
 

diff --git a/src/inigo/io.c b/src/inigo/io.c
index 271f771d1368f7315ffbbb412a22642432562baf..06acc3780b59744aa0e141a20defe5f48485f448 100644 (file)
--- a/src/inigo/io.c
+++ b/src/inigo/io.c
@@ -76,19 +76,6 @@ char *strip_quotes( char *input )
        return input;
 }
 
-char *get_string( char *output, int maxlength, char *use )
-{
-       char *value = NULL;
-       strcpy( output, use );
-       if ( trim( chomp( fgets( output, maxlength, stdin ) ) ) != NULL )
-       {
-               if ( !strcmp( output, "" ) )
-                       strcpy( output, use );
-               value = output;
-       }
-       return value;
-}
-
 int *get_int( int *output, int use )
 {
        int *value = NULL;