From 2c72452b8db5ff34a4ec9cf460ca949b5adcd6f2 Mon Sep 17 00:00:00 2001 From: Ray Lehtiniemi Date: Tue, 7 Apr 2009 13:15:04 -0600 Subject: [PATCH] Constness changes Signed-off-by: Ray Lehtiniemi --- src/humperdink/client.c | 6 +++--- src/humperdink/io.c | 2 +- src/humperdink/io.h | 2 +- src/miracle/miracle_log.c | 2 +- src/miracle/miracle_log.h | 2 +- src/valerie/valerie.c | 4 ++-- src/valerie/valerie.h | 4 ++-- src/valerie/valerie_response.c | 2 +- src/valerie/valerie_response.h | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/humperdink/client.c b/src/humperdink/client.c index bd69d06..880e060 100644 --- a/src/humperdink/client.c +++ b/src/humperdink/client.c @@ -47,10 +47,10 @@ typedef valerie_error_code (*demo_function)( dv_demo ); typedef struct { - char *description; + const char *description; struct menu_item { - char *option; + const char *option; demo_function function; } array[ 50 ]; @@ -613,7 +613,7 @@ valerie_error_code dv_demo_load( dv_demo demo ) if ( refresh ) { - char *action = "Load & Play"; + const char *action = "Load & Play"; if ( demo->queues[ demo->selected_unit ].mode ) action = "Queue"; printf( "%s from %s\n\n", action, demo->current_directory ); diff --git a/src/humperdink/io.c b/src/humperdink/io.c index e5f54b7..8955d7d 100644 --- a/src/humperdink/io.c +++ b/src/humperdink/io.c @@ -72,7 +72,7 @@ char *strip_quotes( char *input ) return input; } -char *io_get_string( char *output, int maxlength, char *use ) +char *io_get_string( char *output, int maxlength, const char *use ) { char *value = NULL; strcpy( output, use ); diff --git a/src/humperdink/io.h b/src/humperdink/io.h index 1b4deec..88e1b19 100644 --- 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 *io_get_string( char *, int, char * ); +extern char *io_get_string( char *, int, const char * ); extern int *get_int( int *, int ); extern void term_init( ); extern int term_read( ); diff --git a/src/miracle/miracle_log.c b/src/miracle/miracle_log.c index f5f7e1a..62b7f73 100644 --- a/src/miracle/miracle_log.c +++ b/src/miracle/miracle_log.c @@ -36,7 +36,7 @@ void miracle_log_init( enum log_output method, int new_threshold ) } -void miracle_log( int priority, char *format, ... ) +void miracle_log( int priority, const char *format, ... ) { va_list list; va_start( list, format ); diff --git a/src/miracle/miracle_log.h b/src/miracle/miracle_log.h index 3788ee5..be21893 100644 --- a/src/miracle/miracle_log.h +++ b/src/miracle/miracle_log.h @@ -34,7 +34,7 @@ enum log_output { }; void miracle_log_init( enum log_output method, int threshold ); -void miracle_log( int priority, char *format, ... ); +void miracle_log( int priority, const char *format, ... ); #ifdef __cplusplus } diff --git a/src/valerie/valerie.c b/src/valerie/valerie.c index f6a79d8..6fd6cd0 100644 --- a/src/valerie/valerie.c +++ b/src/valerie/valerie.c @@ -117,7 +117,7 @@ static valerie_error_code valerie_get_error_code( valerie this, valerie_response /** Execute a command. */ -valerie_error_code valerie_execute( valerie this, size_t size, char *format, ... ) +valerie_error_code valerie_execute( valerie this, size_t size, const char *format, ... ) { valerie_error_code error = valerie_server_unavailable; char *command = malloc( size ); @@ -534,7 +534,7 @@ valerie_error_code valerie_unit_clear_in_out( valerie this, int unit ) /** Set a unit configuration property. */ -valerie_error_code valerie_unit_set( valerie this, int unit, char *name, char *value ) +valerie_error_code valerie_unit_set( valerie this, int unit, const char *name, const char *value ) { return valerie_execute( this, 1024, "USET U%d %s=%s", unit, name, value ); } diff --git a/src/valerie/valerie.h b/src/valerie/valerie.h index fdd165b..0be08c9 100644 --- a/src/valerie/valerie.h +++ b/src/valerie/valerie.h @@ -122,7 +122,7 @@ extern valerie_error_code valerie_unit_set_out( valerie, int, int32_t ); extern valerie_error_code valerie_unit_clear_in( valerie, int ); extern valerie_error_code valerie_unit_clear_out( valerie, int ); extern valerie_error_code valerie_unit_clear_in_out( valerie, int ); -extern valerie_error_code valerie_unit_set( valerie, int, char *, char * ); +extern valerie_error_code valerie_unit_set( valerie, int, const char *, const char * ); extern valerie_error_code valerie_unit_get( valerie, int, char * ); extern valerie_error_code valerie_unit_status( valerie, int, valerie_status ); extern valerie_error_code valerie_unit_transfer( valerie, int, int ); @@ -251,7 +251,7 @@ extern valerie_response valerie_get_last_response( valerie ); extern char *valerie_error_description( valerie_error_code ); /* Courtesy functions. */ -extern valerie_error_code valerie_execute( valerie, size_t, char *, ... ); +extern valerie_error_code valerie_execute( valerie, size_t, const char *, ... ); extern valerie_error_code valerie_push( valerie, mlt_service, size_t, char *, ... ); /* Close function. */ diff --git a/src/valerie/valerie_response.c b/src/valerie/valerie_response.c index 9b6a964..4b0d967 100644 --- a/src/valerie/valerie_response.c +++ b/src/valerie/valerie_response.c @@ -137,7 +137,7 @@ void valerie_response_set_error( valerie_response response, int error_code, cons /** Write formatted text to the response. */ -int valerie_response_printf( valerie_response response, size_t size, char *format, ... ) +int valerie_response_printf( valerie_response response, size_t size, const char *format, ... ) { int length = 0; char *text = malloc( size ); diff --git a/src/valerie/valerie_response.h b/src/valerie/valerie_response.h index f44eae6..48622b0 100644 --- a/src/valerie/valerie_response.h +++ b/src/valerie/valerie_response.h @@ -50,7 +50,7 @@ extern 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 * ); -extern int valerie_response_printf( valerie_response, size_t, char *, ... ); +extern int valerie_response_printf( valerie_response, size_t, const char *, ... ); extern int valerie_response_write( valerie_response, const char *, int ); extern void valerie_response_close( valerie_response ); -- 1.7.4.4