From: Ray Lehtiniemi Date: Tue, 7 Apr 2009 19:27:54 +0000 (-0600) Subject: Constness changes X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b04e420ea47a17a9d1474a9c72a76ab4540a439c;p=mlt Constness changes Signed-off-by: Ray Lehtiniemi --- diff --git a/src/miracle/miracle_local.c b/src/miracle/miracle_local.c index 143f101d..c1029a19 100644 --- a/src/miracle/miracle_local.c +++ b/src/miracle/miracle_local.c @@ -105,7 +105,7 @@ valerie_parser miracle_parser_init_local( ) typedef struct { int code; - char *message; + const char *message; } responses_t; @@ -146,7 +146,7 @@ arguments_types; typedef struct { /* The command string corresponding to this operation (e.g. "play") */ - char *command; + const char *command; /* The function associated with it */ response_codes (*operation) ( command_argument ); /* a boolean to indicate if this is a unit or global command @@ -155,7 +155,7 @@ typedef struct /* What type is the argument (RTTI :-) ATYPE_whatever */ int type; /* online help information */ - char *help; + const char *help; } command_t; @@ -217,7 +217,7 @@ static char helpstr [] = /** Lookup the response message for a status code. */ -inline char *get_response_msg( int code ) +inline const char *get_response_msg( int code ) { int i = 0; for ( i = 0; responses[ i ].message != NULL && code != responses[ i ].code; i ++ ) ; diff --git a/src/valerie/valerie.c b/src/valerie/valerie.c index 6fd6cd0a..bc3624df 100644 --- a/src/valerie/valerie.c +++ b/src/valerie/valerie.c @@ -911,9 +911,9 @@ valerie_response valerie_get_last_response( valerie this ) /** Obtain a printable message associated to the error code provided. */ -char *valerie_error_description( valerie_error_code error ) +const char *valerie_error_description( valerie_error_code error ) { - char *msg = "Unrecognised error"; + const char *msg = "Unrecognised error"; switch( error ) { case valerie_ok: diff --git a/src/valerie/valerie.h b/src/valerie/valerie.h index 0be08c9b..a6378b44 100644 --- a/src/valerie/valerie.h +++ b/src/valerie/valerie.h @@ -248,7 +248,7 @@ extern void valerie_units_close( valerie_units ); /* Miscellaenous functions */ extern valerie_response valerie_get_last_response( valerie ); -extern char *valerie_error_description( valerie_error_code ); +extern const char *valerie_error_description( valerie_error_code ); /* Courtesy functions. */ extern valerie_error_code valerie_execute( valerie, size_t, const char *, ... ); diff --git a/src/valerie/valerie_status.c b/src/valerie/valerie_status.c index 1b1d5515..963a3c9c 100644 --- a/src/valerie/valerie_status.c +++ b/src/valerie/valerie_status.c @@ -84,7 +84,7 @@ void valerie_status_parse( valerie_status status, char *text ) char *valerie_status_serialise( valerie_status status, char *text, int length ) { - char *status_string = NULL; + const char *status_string = NULL; switch( status->status ) { diff --git a/src/valerie/valerie_tokeniser.c b/src/valerie/valerie_tokeniser.c index 7acaf853..a5dd91b9 100644 --- a/src/valerie/valerie_tokeniser.c +++ b/src/valerie/valerie_tokeniser.c @@ -77,7 +77,7 @@ static int valerie_tokeniser_append( valerie_tokeniser tokeniser, char *token ) /** Parse a string by splitting on the delimiter provided. */ -int valerie_tokeniser_parse_new( valerie_tokeniser tokeniser, char *string, char *delimiter ) +int valerie_tokeniser_parse_new( valerie_tokeniser tokeniser, char *string, const char *delimiter ) { int count = 0; int length = strlen( string ); diff --git a/src/valerie/valerie_tokeniser.h b/src/valerie/valerie_tokeniser.h index 9d0838cc..3cf81503 100644 --- a/src/valerie/valerie_tokeniser.h +++ b/src/valerie/valerie_tokeniser.h @@ -42,7 +42,7 @@ typedef struct */ extern valerie_tokeniser valerie_tokeniser_init( ); -extern int valerie_tokeniser_parse_new( valerie_tokeniser, char *, char * ); +extern int valerie_tokeniser_parse_new( valerie_tokeniser, char *, const char * ); extern char *valerie_tokeniser_get_input( valerie_tokeniser ); extern int valerie_tokeniser_count( valerie_tokeniser ); extern char *valerie_tokeniser_get_string( valerie_tokeniser, int );