From dcb26801632d354e4037f146f89d55448fbbb622 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Tue, 27 Sep 2016 18:18:51 +0200 Subject: [PATCH] libgpo: apply some const. Guenther Signed-off-by: Guenther Deschner Reviewed-by: Andreas Schneider --- libgpo/gpo_ini.c | 8 ++++---- libgpo/gpo_ini.h | 6 +++--- source3/libgpo/gpext/scripts.c | 4 ++-- source3/libgpo/gpext/security.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libgpo/gpo_ini.c b/libgpo/gpo_ini.c index 8166bcb977e..603d3044171 100644 --- a/libgpo/gpo_ini.c +++ b/libgpo/gpo_ini.c @@ -150,7 +150,7 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx, /**************************************************************** ****************************************************************/ -NTSTATUS gp_inifile_getstring(struct gp_inifile_context *ctx, const char *key, char **ret) +NTSTATUS gp_inifile_getstring(struct gp_inifile_context *ctx, const char *key, const char **ret) { int i; @@ -170,7 +170,7 @@ NTSTATUS gp_inifile_getstring(struct gp_inifile_context *ctx, const char *key, c NTSTATUS gp_inifile_getint(struct gp_inifile_context *ctx, const char *key, int *ret) { - char *value; + const char *value; NTSTATUS result; result = gp_inifile_getstring(ctx,key, &value); @@ -189,7 +189,7 @@ NTSTATUS gp_inifile_getint(struct gp_inifile_context *ctx, const char *key, int NTSTATUS gp_inifile_getbool(struct gp_inifile_context *ctx, const char *key, bool *ret) { - char *value; + const char *value; NTSTATUS result; result = gp_inifile_getstring(ctx,key, &value); @@ -415,7 +415,7 @@ NTSTATUS parse_gpt_ini(TALLOC_CTX *mem_ctx, NTSTATUS result; int rv; int v = 0; - char *name = NULL; + const char *name = NULL; struct gp_inifile_context *ctx; if (!filename) { diff --git a/libgpo/gpo_ini.h b/libgpo/gpo_ini.h index 7c945f85620..0bfe5b1df07 100644 --- a/libgpo/gpo_ini.h +++ b/libgpo/gpo_ini.h @@ -18,8 +18,8 @@ */ struct keyval_pair { - char *key; - char *val; + const char *key; + const char *val; }; struct gp_inifile_context { @@ -42,7 +42,7 @@ NTSTATUS parse_gpt_ini(TALLOC_CTX *ctx, const char *filename, uint32_t *version, char **display_name); -NTSTATUS gp_inifile_getstring(struct gp_inifile_context *ctx, const char *key, char **ret); +NTSTATUS gp_inifile_getstring(struct gp_inifile_context *ctx, const char *key, const char **ret); NTSTATUS gp_inifile_getint(struct gp_inifile_context *ctx, const char *key, int *ret); NTSTATUS gp_inifile_getbool(struct gp_inifile_context *ctx, const char *key, bool *ret); diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c index 12e17b1e0a8..7471fb85fc4 100644 --- a/source3/libgpo/gpext/scripts.c +++ b/source3/libgpo/gpext/scripts.c @@ -138,9 +138,9 @@ static NTSTATUS scripts_parse_ini_section(struct gp_inifile_context *ini_ctx, while (1) { const char *key = NULL; - char *script = NULL; + const char *script = NULL; const char *count = NULL; - char *parameters = NULL; + const char *parameters = NULL; count = talloc_asprintf(ini_ctx->mem_ctx, "%d", i); NT_STATUS_HAVE_NO_MEMORY(count); diff --git a/source3/libgpo/gpext/security.c b/source3/libgpo/gpext/security.c index 2f461847b92..dda58d383db 100644 --- a/source3/libgpo/gpext/security.c +++ b/source3/libgpo/gpext/security.c @@ -62,7 +62,7 @@ struct gpttmpl_table { static NTSTATUS gpttmpl_parse_header(struct gp_inifile_context *ini_ctx, uint32_t *version_out) { - char *signature = NULL; + const char *signature = NULL; NTSTATUS result; int version; bool is_unicode = false; -- 2.47.2