From d5fa53ca96e2cf875f7de0890292d9db2abbda80 Mon Sep 17 00:00:00 2001 From: Ray Lehtiniemi Date: Tue, 7 Apr 2009 14:09:30 -0600 Subject: [PATCH] Constness changes Signed-off-by: Ray Lehtiniemi --- src/framework/mlt_properties.c | 2 +- src/humperdink/client.c | 2 +- src/miracle/miracle_connection.c | 2 +- src/modules/avformat/consumer_avformat.c | 2 +- src/modules/core/filter_data_show.c | 2 +- src/modules/kino/filehandler.cc | 2 +- src/valerie/valerie_response.c | 4 ++-- src/valerie/valerie_response.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c index f112e51..97ee02d 100644 --- a/src/framework/mlt_properties.c +++ b/src/framework/mlt_properties.c @@ -456,7 +456,7 @@ int mlt_properties_pass_list( mlt_properties this, mlt_properties that, const ch { char *props = strdup( list ); char *ptr = props; - char *delim = " ,\t\n"; // Any combination of spaces, commas, tabs, and newlines + const char *delim = " ,\t\n"; // Any combination of spaces, commas, tabs, and newlines int count, done = 0; while( !done ) diff --git a/src/humperdink/client.c b/src/humperdink/client.c index 880e060..afd2bbd 100644 --- a/src/humperdink/client.c +++ b/src/humperdink/client.c @@ -931,7 +931,7 @@ valerie_error_code dv_demo_transport( dv_demo demo ) valerie_error_code dv_demo_run_menu( dv_demo demo, dv_demo_menu menu ) { - char *items = "123456789abcdefghijklmnopqrstuvwxyz"; + const char *items = "123456789abcdefghijklmnopqrstuvwxyz"; int refresh_menu = 1; int terminated = 0; int item_count = 0; diff --git a/src/miracle/miracle_connection.c b/src/miracle/miracle_connection.c index aafb63d..0e83c19 100644 --- a/src/miracle/miracle_connection.c +++ b/src/miracle/miracle_connection.c @@ -133,7 +133,7 @@ static int connection_send( int fd, valerie_response response ) } else { - char *message = "500 Empty Response\r\n\r\n"; + const char *message = "500 Empty Response\r\n\r\n"; write( fd, message, strlen( message ) ); } diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c index 7757bb7..5cf2b2e 100644 --- a/src/modules/avformat/consumer_avformat.c +++ b/src/modules/avformat/consumer_avformat.c @@ -1338,7 +1338,7 @@ static void *consumer_thread( void *arg ) // Remove the x264 dual pass logs char *cwd = getcwd( NULL, 0 ); - char *file = "x264_2pass.log"; + const char *file = "x264_2pass.log"; char *full = malloc( strlen( cwd ) + strlen( file ) + 2 ); sprintf( full, "%s/%s", cwd, file ); remove( full ); diff --git a/src/modules/core/filter_data_show.c b/src/modules/core/filter_data_show.c index 6782a8b..d62bd58 100644 --- a/src/modules/core/filter_data_show.c +++ b/src/modules/core/filter_data_show.c @@ -144,7 +144,7 @@ static int process_feed( mlt_properties feed, mlt_filter filter, mlt_frame frame { int i = 0; mlt_properties properties = MLT_FILTER_PROPERTIES( requested ); - static char *prefix = "properties."; + static const char *prefix = "properties."; int len = strlen( prefix ); // Determine if this is an absolute or relative feed diff --git a/src/modules/kino/filehandler.cc b/src/modules/kino/filehandler.cc index 1a0aeac..e5e552c 100644 --- a/src/modules/kino/filehandler.cc +++ b/src/modules/kino/filehandler.cc @@ -873,7 +873,7 @@ bool QtHandler::Open( const char *s ) { Init(); - fd = quicktime_open( ( char * ) s, 1, 0 ); + fd = quicktime_open( s, 1, 0 ); if ( fd == NULL ) { fprintf( stderr, "Error opening: %s\n", s ); diff --git a/src/valerie/valerie_response.c b/src/valerie/valerie_response.c index 4b0d967..6be2c87 100644 --- a/src/valerie/valerie_response.c +++ b/src/valerie/valerie_response.c @@ -80,9 +80,9 @@ int valerie_response_get_error_code( valerie_response response ) /** Get the error description associated to the response. */ -char *valerie_response_get_error_string( valerie_response response ) +const char *valerie_response_get_error_string( valerie_response response ) { - char *error_string = "No message specified"; + const char *error_string = "No message specified"; if ( response->count > 0 ) { char *ptr = strchr( response->array[ 0 ], ' ' ) ; diff --git a/src/valerie/valerie_response.h b/src/valerie/valerie_response.h index 48622b0..5bef606 100644 --- a/src/valerie/valerie_response.h +++ b/src/valerie/valerie_response.h @@ -46,7 +46,7 @@ typedef struct extern valerie_response valerie_response_init( ); extern valerie_response valerie_response_clone( valerie_response ); extern int valerie_response_get_error_code( valerie_response ); -extern char *valerie_response_get_error_string( valerie_response ); +extern const char *valerie_response_get_error_string( valerie_response ); extern char *valerie_response_get_line( valerie_response, int ); extern int valerie_response_count( valerie_response ); extern void valerie_response_set_error( valerie_response, int, const char * ); -- 1.7.4.4