[pisa-src] r1456 - trunk/libpisa/debug.c

  • From: Thomas Jansen <mithi@xxxxxxxxx>
  • To: pisa-src@xxxxxxxxxxxxx
  • Date: Fri, 30 Oct 2009 12:23:53 +0100

Author: tjansen
Date: Fri Oct 30 12:23:53 2009
New Revision: 1456

Log:
Fix -Wcast-qual warnings:

libpisa/debug.c: In function ‘pisa_hexdump’:
libpisa/debug.c:319: warning: cast discards qualifiers from pointer target type
libpisa/debug.c: In function ‘pisa_hexdump_parsed’:
libpisa/debug.c:390: warning: cast discards qualifiers from pointer target type
libpisa/debug.c:395: warning: cast discards qualifiers from pointer target type
libpisa/debug.c: In function ‘pisa_print_sockaddr’:
libpisa/debug.c:495: warning: cast discards qualifiers from pointer target type
libpisa/debug.c:499: warning: cast discards qualifiers from pointer target type

Modified:
   trunk/libpisa/debug.c

Modified: trunk/libpisa/debug.c
==============================================================================
--- trunk/libpisa/debug.c       Fri Oct 30 12:20:20 2009        (r1455)
+++ trunk/libpisa/debug.c       Fri Oct 30 12:23:53 2009        (r1456)
@@ -316,7 +316,7 @@
        /* note: if you change the printing format, adjust also hexdump_count! 
*/
        hexdump_written = snprintf((char *) (hexdump + hexdump_index),
                                hexdump_count, "%02x",
-                       (unsigned char)(*(((unsigned char *)str) + 
char_index)));
+                       (const unsigned char)(*(((const unsigned char *)str) + 
char_index)));
        if (hexdump_written < 0 || hexdump_written > hexdump_max_size - 1) {
        free(hexdump);
        PISA_DIE("hexdump msg too long(%d)", hexdump_written);
@@ -387,12 +387,12 @@
                        
                        // Write the character in hex
                        hexdump_written = snprintf((char *) (hexdump + 
hexdump_index),
-                               hexdump_count, "%02x", (unsigned 
char)(*(((unsigned char *)str) + char_index)));
+                               hexdump_count, "%02x", (const unsigned 
char)(*(((const unsigned char *)str) + char_index)));
                        if (hexdump_written < 0 || hexdump_written > 
hexdump_total_size - 1) {
                                free(hexdump);
                                PISA_DIE("hexdump msg too long(%d)", 
hexdump_written);
                        } 
-                       char written = (unsigned char)(*(((unsigned char *)str) 
+ char_index));
+                       char written = (const unsigned char)(*(((const unsigned 
char *)str) + char_index));
                        
                        // Write space between          
                        hexdump_index += hexdump_written;
@@ -485,18 +485,18 @@
                        const struct sockaddr *sockaddr) {
       char default_str[] = "<unknown>";
       int maxlen;
-      void *addr;
+      const void *addr;
       int family = sockaddr->sa_family;
       char addr_str[INET6_ADDRSTRLEN+1];
       
       switch (family) {
       case AF_INET:
        maxlen = INET_ADDRSTRLEN;
-       addr = &(((struct sockaddr_in *) sockaddr)->sin_addr);
+       addr = &(((const struct sockaddr_in *) sockaddr)->sin_addr);
        break;
       case AF_INET6:
        maxlen = INET6_ADDRSTRLEN;
-       addr = &(((struct sockaddr_in6 *) sockaddr)->sin6_addr);
+       addr = &(((const struct sockaddr_in6 *) sockaddr)->sin6_addr);
        break;
       default:
        maxlen = 0;

Other related posts:

  • » [pisa-src] r1456 - trunk/libpisa/debug.c - Thomas Jansen