@@ -34,7 +34,7 @@
struct cmd_s {
char *cmd;
- int (*func)(const void *, struct connection *, char **, int);
+ int (*func)(const void *, struct connection *, const char **, int);
char *pars;
/*
* max_pars can be used to limit the size of the parameter vector,
@@ -47,7 +47,7 @@ struct cmd_s {
};
static int do_control_check(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
if (num)
return EINVAL;
@@ -59,7 +59,7 @@ static int do_control_check(const void *ctx, struct connection *conn,
}
static int do_control_log(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
int ret;
@@ -126,7 +126,7 @@ static int quota_show_current(const void *ctx, struct connection *conn,
}
static int quota_set(const void *ctx, struct connection *conn,
- char **vec, int num, struct quota *quotas)
+ const char **vec, int num, struct quota *quotas)
{
unsigned int i;
int val;
@@ -150,7 +150,7 @@ static int quota_set(const void *ctx, struct connection *conn,
}
static int quota_get(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
if (num != 1)
return EINVAL;
@@ -159,7 +159,7 @@ static int quota_get(const void *ctx, struct connection *conn,
}
static int quota_max(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
if (num > 1)
return EINVAL;
@@ -175,7 +175,7 @@ static int quota_max(const void *ctx, struct connection *conn,
}
static int do_control_quota(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
if (num == 0)
return quota_show_current(ctx, conn, hard_quotas);
@@ -190,7 +190,7 @@ static int do_control_quota(const void *ctx, struct connection *conn,
}
static int do_control_quota_s(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
if (num == 0)
return quota_show_current(ctx, conn, soft_quotas);
@@ -203,7 +203,7 @@ static int do_control_quota_s(const void *ctx, struct connection *conn,
#ifdef __MINIOS__
static int do_control_memreport(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
if (num)
return EINVAL;
@@ -215,7 +215,7 @@ static int do_control_memreport(const void *ctx, struct connection *conn,
}
#else
static int do_control_logfile(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
if (num != 1)
return EINVAL;
@@ -230,7 +230,7 @@ static int do_control_logfile(const void *ctx, struct connection *conn,
}
static int do_control_memreport(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
FILE *fp;
int fd;
@@ -270,7 +270,7 @@ static int do_control_memreport(const void *ctx, struct connection *conn,
#endif
static int do_control_print(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
if (num != 1)
return EINVAL;
@@ -281,7 +281,8 @@ static int do_control_print(const void *ctx, struct connection *conn,
return 0;
}
-static int do_control_help(const void *, struct connection *, char **, int);
+static int do_control_help(const void *, struct connection *, const char **,
+ int);
static struct cmd_s cmds[] = {
{ "check", do_control_check, "" },
@@ -322,7 +323,7 @@ static struct cmd_s cmds[] = {
};
static int do_control_help(const void *ctx, struct connection *conn,
- char **vec, int num)
+ const char **vec, int num)
{
int cmd;
char *resp;
@@ -348,7 +349,7 @@ int do_control(const void *ctx, struct connection *conn,
struct buffered_data *in)
{
unsigned int cmd, num, off;
- char **vec = NULL;
+ const char **vec = NULL;
if (domain_is_unprivileged(conn))
return EACCES;
@@ -365,7 +366,7 @@ int do_control(const void *ctx, struct connection *conn,
num = xenstore_count_strings(in->buffer, in->used);
if (cmds[cmd].max_pars)
num = min(num, cmds[cmd].max_pars);
- vec = talloc_array(ctx, char *, num);
+ vec = (const char **)talloc_array(ctx, char *, num);
if (!vec)
return ENOMEM;
if (get_strings(in, vec, num) < num)
@@ -994,7 +994,7 @@ unsigned int get_string(const struct buffered_data *data, unsigned int offset)
* ignore any data after the final nul.
*/
unsigned int get_strings(struct buffered_data *data,
- char *vec[], unsigned int num)
+ const char *vec[], unsigned int num)
{
unsigned int off, i, len;
@@ -1216,25 +1216,26 @@ static char *perms_to_strings(const void *ctx, const struct node_perms *perms,
return strings;
}
-char *canonicalize(struct connection *conn, const void *ctx, const char *node)
+const char *canonicalize(struct connection *conn, const void *ctx,
+ const char *node)
{
const char *prefix;
if (!node || (node[0] == '/') || (node[0] == '@'))
- return (char *)node;
+ return node;
prefix = get_implicit_path(conn);
if (prefix)
return talloc_asprintf(ctx, "%s/%s", prefix, node);
- return (char *)node;
+ return node;
}
static struct node *get_node_canonicalized(struct connection *conn,
const void *ctx,
const char *name,
- char **canonical_name,
+ const char **canonical_name,
unsigned int perm)
{
- char *tmp_name;
+ const char *tmp_name;
if (!canonical_name)
canonical_name = &tmp_name;
@@ -1249,7 +1250,7 @@ static struct node *get_node_canonicalized(struct connection *conn,
}
static struct node *get_spec_node(struct connection *conn, const void *ctx,
- const char *name, char **canonical_name,
+ const char *name, const char **canonical_name,
unsigned int perm)
{
if (name[0] == '@')
@@ -1538,8 +1539,8 @@ static int do_write(const void *ctx, struct connection *conn,
{
unsigned int offset, datalen;
struct node *node;
- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */
- char *name;
+ const char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */
+ const char *name;
/* Extra "strings" can be created by binary data. */
if (get_strings(in, vec, ARRAY_SIZE(vec)) < ARRAY_SIZE(vec))
@@ -1574,7 +1575,7 @@ static int do_mkdir(const void *ctx, struct connection *conn,
struct buffered_data *in)
{
struct node *node;
- char *name;
+ const char *name;
node = get_node_canonicalized(conn, ctx, onearg(in), &name,
XS_PERM_WRITE);
@@ -1703,7 +1704,7 @@ static int do_rm(const void *ctx, struct connection *conn,
{
struct node *node;
int ret;
- char *name;
+ const char *name;
char *parentname;
node = get_node_canonicalized(conn, ctx, onearg(in), &name,
@@ -1765,7 +1766,8 @@ static int do_set_perms(const void *ctx, struct connection *conn,
struct buffered_data *in)
{
struct node_perms perms, old_perms;
- char *name, *permstr;
+ const char *name;
+ char *permstr;
struct node *node;
perms.num = xenstore_count_strings(in->buffer, in->used);
@@ -212,7 +212,7 @@ const char *onearg(struct buffered_data *in);
/* Break input into vectors, return the number, fill in up to num of them. */
unsigned int get_strings(struct buffered_data *data,
- char *vec[], unsigned int num);
+ const char *vec[], unsigned int num);
unsigned int get_string(const struct buffered_data *data, unsigned int offset);
void send_reply(struct connection *conn, enum xsd_sockmsg_type type,
@@ -224,7 +224,8 @@ void send_event(struct buffered_data *req, struct connection *conn,
void send_ack(struct connection *conn, enum xsd_sockmsg_type type);
/* Canonicalize this path if possible. */
-char *canonicalize(struct connection *conn, const void *ctx, const char *node);
+const char *canonicalize(struct connection *conn, const void *ctx,
+ const char *node);
/* Get access permissions. */
unsigned int perm_for_conn(struct connection *conn,
@@ -1014,7 +1014,7 @@ int do_introduce(const void *ctx, struct connection *conn,
struct buffered_data *in)
{
struct domain *domain;
- char *vec[3];
+ const char *vec[3];
unsigned int domid;
evtchn_port_t port;
@@ -1055,7 +1055,7 @@ static struct domain *find_connected_domain(unsigned int domid)
int do_set_target(const void *ctx, struct connection *conn,
struct buffered_data *in)
{
- char *vec[2];
+ const char *vec[2];
unsigned int domid, tdomid;
struct domain *domain, *tdomain;
if (get_strings(in, vec, ARRAY_SIZE(vec)) < ARRAY_SIZE(vec))
@@ -360,7 +360,7 @@ static const char *lu_start(const void *ctx, struct connection *conn,
return NULL;
}
-int do_control_lu(const void *ctx, struct connection *conn, char **vec,
+int do_control_lu(const void *ctx, struct connection *conn, const char **vec,
int num)
{
const char *ret = NULL;
@@ -50,7 +50,7 @@ void lu_read_state(void);
/* Write the "OK" response for the live-update command */
unsigned int lu_write_response(FILE *fp);
-int do_control_lu(const void *ctx, struct connection *conn, char **vec,
+int do_control_lu(const void *ctx, struct connection *conn, const char **vec,
int num);
/* Live update private interfaces. */
@@ -59,7 +59,7 @@ void lu_close_dump_state(struct lu_dump_state *state);
FILE *lu_dump_open(const void *ctx);
void lu_dump_close(FILE *fp);
char *lu_exec(const void *ctx, int argc, char **argv);
-const char *lu_arch(const void *ctx, struct connection *conn, char **vec,
+const char *lu_arch(const void *ctx, struct connection *conn, const char **vec,
int num);
const char *lu_begin(struct connection *conn);
void lu_destroy_arch(void *data);
@@ -118,7 +118,7 @@ static const char *lu_binary(const void *ctx, struct connection *conn,
return NULL;
}
-const char *lu_arch(const void *ctx, struct connection *conn, char **vec,
+const char *lu_arch(const void *ctx, struct connection *conn, const char **vec,
int num)
{
if (num == 2 && !strcmp(vec[0], "-f"))
@@ -104,7 +104,7 @@ static const char *lu_binary_save(const void *ctx, struct connection *conn,
return NULL;
}
-const char *lu_arch(const void *ctx, struct connection *conn, char **vec,
+const char *lu_arch(const void *ctx, struct connection *conn, const char **vec,
int num)
{
if (num == 2 && !strcmp(vec[0], "-b"))
@@ -161,7 +161,7 @@ static int destroy_watch(void *_watch)
}
static int check_watch_path(struct connection *conn, const void *ctx,
- char **path, bool *relative)
+ const char **path, bool *relative)
{
/* Check if valid event. */
if (strstarts(*path, "@")) {
@@ -184,8 +184,9 @@ static int check_watch_path(struct connection *conn, const void *ctx,
return errno;
}
-static struct watch *add_watch(struct connection *conn, char *path, char *token,
- bool relative, bool no_quota_check)
+static struct watch *add_watch(struct connection *conn, const char *path,
+ const char *token, bool relative,
+ bool no_quota_check)
{
struct watch *watch;
@@ -217,7 +218,7 @@ static struct watch *add_watch(struct connection *conn, char *path, char *token,
int do_watch(const void *ctx, struct connection *conn, struct buffered_data *in)
{
struct watch *watch;
- char *vec[2];
+ const char *vec[2];
bool relative;
if (get_strings(in, vec, ARRAY_SIZE(vec)) != ARRAY_SIZE(vec))
@@ -258,7 +259,8 @@ int do_unwatch(const void *ctx, struct connection *conn,
struct buffered_data *in)
{
struct watch *watch;
- char *node, *vec[2];
+ const char *node;
+ const char *vec[2];
if (get_strings(in, vec, ARRAY_SIZE(vec)) != ARRAY_SIZE(vec))
return EINVAL;
@@ -336,7 +338,7 @@ void read_state_watch(const void *ctx, const void *state)
{
const struct xs_state_watch *sw = state;
struct connection *conn;
- char *path, *token;
+ const char *path, *token;
bool relative;
conn = get_connection_by_id(sw->conn_id);
The return type of canonicalize() can be modified to const char *. This avoids the need to cast the const away from the input parameter. There need to be quite some other functions modified to take const parameters in order to avoid further casts. Signed-off-by: Juergen Gross <jgross@suse.com> --- V2: - new patch (Julien Grall) V3: - add get_strings() conversion to take const pointer (Julien Grall) --- tools/xenstore/xenstored_control.c | 33 ++++++++++++++-------------- tools/xenstore/xenstored_core.c | 26 ++++++++++++---------- tools/xenstore/xenstored_core.h | 5 +++-- tools/xenstore/xenstored_domain.c | 4 ++-- tools/xenstore/xenstored_lu.c | 2 +- tools/xenstore/xenstored_lu.h | 4 ++-- tools/xenstore/xenstored_lu_daemon.c | 2 +- tools/xenstore/xenstored_lu_minios.c | 2 +- tools/xenstore/xenstored_watch.c | 14 +++++++----- 9 files changed, 49 insertions(+), 43 deletions(-)