Changeset daae10f for protocols

Timestamp:

2010-08-07T16:33:02Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7b87539

Parents:

289bd2d

Message:

OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen <dam@…>
with some changes.

Location:

protocols

Files:

• Makefile (modified) (1 diff)
• jabber/Makefile (modified) (1 diff)
• jabber/jabber.c (modified) (2 diffs)
• jabber/message.c (modified) (2 diffs)
• msn/Makefile (modified) (1 diff)
• msn/msn.c (modified) (1 diff)
• nogaim.c (modified) (2 diffs)
• nogaim.h (modified) (1 diff)
• oscar/Makefile (modified) (1 diff)
• twitter/Makefile (modified) (1 diff)
• twitter/twitter_lib.c (modified) (1 diff)
• yahoo/Makefile (modified) (1 diff)
• yahoo/libyahoo2.c (modified) (1 diff)

protocols/Makefile

@@ -25 +25 @@
 # Expansion of variables
 subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs)))
-CFLAGS += -Wall
 LFLAGS += -r
 

protocols/jabber/Makefile

@@ -15 +15 @@
 objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o
 
-CFLAGS += -Wall
 LFLAGS += -r
 

protocols/jabber/jabber.c

@@ -381 +381 @@
                 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;
@@ -395 +395 @@
         /* 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;
+        if( state_txt == NULL )
+                jd->away_state = NULL;
+        else if( ( jd->away_state = jabber_away_state_by_name( state_txt ) ) == NULL )
+                jd->away_state = jabber_away_state_list;
         
         g_free( jd->away_message );

protocols/jabber/message.c

@@ -59 +59 @@
                         {
                                 room = from;
-                                from = xt_find_attr( inv, "from" ) ? : from;
+                                if( ( from = xt_find_attr( inv, "from" ) ) == NULL )
+                                        from = room;
 
                                 g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room );
@@ -72 +73 @@
                         {
                                 bud->last_msg = time( NULL );
-                                from = bud->ext_jid ? : bud->bare_jid;
+                                from = bud->ext_jid ? bud->ext_jid : bud->bare_jid;
                         }
                         else

protocols/msn/Makefile

@@ -15 +15 @@
 objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
 
-CFLAGS += -Wall
 LFLAGS += -r
 

protocols/msn/msn.c

@@ -176 +176 @@
         struct msn_data *md = ic->proto_data;
         
-        if( state )
-                md->away_state = msn_away_state_by_name( state ) ? :
-                                 msn_away_state_list + 1;
-        else
+        if( state == NULL )
                 md->away_state = msn_away_state_list;
+        else if( ( md->away_state = msn_away_state_by_name( state ) ) == NULL )
+                md->away_state = msn_away_state_list + 1;
         
         g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );

protocols/nogaim.c

@@ -468 +468 @@
         
         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_ );
@@ -491 +491 @@
         cbd->ic->acc->prpl->add_buddy( cbd->ic, cbd->handle, NULL );
         
-        return imcb_ask_add_cb_no( data );
+        imcb_ask_add_cb_no( data );
 }
 

protocols/nogaim.h

@@ -39 +39 @@
 #define _NOGAIM_H
 
+#if(__sun)
+#include <inttypes.h>
+#else
 #include <stdint.h>
+#endif
+
+#include "lib/events.h"
 
 #include "bitlbee.h"

protocols/oscar/Makefile

@@ -16 +16 @@
 objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
 
-CFLAGS += -Wall
 LFLAGS += -r
 

protocols/twitter/Makefile

@@ -15 +15 @@
 objects = twitter.o twitter_http.o twitter_lib.o
 
-CFLAGS += -Wall
 LFLAGS += -r
 

protocols/twitter/twitter_lib.c

@@ -23 +23 @@
 
 /* For strptime(): */
+#if(__sun)
+#else
 #define _XOPEN_SOURCE
+#endif
 
 #include "twitter_http.h"

protocols/yahoo/Makefile

@@ -15 +15 @@
 objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o
 
-CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
+CFLAGS += -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
 LFLAGS += -r
 

protocols/yahoo/libyahoo2.c

@@ -1859 +1859 @@
         }
         
-        return yahoo_https_auth_init(had);
+        yahoo_https_auth_init(had);
+        return;
         
 fail: