From a4581ba153ff2101be21aee61e39822897ec0fad Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Wed, 11 Jul 2012 12:16:07 +1000 Subject: [PATCH] string literals are now const so declare args as such to suppress compiler warnings r3636 | dcl | 2012-07-11 12:16:07 +1000 (Wed, 11 Jul 2012) | 1 line --- site_ansto/hardsup/Digital/display.c | 22 +++++++++++----------- site_ansto/hardsup/Digital/params.c | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/site_ansto/hardsup/Digital/display.c b/site_ansto/hardsup/Digital/display.c index b71163db..d671db72 100644 --- a/site_ansto/hardsup/Digital/display.c +++ b/site_ansto/hardsup/Digital/display.c @@ -19,7 +19,7 @@ * The browser will return name=value for the selection, using the name from * the selection box and the value from the option selected. */ -static void add_select_begin(BUFFER* buffer, char* title, char* name) +static void add_select_begin(BUFFER* buffer, const char* title, const char* name) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, @@ -41,7 +41,7 @@ static void add_select_begin(BUFFER* buffer, char* title, char* name) * The browser will return name=value for the selection, using the name from * the selection box and the value from the option selected. */ -static void add_option(BUFFER* buffer, char* name, char* value, bool selected) +static void add_option(BUFFER* buffer, const char* name, const char* value, bool selected) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, @@ -69,7 +69,7 @@ static void add_select_end(BUFFER* buffer) * * \param buffer where the text is appended */ -static void add_text(BUFFER* buffer, char* text) +static void add_text(BUFFER* buffer, const char* text) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, "%s", text); @@ -87,7 +87,7 @@ static void add_text(BUFFER* buffer, char* text) * The title is displayed in column one and the integer in column two. The * name=value is returned by the browser. */ -static void add_int(BUFFER* buffer, char* title, char* name, int value) +static void add_int(BUFFER* buffer, const char* title, const char* name, int value) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, @@ -111,7 +111,7 @@ static void add_int(BUFFER* buffer, char* title, char* name, int value) * The title is displayed in column one and the double in column two. The * name=value is returned by the browser. */ -static void add_double(BUFFER* buffer, char* title, char* name, double value) +static void add_double(BUFFER* buffer, const char* title, const char* name, double value) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, @@ -135,7 +135,7 @@ static void add_double(BUFFER* buffer, char* title, char* name, double value) * The title is displayed in column one and the counter value in column two. * The name=value is returned by the browser. */ -static void add_counter(BUFFER* buffer, char* title, char* name, uint64 value) +static void add_counter(BUFFER* buffer, const char* title, const char* name, uint64 value) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, @@ -216,7 +216,7 @@ static void show_text(BUFFER* buffer, const char* title, const char* value) buffer->length += strlen(bp); } -static void show_int(BUFFER* buffer, char* title, int value) +static void show_int(BUFFER* buffer, const char* title, int value) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, @@ -228,7 +228,7 @@ static void show_int(BUFFER* buffer, char* title, int value) buffer->length += strlen(bp); } -static void show_hex(BUFFER* buffer, char* title, int value) +static void show_hex(BUFFER* buffer, const char* title, int value) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, @@ -240,7 +240,7 @@ static void show_hex(BUFFER* buffer, char* title, int value) buffer->length += strlen(bp); } -static void show_real(BUFFER* buffer, char* title, double value) +static void show_real(BUFFER* buffer, const char* title, double value) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, @@ -252,7 +252,7 @@ static void show_real(BUFFER* buffer, char* title, double value) buffer->length += strlen(bp); } -static void show_counter(BUFFER* buffer, char* title, unsigned long long value) +static void show_counter(BUFFER* buffer, const char* title, unsigned long long value) { char* bp = &buffer->body[buffer->length]; snprintf(bp, sizeof(buffer->body) - buffer->length, @@ -265,7 +265,7 @@ static void show_counter(BUFFER* buffer, char* title, unsigned long long value) } static void show_time(BUFFER* buffer, - char* title, + const char* title, struct timeval* value, bool days_flag) { diff --git a/site_ansto/hardsup/Digital/params.c b/site_ansto/hardsup/Digital/params.c index 2a225aa3..50ed279c 100644 --- a/site_ansto/hardsup/Digital/params.c +++ b/site_ansto/hardsup/Digital/params.c @@ -36,8 +36,8 @@ #define TXT_SOURCE "SOURCE" static struct param_command_t { - int cmd; - char* txt; + const int cmd; + const char* txt; } param_command[] = { {CMD_DIRECTION, TXT_DIRECTION}, {CMD_SCAN, TXT_SCAN}, @@ -265,7 +265,7 @@ bool param_set_cmd(pPARAMETERS pp, char* cmd) return param_set(pp, name, value); } -bool param_get_cmd(pPARAMETERS pp, char* cmd, int n) +bool param_get_cmd(pPARAMETERS pp, const char* cmd, int n) { char name[100]; int len;