Changeset 25c4c78

Timestamp:

2015-01-16T19:50:24Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

a6cd799

Parents:

7549d00

git-author:

Jason Copenhaver <jcopenha@…> (16-01-15 19:50:24)

git-committer:

dequis <dx@…> (16-01-15 19:50:24)

Message:

Fix compiler warnings on Cygwin and Mac OS X.

• Don't use PIE/PIC on Cygwin/Darwin unless specified as these platforms don't support it.
• Cleanup warnings for 'make check' build.
• Fix the type issue for getsockopt calls.
• Fix enum warnings in Yahoo libs on Mac OS X.

Files:

• configure (modified) (1 diff)
• ipc.c (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• lib/ns_parse.c (modified) (1 diff)
• lib/proxy.c (modified) (4 diffs)
• protocols/oscar/conn.c (modified) (1 diff)
• protocols/yahoo/libyahoo2.c (modified) (5 diffs)
• protocols/yahoo/yahoo_util.h (modified) (1 diff)
• tests/check_arc.c (modified) (1 diff)
• tests/check_irc.c (modified) (1 diff)
• tests/check_jabber_sasl.c (modified) (1 diff)

configure

@@ -56 +56 @@
 
 echo BitlBee configure
+
+# Cygwin and Darwin don't support PIC/PIE
+case "$arch" in
+    CYGWIN* )
+        pie=0;;
+    Darwin )
+        pie=0;;
+esac
 
 while [ -n "$1" ]; do

ipc.c

@@ -524 +524 @@
                 {
                         /* There is no typo in this line: */
-                        for( j = 1; cmd[j]; j ++ ); j --;
+                        for( j = 1; cmd[j]; j ++ )
+                                ;
+                        j--;
                         
                         if( j < commands[i].required_parameters )

irc_commands.c

@@ -770 +770 @@
                 {
                         /* There should be no typo in the next line: */
-                        for( n_arg = 0; cmd[n_arg]; n_arg ++ ); n_arg --;
+                        for( n_arg = 0; cmd[n_arg]; n_arg ++ )
+                                ;
+                        n_arg--;
                         
                         if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status & USTATUS_LOGGED_IN )

lib/ns_parse.c

@@ -19 +19 @@
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp $";
+//static const char rcsid[] = "$Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp $";
 #endif
 

lib/proxy.c

@@ -66 +66 @@
 {
         struct PHB *phb = data;
-        unsigned int len;
+        socklen_t len;
         int error = ETIMEDOUT;
         len = sizeof(error);
@@ -214 +214 @@
         char cmd[384];
         struct PHB *phb = data;
-        unsigned int len;
+        socklen_t len;
         int error = ETIMEDOUT;
         if (phb->inpa > 0)
@@ -309 +309 @@
         struct hostent *hp;
         struct PHB *phb = data;
-        unsigned int len;
+        socklen_t len;
         int error = ETIMEDOUT;
         if (phb->inpa > 0)
@@ -501 +501 @@
         int i;
         struct PHB *phb = data;
-        unsigned int len;
+        socklen_t len;
         int error = ETIMEDOUT;
         if (phb->inpa > 0)

protocols/oscar/conn.c

@@ -571 +571 @@
 
         if (FD_ISSET(conn->fd, &fds) || FD_ISSET(conn->fd, &wfds)) {
-                unsigned int len = sizeof(error);
+                socklen_t len = sizeof(error);
 
                 if (getsockopt(conn->fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0)

protocols/yahoo/libyahoo2.c

@@ -974 +974 @@
                         msg = pair->value;
 
-                if (pair->key == 13) ;
+                if (pair->key == 13) 
+                        ;
                 if (pair->key == 16)    /* error */
                         msg = pair->value;
@@ -1795 +1796 @@
         switch (code)
         {
-                case 1212: return YAHOO_LOGIN_PASSWD;
-                case 1213: return YAHOO_LOGIN_LOCK;
-                case 1235: return YAHOO_LOGIN_UNAME;
+                case 1212: return (enum yahoo_status) YAHOO_LOGIN_PASSWD;
+                case 1213: return (enum yahoo_status) YAHOO_LOGIN_LOCK;
+                case 1235: return (enum yahoo_status) YAHOO_LOGIN_UNAME;
                 default: return (enum yahoo_status) code;
         }
@@ -3610 +3611 @@
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE,
+        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, (enum ypacket_status) YAHOO_STATUS_OFFLINE,
                 yd->session_id);
 
@@ -3677 +3678 @@
         if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
                 pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
-                        YAHOO_STATUS_AVAILABLE, 0);
+                        (enum ypacket_status) YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "2");
                 yahoo_send_packet(yid, pkt, 0);
@@ -3696 +3697 @@
         if (old_status == YAHOO_STATUS_INVISIBLE) {
                 pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
-                        YAHOO_STATUS_AVAILABLE, 0);
+                        (enum ypacket_status) YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "1");
                 yahoo_send_packet(yid, pkt, 0);

protocols/yahoo/yahoo_util.h

@@ -48 +48 @@
 
 # define snprintf       g_snprintf
+#ifdef vsnprintf
+#undef vsnprintf
+#endif
 # define vsnprintf      g_vsnprintf
 

tests/check_arc.c

@@ -88 +88 @@
                                   &decrypted, password );
                 
+                fail_if( len == -1, 
+                 "`%s' didn't decrypt properly", decrypt_tests[i].decrypted );
                 fail_if( strcmp( decrypt_tests[i].decrypted, decrypted ) != 0,
                          "`%s' didn't decrypt properly", decrypt_tests[i].decrypted );

tests/check_irc.c

@@ -28 +28 @@
         GIOChannel *ch1, *ch2;
         irc_t *irc;
-        GError *error = NULL;
         char *raw;
         fail_unless(g_io_channel_pair(&ch1, &ch2));

tests/check_jabber_sasl.c

@@ -87 +87 @@
                 tcase_fn_start( get_part_tests[i].key, __FILE__, i );
                 char *res;
-                int len;
                 
                 res = sasl_get_part( get_part_tests[i].challenge,