Changeset 64768d4 for protocols/msn/msn.c

Timestamp:

2010-09-02T09:15:44Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

bae0617

Parents:

02bb9db

Message:

Replace msn*write functions with saner versions that accept format strings.
Also preparing for additional temporary NS connections (auth token renewal).

File:

• protocols/msn/msn.c (modified) (4 diffs)

protocols/msn/msn.c

@@ -154 +154 @@
         if( strcmp( who, "raw" ) == 0 )
         {
-                msn_write( ic, message, strlen( message ) );
-                msn_write( ic, "\r\n", 2 );
+                msn_ns_write( ic, -1, "%s\r\n", message );
         }
         else
@@ -193 +192 @@
 static void msn_set_away( struct im_connection *ic, char *state, char *message )
 {
-        char buf[1024];
         char *uux;
         struct msn_data *md = ic->proto_data;
@@ -202 +200 @@
                 md->away_state = msn_away_state_list + 1;
         
-        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );
-        if( !msn_write( ic, buf, strlen( buf ) ) )
+        if( !msn_ns_write( ic, -1, "CHG %d %s\r\n", ++md->trId, md->away_state->code ) )
                 return;
         
         uux = g_markup_printf_escaped( "<Data><PSM>%s</PSM><CurrentMedia></CurrentMedia>"
                                        "</Data>", message ? message : "" );
-        g_snprintf( buf, sizeof( buf ), "UUX %d %zd\r\n%s", ++md->trId, strlen( uux ), uux );
-        if( !msn_write( ic, buf, strlen( buf ) ) )
-                return;
+        msn_ns_write( ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen( uux ), uux );
+        g_free( uux );
 }
 
@@ -290 +286 @@
 static void msn_keepalive( struct im_connection *ic )
 {
-        msn_write( ic, "PNG\r\n", strlen( "PNG\r\n" ) );
+        msn_ns_write( ic, -1, "PNG\r\n" );
 }