Unverified Commit 6dc3422d authored by Marcel Raad's avatar Marcel Raad
Browse files

tests: fix -Wcast-qual warnings 

Avoid casting string literals to non-const char *.
parent 2b7bde4d

tests/libtest/first.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void memory_tracking_init(void) 
#endif



/* returns a hexdump in a static memory area */

char *hexdump(unsigned char *buffer, size_t len)

char *hexdump(const unsigned char *buffer, size_t len)

{

  static char dump[200*3+1];

  char *p = dump;

tests/libtest/lib506.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct Tdata { 
};



struct userdata {

  char *text;

  const char *text;

  int counter;

};
@@ -184,7 +184,7 @@ int test(char *URL) 
  int i;

  struct userdata user;



  user.text = (char *)"Pigs in space";

  user.text = "Pigs in space";

  user.counter = 0;



  printf("GLOBAL_INIT\n");

tests/libtest/lib586.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct Tdata { 
};



struct userdata {

  char *text;

  const char *text;

  int counter;

};
@@ -138,7 +138,7 @@ int test(char *URL) 
  int i;

  struct userdata user;



  user.text = (char *)"Pigs in space";

  user.text = "Pigs in space";

  user.counter = 0;



  printf("GLOBAL_INIT\n");

tests/libtest/test.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern void wait_ms(int ms); /* wait this many milliseconds */ 
extern int test(char *URL); /* the actual test function provided by each

                               individual libXXX.c file */



extern char *hexdump(unsigned char *buffer, size_t len);

extern char *hexdump(const unsigned char *buffer, size_t len);



#ifdef UNITTESTS

extern int unitfail;

tests/unit/curlcheck.h

+4 −3
Original line number Diff line number Diff line
@@ -39,9 +39,10 @@ 
#define verify_memory(dynamic, check, len)                                  \

  if(dynamic && memcmp(dynamic, check, len)) {                              \

    fprintf(stderr, "%s:%d Memory buffer mismatch size %d. '%s' is not\n",  \

            __FILE__, __LINE__, len, hexdump((unsigned char *)check, len)); \

    fprintf(stderr, "%s:%d the same as '%s'\n",                             \

            __FILE__, __LINE__, hexdump((unsigned char *)dynamic, len));    \

            __FILE__, __LINE__, len,                                        \

            hexdump((const unsigned char *)check, len));                    \

    fprintf(stderr, "%s:%d the same as '%s'\n", __FILE__, __LINE__,         \

            hexdump((const unsigned char *)dynamic, len));                  \

    unitfail++;                                                             \

  }