Changeset 56f260a

Timestamp:

2007-11-22T22:56:52Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

df6d1da

Parents:

d75597b

Message:

Some changes to get rid of compiler warnings. (And disabling strict
aliasing because there are too many warnings about it. :-P)

Files:

• configure (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (5 diffs)
• root_commands.c (modified) (2 diffs)
• storage_xml.c (modified) (2 diffs)

configure

@@ -137 +137 @@
         echo '#define DEBUG' >> config.h
 else
-        [ -z "$CFLAGS" ] && CFLAGS=-O3
+        [ -z "$CFLAGS" ] && CFLAGS="-O2 -fno-strict-aliasing"
 fi
 

lib/ssl_gnutls.c

@@ -35 +35 @@
 
 static gboolean initialized = FALSE;
+
+#include <limits.h>
+
+#if defined(ULONG_MAX) && ULONG_MAX > 4294967295UL
+#define GNUTLS_STUPID_CAST (long)
+#else
+#define GNUTLS_STUPID_CAST (int)
+#endif
 
 struct scd
@@ -125 +133 @@
         
         sock_make_nonblocking( conn->fd );
-        gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr) conn->fd );
+        gnutls_transport_set_ptr( conn->session, (gnutls_transport_ptr) GNUTLS_STUPID_CAST conn->fd );
         
         return ssl_handshake( data, source, cond );

protocols/nogaim.c

@@ -699 +699 @@
         
         if( set_getbool( &ic->irc->set, "debug" ) )
-                imcb_log( ic, "You were removed from conversation 0x%x", (int) c );
+                imcb_log( ic, "You were removed from conversation %p", c );
         
         if( c )
@@ -755 +755 @@
         else
         {
-                imcb_log( ic, "Message from/to conversation %s@0x%x (unknown conv/user): %s", who, (int) c, wrapped );
+                imcb_log( ic, "Message from/to conversation %s@%p (unknown conv/user): %s", who, c, wrapped );
         }
         g_free( wrapped );
@@ -803 +803 @@
         
         if( set_getbool( &ic->irc->set, "debug" ) )
-                imcb_log( ic, "Creating new conversation: (id=0x%x,handle=%s)", (int) c, handle );
+                imcb_log( ic, "Creating new conversation: (id=%p,handle=%s)", c, handle );
         
         return c;
@@ -817 +817 @@
         
         if( set_getbool( &b->ic->irc->set, "debug" ) )
-                imcb_log( b->ic, "User %s added to conversation 0x%x", handle, (int) b );
+                imcb_log( b->ic, "User %s added to conversation %p", handle, b );
         
         /* It might be yourself! */
@@ -852 +852 @@
         
         if( set_getbool( &b->ic->irc->set, "debug" ) )
-                imcb_log( b->ic, "User %s removed from conversation 0x%x (%s)", handle, (int) b, reason ? reason : "" );
+                imcb_log( b->ic, "User %s removed from conversation %p (%s)", handle, b, reason ? reason : "" );
         
         /* It might be yourself! */

root_commands.c

@@ -745 +745 @@
 static void cmd_set( irc_t *irc, char **cmd )
 {
-        char *set_name;
+        char *set_name = NULL;
         
         if( cmd[1] && cmd[2] )
@@ -765 +765 @@
                 }
         }
-        if( cmd[1] ) /* else 'forgotten' on purpose.. Must show new value after changing */
+        if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
         {
                 char *s = set_getstr( &irc->set, set_name );

storage_xml.c

@@ -456 +456 @@
                    return TRUE on write errors. Which means, if we found
                    something, there was an error. :-) */
-                if( g_hash_table_find( acc->nicks, xml_save_nick, (gpointer) fd ) )
+                if( g_hash_table_find( acc->nicks, xml_save_nick, & fd ) )
                         goto write_error;
                 
@@ -494 +494 @@
 static gboolean xml_save_nick( gpointer key, gpointer value, gpointer data )
 {
-        return !xml_printf( (int) data, 2, "<buddy handle=\"%s\" nick=\"%s\" />\n", key, value );
+        return !xml_printf( *( (int*) data ), 2, "<buddy handle=\"%s\" nick=\"%s\" />\n", key, value );
 }