Ticket #667: 0005-Do-not-return-values-in-void-functions-and-make-seco.patch

irc_commands.c

@@ -38 +38 @@
                    command last. (Possibly it won't send it at all if it turns
                    out we don't require it, which will break this feature.)
                    Try to identify using the given password. */
-                return root_command( irc, send_cmd );
+                root_command( irc, send_cmd );
+                return;
         }
         /* Handling in pre-logged-in state, first see if this server is
            password-protected: */

lib/oauth.c

@@ -59 +59 @@
         else
         {
                 g_snprintf( (gchar*) key, HMAC_BLOCK_SIZE + 1, "%s&%s",
-                            oi->sp->consumer_secret, oi->token_secret ? : "" );
+                            oi->sp->consumer_secret, oi->token_secret ? oi->token_secret : "" );
         }
         
         /* Inner part: H(K XOR 0x36, text) */

lib/xmltree.c

@@ -214 +214 @@
                 return;
         
         if( node == NULL )
-                return xt_cleanup( xt, xt->root, depth );
+                xt_cleanup( xt, xt->root, depth );
+                return;
         
         if( node->flags & XT_SEEN && node == xt->root )
         {

protocols/jabber/jabber.c

@@ -366 +366 @@
                 imcb_log( ic, "Buddy %s (%d) information:", bud->full_jid, bud->priority );
                 if( bud->away_state )
                         imcb_log( ic, "Away state: %s", bud->away_state->full_name );
-                imcb_log( ic, "Status message: %s", bud->away_message ? : "(none)" );
+                imcb_log( ic, "Status message: %s", bud->away_message ? bud->away_message : "(none)" );
                 
                 bud = bud->next;
         }
@@ -381 +381 @@
         /* state_txt == NULL -> Not away.
            Unknown state -> fall back to the first defined away state. */
         jd->away_state = state_txt ? jabber_away_state_by_name( state_txt )
-                         ? : jabber_away_state_list : NULL;
+                         ? jabber_away_state_by_name( state_txt ) : jabber_away_state_list : NULL;
         
         g_free( jd->away_message );
         jd->away_message = ( message && *message ) ? g_strdup( message ) : NULL;

protocols/jabber/message.c

@@ -58 +58 @@
                             ( inv = xt_find_node( c->children, "invite" ) ) )
                         {
                                 room = from;
-                                from = xt_find_attr( inv, "from" ) ? : from;
+                                from = xt_find_attr( inv, "from" ) ? xt_find_attr( inv, "from" ) : from;
 
                                 g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room );
                                 if( ( reason = xt_find_node( inv->children, "reason" ) ) && reason->text_len > 0 )
@@ -71 +71 @@
                         if( bud )
                         {
                                 bud->last_msg = time( NULL );
-                                from = bud->ext_jid ? : bud->bare_jid;
+                                from = bud->ext_jid ? bud->ext_jid : bud->bare_jid;
                         }
                         else
                                 *s = 0; /* We need to generate a bare JID now. */

protocols/msn/msn.c

@@ -153 +153 @@
         struct msn_data *md = ic->proto_data;
         
         if( state )
-                md->away_state = msn_away_state_by_name( state ) ? :
+                md->away_state = msn_away_state_by_name( state ) ? msn_away_state_by_name( state ) :
                                  msn_away_state_list + 1;
         else
                 md->away_state = msn_away_state_list;

protocols/nogaim.c

@@ -578 +578 @@
                 realname_ = g_strdup_printf( " (%s)", realname );
         
         s = g_strdup_printf( "The user %s%s wants to add you to his/her buddy list.",
-                             handle, realname_ ?: "" );
+                             handle, realname_ ? realname_ : "" );
         
         g_free( realname_ );
         
@@ -600 +600 @@
         
         cbd->ic->acc->prpl->add_buddy( cbd->ic, cbd->handle, NULL );
         
-        return imcb_ask_add_cb_no( data );
+        imcb_ask_add_cb_no( data );
+        return;
 }
 
 void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname )
@@ -971 +972 @@
                 char *ts = NULL;
                 if( set_getbool( &ic->irc->set, "display_timestamps" ) )
                         ts = format_timestamp( ic->irc, sent_at );
-                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, ts ? : "", wrapped );
+                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, ts ? ts : "", wrapped );
                 g_free( ts );
         }
         else
@@ -1302 +1303 @@
                 return 0;
         
         away = set_getstr( &ic->acc->set, "away" ) ?
-             : set_getstr( &ic->irc->set, "away" );
+             set_getstr( &ic->acc->set, "away" ) : set_getstr( &ic->irc->set, "away" );
         if( away && *away )
         {
                 GList *m = ic->acc->prpl->away_states( ic );
                 msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
-                away = imc_away_state_find( m, away, &msg ) ? : m->data;
+                away = imc_away_state_find( m, away, &msg ) ? imc_away_state_find( m, away, &msg ) : m->data;
         }
         else if( ic->acc->flags & ACC_FLAG_STATUS_MESSAGE )
         {
                 away = NULL;
-                msg = set_getstr( &ic->acc->set, "status" ) ?
+                msg = set_getstr( &ic->acc->set, "status" ) ? set_getstr( &ic->acc->set, "status" )
                     : set_getstr( &ic->irc->set, "status" );
         }
         

protocols/yahoo/libyahoo2.c

@@ -2366 +2366 @@
                 goto fail;
         }
         
-        return yahoo_https_auth_init(had);
+        yahoo_https_auth_init(had);
+        return;
         
 fail:
         g_free(had->token);
@@ -4369 +4370 @@
         struct yahoo_packet* pkt=NULL;
         pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0);
 
-        yahoo_packet_hash(pkt,1,me ?: yd->user);        
+        yahoo_packet_hash(pkt,1,me ? me : yd->user);    
         yahoo_packet_hash(pkt,5,who);
         yahoo_packet_hash(pkt,13,"1");
         yahoo_packet_hash(pkt,334,"0");
@@ -4388 +4389 @@
         struct yahoo_packet* pkt=NULL;
         pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0);
 
-        yahoo_packet_hash(pkt,1,me ?: yd->user);        
+        yahoo_packet_hash(pkt,1,me ? me : yd->user);    
         yahoo_packet_hash(pkt,5,who);
 //      yahoo_packet_hash(pkt,241,YAHOO_PROTO_VER);
         yahoo_packet_hash(pkt,13,"2");
         yahoo_packet_hash(pkt,334,"0");
         yahoo_packet_hash(pkt,97,"1");
-        yahoo_packet_hash(pkt,14,msg?:"");
+        yahoo_packet_hash(pkt,14,msg? msg :"");
 
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);