From b8ed23daab023e1468b7ae98ffa7bd06176b1404 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 20 Nov 2016 09:55:32 -0800 Subject: [PATCH] Constify the value argument to mod_set_param --- mc/mc.c | 2 +- mc/mc.h | 2 +- neutrinordp/xrdp-neutrinordp.c | 2 +- neutrinordp/xrdp-neutrinordp.h | 2 +- rdp/rdp.c | 2 +- rdp/rdp.h | 2 +- vnc/vnc.c | 2 +- vnc/vnc.h | 2 +- xrdp/xrdp_mm.c | 10 +++++----- xrdp/xrdp_types.h | 2 +- xup/xup.c | 2 +- xup/xup.h | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mc/mc.c b/mc/mc.c index 3e0909d4..71d2d9c0 100644 --- a/mc/mc.c +++ b/mc/mc.c @@ -75,7 +75,7 @@ lib_mod_end(struct mod *mod) /******************************************************************************/ /* return error */ int DEFAULT_CC -lib_mod_set_param(struct mod *mod, const char *name, char *value) +lib_mod_set_param(struct mod *mod, const char *name, const char *value) { return 0; } diff --git a/mc/mc.h b/mc/mc.h index 65297942..319f1a4c 100644 --- a/mc/mc.h +++ b/mc/mc.h @@ -37,7 +37,7 @@ struct mod long param3, long param4); int (*mod_signal)(struct mod* v); int (*mod_end)(struct mod* v); - int (*mod_set_param)(struct mod* v, const char *name, char* value); + int (*mod_set_param)(struct mod *v, const char *name, const char *value); int (*mod_session_change)(struct mod* v, int, int); int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount, tbus* write_objs, int* wcount, int* timeout); diff --git a/neutrinordp/xrdp-neutrinordp.c b/neutrinordp/xrdp-neutrinordp.c index 34ed9c2c..37b4eefb 100644 --- a/neutrinordp/xrdp-neutrinordp.c +++ b/neutrinordp/xrdp-neutrinordp.c @@ -427,7 +427,7 @@ lxrdp_end(struct mod *mod) /******************************************************************************/ /* return error */ static int DEFAULT_CC -lxrdp_set_param(struct mod *mod, const char *name, char *value) +lxrdp_set_param(struct mod *mod, const char *name, const char *value) { rdpSettings *settings; diff --git a/neutrinordp/xrdp-neutrinordp.h b/neutrinordp/xrdp-neutrinordp.h index 79bb460d..fd4560d0 100644 --- a/neutrinordp/xrdp-neutrinordp.h +++ b/neutrinordp/xrdp-neutrinordp.h @@ -71,7 +71,7 @@ struct mod long param3, long param4); int (*mod_signal)(struct mod *v); int (*mod_end)(struct mod *v); - int (*mod_set_param)(struct mod *v, const char *name, char *value); + int (*mod_set_param)(struct mod *v, const char *name, const char *value); int (*mod_session_change)(struct mod *v, int, int); int (*mod_get_wait_objs)(struct mod *v, tbus *read_objs, int *rcount, tbus *write_objs, int *wcount, int *timeout); diff --git a/rdp/rdp.c b/rdp/rdp.c index 5dc13363..6792398f 100644 --- a/rdp/rdp.c +++ b/rdp/rdp.c @@ -242,7 +242,7 @@ lib_mod_end(struct mod *mod) /******************************************************************************/ /* return error */ int DEFAULT_CC -lib_mod_set_param(struct mod *mod, const char *name, char *value) +lib_mod_set_param(struct mod *mod, const char *name, const char *value) { if (g_strncasecmp(name, "ip", 255) == 0) { diff --git a/rdp/rdp.h b/rdp/rdp.h index ff04fafa..6d919774 100644 --- a/rdp/rdp.h +++ b/rdp/rdp.h @@ -262,7 +262,7 @@ struct mod long param3, long param4); int (*mod_signal)(struct mod* v); int (*mod_end)(struct mod* v); - int (*mod_set_param)(struct mod* v, const char *name, char* value); + int (*mod_set_param)(struct mod *v, const char *name, const char *value); int (*mod_session_change)(struct mod* v, int, int); int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount, tbus* write_objs, int* wcount, int* timeout); diff --git a/vnc/vnc.c b/vnc/vnc.c index 1b1ae269..8b50b55c 100644 --- a/vnc/vnc.c +++ b/vnc/vnc.c @@ -1415,7 +1415,7 @@ lib_mod_end(struct vnc *v) /******************************************************************************/ int DEFAULT_CC -lib_mod_set_param(struct vnc *v, const char *name, char *value) +lib_mod_set_param(struct vnc *v, const char *name, const char *value) { if (g_strcasecmp(name, "username") == 0) { diff --git a/vnc/vnc.h b/vnc/vnc.h index 0bc3835d..3eee4e09 100644 --- a/vnc/vnc.h +++ b/vnc/vnc.h @@ -37,7 +37,7 @@ struct vnc long param3, long param4); int (*mod_signal)(struct vnc* v); int (*mod_end)(struct vnc* v); - int (*mod_set_param)(struct vnc* v, const char *name, char* value); + int (*mod_set_param)(struct vnc *v, const char *name, const char *value); int (*mod_session_change)(struct vnc* v, int, int); int (*mod_get_wait_objs)(struct vnc* v, tbus* read_objs, int* rcount, tbus* write_objs, int* wcount, int* timeout); diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index ddbc89a8..df859c0a 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -491,8 +491,8 @@ static int APP_CC xrdp_mm_setup_mod2(struct xrdp_mm *self, tui8 *guid) { char text[256]; - char *name; - char *value; + const char *name; + const char *value; int i; int rv; int key_flags; @@ -562,7 +562,7 @@ xrdp_mm_setup_mod2(struct xrdp_mm *self, tui8 *guid) /* always set these */ self->mod->mod_set_param(self->mod, "client_info", - (char *)(self->wm->session->client_info)); + (const char *) (self->wm->session->client_info)); name = self->wm->session->client_info->hostname; self->mod->mod_set_param(self->mod, "hostname", name); @@ -575,8 +575,8 @@ xrdp_mm_setup_mod2(struct xrdp_mm *self, tui8 *guid) for (i = 0; i < self->login_names->count; i++) { - name = (char *)list_get_item(self->login_names, i); - value = (char *)list_get_item(self->login_values, i); + name = (const char *) list_get_item(self->login_names, i); + value = (const char *) list_get_item(self->login_values, i); self->mod->mod_set_param(self->mod, name, value); } diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h index cc0eaa3c..ca59cd1b 100644 --- a/xrdp/xrdp_types.h +++ b/xrdp/xrdp_types.h @@ -42,7 +42,7 @@ struct xrdp_mod long param3, long param4); int (*mod_signal)(struct xrdp_mod* v); int (*mod_end)(struct xrdp_mod* v); - int (*mod_set_param)(struct xrdp_mod* v, const char *name, char* value); + int (*mod_set_param)(struct xrdp_mod *v, const char *name, const char *value); int (*mod_session_change)(struct xrdp_mod* v, int, int); int (*mod_get_wait_objs)(struct xrdp_mod* v, tbus* read_objs, int* rcount, tbus* write_objs, int* wcount, int* timeout); diff --git a/xup/xup.c b/xup/xup.c index e2c34ca8..bff29727 100644 --- a/xup/xup.c +++ b/xup/xup.c @@ -1479,7 +1479,7 @@ lib_mod_end(struct mod *mod) /******************************************************************************/ /* return error */ int DEFAULT_CC -lib_mod_set_param(struct mod *mod, const char *name, char *value) +lib_mod_set_param(struct mod *mod, const char *name, const char *value) { if (g_strcasecmp(name, "username") == 0) { diff --git a/xup/xup.h b/xup/xup.h index 8c91996d..3e5c8e8d 100644 --- a/xup/xup.h +++ b/xup/xup.h @@ -39,7 +39,7 @@ struct mod tbus param3, tbus param4); int (*mod_signal)(struct mod* v); int (*mod_end)(struct mod* v); - int (*mod_set_param)(struct mod* v, const char *name, char* value); + int (*mod_set_param)(struct mod *v, const char *name, const char *value); int (*mod_session_change)(struct mod* v, int, int); int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount, tbus* write_objs, int* wcount, int* timeout);