Unverified Commit 4dc84994 authored by Marcel Raad's avatar Marcel Raad
Browse files

tool: fix remaining -Wcast-qual warnings 

Avoid casting away low-level const.
parent 158d7016

src/tool_formparse.c

+2 −2
Original line number Diff line number Diff line
@@ -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

src/tool_getparam.c

+5 −5
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ GetFileAndPassword(char *nextarg, char **file, char **password) 
  cleanarg(nextarg);

}



ParameterError getparameter(char *flag,    /* f or -long-flag */

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 */
@@ -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;

src/tool_getparam.h

+1 −1
Original line number Diff line number Diff line
@@ -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);