diff options
author | Simo Sorce <simo@redhat.com> | 2013-04-15 00:27:25 -0400 |
---|---|---|
committer | Simo Sorce <simo@redhat.com> | 2013-04-23 12:03:19 -0700 |
commit | 319aac3a056df8953d5ffd25133fafa0a28b7296 (patch) | |
tree | 8a44dfdd57b3a6f8408b29ee5233e459c147a08b | |
parent | fa612d764c7551188cd86c1b823d8ba67116943e (diff) | |
download | gss-proxy-319aac3a056df8953d5ffd25133fafa0a28b7296.tar.gz gss-proxy-319aac3a056df8953d5ffd25133fafa0a28b7296.tar.xz gss-proxy-319aac3a056df8953d5ffd25133fafa0a28b7296.zip |
Use const string in config functions
Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Günther Deschner <gdeschner@redhat.com>
-rw-r--r-- | proxy/src/gp_config.c | 16 | ||||
-rw-r--r-- | proxy/src/gp_config.h | 4 | ||||
-rw-r--r-- | proxy/src/gp_config_dinglibs.c | 12 | ||||
-rw-r--r-- | proxy/src/gp_config_dinglibs.h | 4 | ||||
-rw-r--r-- | proxy/src/gp_proxy.h | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c index d8f638b..c117f54 100644 --- a/proxy/src/gp_config.c +++ b/proxy/src/gp_config.c @@ -31,9 +31,9 @@ #include "gp_proxy.h" #include "gp_config.h" -static void free_str_array(char ***a) +static void free_str_array(const char ***a) { - char **array = *a; + const char **array = *a; int i; if (!a) { @@ -77,7 +77,7 @@ static int get_krb5_mech_cfg(struct gp_service *svc, {"krb5_ccache", "ccache" }, {"krb5_client_keytab", "client_keytab" } }; - char *value; + const char *value; int i; int ret; @@ -134,7 +134,7 @@ static int load_services(struct gp_config *cfg, struct gp_ini_context *ctx) { int num_sec; char *secname = NULL; - char *value; + const char *value; char *token; char *handle; int valnum; @@ -227,7 +227,7 @@ static int load_services(struct gp_config *cfg, struct gp_ini_context *ctx) goto done; } - token = strtok_r(value, ", ", &handle); + token = strtok_r(no_const(value), ", ", &handle); do { ret = strcmp(value, "krb5"); @@ -299,7 +299,7 @@ static int gp_init_ini_context(const char *config_file, int load_config(struct gp_config *cfg) { struct gp_ini_context *ctx; - char *tmpstr; + const char *tmpstr; int ret; ret = gp_init_ini_context(cfg->config_file, &ctx); @@ -476,7 +476,7 @@ int gp_config_init(const char *config_file, int gp_config_get_string(struct gp_ini_context *ctx, const char *secname, const char *keyname, - char **value) + const char **value) { return gp_dinglibs_get_string(ctx, secname, keyname, value); } @@ -485,7 +485,7 @@ int gp_config_get_string_array(struct gp_ini_context *ctx, const char *secname, const char *keyname, int *num_values, - char ***values) + const char ***values) { return gp_dinglibs_get_string_array(ctx, secname, keyname, num_values, values); diff --git a/proxy/src/gp_config.h b/proxy/src/gp_config.h index 617f6cb..9d0d1d7 100644 --- a/proxy/src/gp_config.h +++ b/proxy/src/gp_config.h @@ -36,12 +36,12 @@ int gp_config_init(const char *config_file, int gp_config_get_string(struct gp_ini_context *ctx, const char *secname, const char *keyname, - char **value); + const char **value); int gp_config_get_string_array(struct gp_ini_context *ctx, const char *secname, const char *keyname, int *num_values, - char ***values); + const char ***values); int gp_config_get_int(struct gp_ini_context *ctx, const char *secname, const char *keyname, diff --git a/proxy/src/gp_config_dinglibs.c b/proxy/src/gp_config_dinglibs.c index ded1a57..3fc0076 100644 --- a/proxy/src/gp_config_dinglibs.c +++ b/proxy/src/gp_config_dinglibs.c @@ -40,12 +40,12 @@ int gp_dinglibs_get_string(struct gp_ini_context *ctx, const char *secname, const char *key, - char **value) + const char **value) { struct ini_cfgobj *ini_config = (struct ini_cfgobj *)ctx->private_data; struct value_obj *vo = NULL; int ret; - char *val; + const char *val; if (!value) { return -1; @@ -79,14 +79,14 @@ int gp_dinglibs_get_string_array(struct gp_ini_context *ctx, const char *secname, const char *key, int *num_values, - char ***values) + const char ***values) { struct ini_cfgobj *ini_config = (struct ini_cfgobj *)ctx->private_data; struct value_obj *vo = NULL; const char *value; int ret; int i, count = 0; - char **array = NULL; + const char **array = NULL; if (!values || !num_values) { return EINVAL; @@ -168,9 +168,9 @@ int gp_dinglibs_get_string_array(struct gp_ini_context *ctx, done: if (ret && array) { for (i = 0; i < count; i++) { - free(array[i]); + safefree(array[i]); } - free(array); + safefree(array); } return ret; } diff --git a/proxy/src/gp_config_dinglibs.h b/proxy/src/gp_config_dinglibs.h index db9bda1..b969c76 100644 --- a/proxy/src/gp_config_dinglibs.h +++ b/proxy/src/gp_config_dinglibs.h @@ -27,12 +27,12 @@ int gp_dinglibs_get_string(struct gp_ini_context *ctx, const char *secname, const char *key, - char **value); + const char **value); int gp_dinglibs_get_string_array(struct gp_ini_context *ctx, const char *secname, const char *key, int *num_values, - char ***values); + const char ***values); int gp_dinglibs_get_int(struct gp_ini_context *ctx, const char *secname, const char *key, diff --git a/proxy/src/gp_proxy.h b/proxy/src/gp_proxy.h index 6764f6a..dc7aada 100644 --- a/proxy/src/gp_proxy.h +++ b/proxy/src/gp_proxy.h @@ -40,7 +40,7 @@ struct gp_cred_krb5 { char *principal; - char **cred_store; + const char **cred_store; int cred_count; }; |