aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcel Raad <raad@teamviewer.com>2017-05-09 19:20:28 +0200
committerMarcel Raad <raad@teamviewer.com>2017-05-09 19:20:28 +0200
commit4dc8499494dc16bf336c1055f2ae4b78c709c87d (patch)
tree31f20511fe46d4eb621557f8d7ecb4de64d066d4 /src
parent158d7016419429e7741ec35d0d6e256985762347 (diff)
tool: fix remaining -Wcast-qual warnings
Avoid casting away low-level const.
Diffstat (limited to 'src')
-rw-r--r--src/tool_formparse.c4
-rw-r--r--src/tool_getparam.c10
-rw-r--r--src/tool_getparam.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/tool_formparse.c b/src/tool_formparse.c
index 1bcd4c563..952377c49 100644
--- a/src/tool_formparse.c
+++ b/src/tool_formparse.c
@@ -154,7 +154,7 @@ int formparse(struct OperationConfig *config,
char type_major[128] = "";
char type_minor[128] = "";
char *contp;
- const char *type = NULL;
+ char *type = NULL;
char *sep;
if((1 == sscanf(input, "%255[^=]=", name)) &&
@@ -215,7 +215,7 @@ int formparse(struct OperationConfig *config,
}
/* now point beyond the content-type specifier */
- sep = (char *)type + strlen(type_major)+strlen(type_minor)+1;
+ sep = type + strlen(type_major)+strlen(type_minor)+1;
/* there's a semicolon following - we check if it is a filename
specified and if not we simply assume that it is text that
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index fde819e8d..56bbbf18f 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -420,10 +420,10 @@ GetFileAndPassword(char *nextarg, char **file, char **password)
cleanarg(nextarg);
}
-ParameterError getparameter(char *flag, /* f or -long-flag */
- char *nextarg, /* NULL if unset */
- bool *usedarg, /* set to TRUE if the arg
- has been used */
+ParameterError getparameter(const char *flag, /* f or -long-flag */
+ char *nextarg, /* NULL if unset */
+ bool *usedarg, /* set to TRUE if the arg
+ has been used */
struct GlobalConfig *global,
struct OperationConfig *config)
{
@@ -444,7 +444,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
if(('-' != flag[0]) ||
(('-' == flag[0]) && ('-' == flag[1]))) {
/* this should be a long name */
- char *word = ('-' == flag[0]) ? flag+2 : flag;
+ const char *word = ('-' == flag[0]) ? flag+2 : flag;
size_t fnam = strlen(word);
int numhits = 0;
diff --git a/src/tool_getparam.h b/src/tool_getparam.h
index 4e97721ed..29e158816 100644
--- a/src/tool_getparam.h
+++ b/src/tool_getparam.h
@@ -47,7 +47,7 @@ typedef enum {
struct GlobalConfig;
struct OperationConfig;
-ParameterError getparameter(char *flag, char *nextarg, bool *usedarg,
+ParameterError getparameter(const char *flag, char *nextarg, bool *usedarg,
struct GlobalConfig *global,
struct OperationConfig *operation);