Changeset 64768d4 for protocols/msn/msn_util.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_util.c (modified) (6 diffs)

protocols/msn/msn_util.c

@@ -30 +30 @@
 #include <ctype.h>
 
-int msn_write( struct im_connection *ic, char *s, int len )
-{
-        struct msn_data *md = ic->proto_data;
-        int st;
-        
-        if( getenv( "BITLBEE_DEBUG" ) )
-        {
-                write( 2, "->NS:", 5 );
-                write( 2, s, len );
-        }
-        
-        st = write( md->fd, s, len );
-        if( st != len )
-        {
-                imcb_error( ic, "Short write() to main server" );
-                imc_logout( ic, TRUE );
-                return 0;
-        }
-        
-        return 1;
-}
-
 int msn_logged_in( struct im_connection *ic )
 {
@@ -76 +54 @@
 {
         struct msn_data *md = ic->proto_data;
-        char buf[1024], groupid[8];
+        char groupid[8];
         bee_user_t *bu;
         struct msn_buddy_data *bd;
@@ -144 +122 @@
         if( ( adl = adlrml_entry( who, list ) ) )
         {
-                g_snprintf( buf, sizeof( buf ), "ADL %d %zd\r\n%s",
-                            ++md->trId, strlen( adl ), adl );
+                int st = msn_ns_write( ic, -1, "ADL %d %zd\r\n%s",
+                                       ++md->trId, strlen( adl ), adl );
                 g_free( adl );
                 
-                return msn_write( ic, buf, strlen( buf ) );
+                return st;
         }
         
@@ -157 +135 @@
 {
         struct msn_data *md = ic->proto_data;
-        char buf[1024], groupid[8];
+        char groupid[8];
         bee_user_t *bu;
         struct msn_buddy_data *bd;
@@ -189 +167 @@
         if( ( adl = adlrml_entry( who, list ) ) )
         {
-                g_snprintf( buf, sizeof( buf ), "RML %d %zd\r\n%s",
-                            ++md->trId, strlen( adl ), adl );
+                int st = msn_ns_write( ic, -1, "RML %d %zd\r\n%s",
+                                       ++md->trId, strlen( adl ), adl );
                 g_free( adl );
                 
-                return msn_write( ic, buf, strlen( buf ) );
+                return st;
         }
         
@@ -603 +581 @@
         struct msn_data *md = ic->proto_data;
         char fn[strlen(value)*3+1];
-        char buf[512];
         
         strcpy( fn, value );
         http_encode( fn );
-        g_snprintf( buf, sizeof( buf ), "PRP %d MFN %s\r\n",
-                    ++md->trId, fn );
         
         /* Note: We don't actually know if the server accepted the new name,
            and won't give proper feedback yet if it doesn't. */
-        return msn_write( ic, buf, strlen( buf ) );
-}
+        return msn_ns_write( ic, -1, "PRP %d MFN %s\r\n", ++md->trId, fn );
+}