From: Ray Lehtiniemi Date: Tue, 7 Apr 2009 19:49:52 +0000 (-0600) Subject: Constness changes X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2dc70e900cade445fe5d8fdd3e9fe483f1257489;p=mlt Constness changes Signed-off-by: Ray Lehtiniemi --- diff --git a/src/humperdink/io.c b/src/humperdink/io.c index 8955d7df..42718df0 100644 --- a/src/humperdink/io.c +++ b/src/humperdink/io.c @@ -186,7 +186,7 @@ char get_keypress( ) return value; } -void wait_for_any_key( char *message ) +void wait_for_any_key( const char *message ) { if ( message == NULL ) printf( "Press any key to continue: " ); diff --git a/src/humperdink/io.h b/src/humperdink/io.h index 88e1b19b..f4ac23ad 100644 --- a/src/humperdink/io.h +++ b/src/humperdink/io.h @@ -30,7 +30,7 @@ extern void term_init( ); extern int term_read( ); extern void term_exit( ); extern char get_keypress( ); -extern void wait_for_any_key( char * ); +extern void wait_for_any_key( const char * ); extern void beep( ); #endif diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 1f4ad894..3a8bb3ec 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -201,7 +201,7 @@ static inline double delta_calculate( mlt_transition this, mlt_frame frame, mlt_ return length * ( y - x ) / 2.0; } -static int get_value( mlt_properties properties, char *preferred, char *fallback ) +static int get_value( mlt_properties properties, const char *preferred, const char *fallback ) { int value = mlt_properties_get_int( properties, preferred ); if ( value == 0 ) diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c index 7b14d3a4..3398e79a 100644 --- a/src/modules/gtk2/producer_pango.c +++ b/src/modules/gtk2/producer_pango.c @@ -218,7 +218,7 @@ mlt_producer producer_pango_init( const char *filename ) return NULL; } -static void set_string( char **string, char *value, char *fallback ) +static void set_string( char **string, const char *value, const char *fallback ) { if ( value != NULL ) { @@ -282,7 +282,7 @@ rgba_color parse_color( char *color ) /** Convert a string property to UTF-8 */ -static int iconv_utf8( mlt_properties properties, char *prop_name, const char* encoding ) +static int iconv_utf8( mlt_properties properties, const char *prop_name, const char* encoding ) { char *text = mlt_properties_get( properties, prop_name ); int result = -1; diff --git a/src/modules/westley/consumer_westley.c b/src/modules/westley/consumer_westley.c index fdc26b4f..29174be2 100644 --- a/src/modules/westley/consumer_westley.c +++ b/src/modules/westley/consumer_westley.c @@ -200,7 +200,7 @@ static void serialise_properties( serialise_context context, mlt_properties prop } } -static void serialise_store_properties( serialise_context context, mlt_properties properties, xmlNode *node, char *store ) +static void serialise_store_properties( serialise_context context, mlt_properties properties, xmlNode *node, const char *store ) { int i; xmlNode *p; diff --git a/src/valerie/valerie.c b/src/valerie/valerie.c index bc3624df..dfc45912 100644 --- a/src/valerie/valerie.c +++ b/src/valerie/valerie.c @@ -587,7 +587,7 @@ valerie_notifier valerie_get_notifier( valerie this ) /** List the contents of the specified directory. */ -valerie_dir valerie_dir_init( valerie this, char *directory ) +valerie_dir valerie_dir_init( valerie this, const char *directory ) { valerie_dir dir = malloc( sizeof( valerie_dir_t ) ); if ( dir != NULL ) diff --git a/src/valerie/valerie.h b/src/valerie/valerie.h index a6378b44..c43e7401 100644 --- a/src/valerie/valerie.h +++ b/src/valerie/valerie.h @@ -153,7 +153,7 @@ typedef struct *valerie_dir_entry, valerie_dir_entry_t; /* Directory reading. */ -extern valerie_dir valerie_dir_init( valerie, char * ); +extern valerie_dir valerie_dir_init( valerie, const char * ); extern valerie_error_code valerie_dir_get_error_code( valerie_dir ); extern valerie_error_code valerie_dir_get( valerie_dir, int, valerie_dir_entry ); extern int valerie_dir_count( valerie_dir ); diff --git a/src/valerie/valerie_parser.c b/src/valerie/valerie_parser.c index 7d6e6d3c..1a74c50f 100644 --- a/src/valerie/valerie_parser.c +++ b/src/valerie/valerie_parser.c @@ -63,7 +63,7 @@ valerie_response valerie_parser_push( valerie_parser parser, char *command, mlt_ /** Execute a formatted command via the parser. */ -valerie_response valerie_parser_executef( valerie_parser parser, char *format, ... ) +valerie_response valerie_parser_executef( valerie_parser parser, const char *format, ... ) { char *command = malloc( 10240 ); valerie_response response = NULL; diff --git a/src/valerie/valerie_parser.h b/src/valerie/valerie_parser.h index 7d9d8a55..2860dd5a 100644 --- a/src/valerie/valerie_parser.h +++ b/src/valerie/valerie_parser.h @@ -64,7 +64,7 @@ extern valerie_response valerie_parser_connect( valerie_parser ); extern valerie_response valerie_parser_push( valerie_parser, char *, mlt_service ); extern valerie_response valerie_parser_received( valerie_parser, char *, char * ); extern valerie_response valerie_parser_execute( valerie_parser, char * ); -extern valerie_response valerie_parser_executef( valerie_parser, char *, ... ); +extern valerie_response valerie_parser_executef( valerie_parser, const char *, ... ); extern valerie_response valerie_parser_run( valerie_parser, char * ); extern valerie_notifier valerie_parser_get_notifier( valerie_parser ); extern void valerie_parser_close( valerie_parser ); diff --git a/src/valerie/valerie_socket.c b/src/valerie/valerie_socket.c index 2ed79ef5..8a918328 100644 --- a/src/valerie/valerie_socket.c +++ b/src/valerie/valerie_socket.c @@ -125,7 +125,7 @@ int valerie_socket_read_data( valerie_socket socket, char *data, int length ) /** Write an arbitrarily formatted block of data to the server. */ -int valerie_socket_write_data( valerie_socket socket, char *data, int length ) +int valerie_socket_write_data( valerie_socket socket, const char *data, int length ) { int used = 0; diff --git a/src/valerie/valerie_socket.h b/src/valerie/valerie_socket.h index f016ca1a..61838de1 100644 --- a/src/valerie/valerie_socket.h +++ b/src/valerie/valerie_socket.h @@ -46,7 +46,7 @@ extern valerie_socket valerie_socket_init( char *, int ); extern int valerie_socket_connect( valerie_socket ); extern valerie_socket valerie_socket_init_fd( int ); extern int valerie_socket_read_data( valerie_socket, char *, int ); -extern int valerie_socket_write_data( valerie_socket, char *, int ); +extern int valerie_socket_write_data( valerie_socket, const char *, int ); extern void valerie_socket_close( valerie_socket ); #ifdef __cplusplus