Changeset 568aaf7

Timestamp:

2005-12-13T21:39:18Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

703f0f7

Parents:

019c031

Message:

Use the standard data file format.

File:

• bitlbee.c (modified) (4 diffs)

bitlbee.c

@@ -247 +247 @@
  * function is here merely because the save/load code still uses 
  * ids rather then names */
-struct prpl *find_protocol_by_id(int id)
+static struct prpl *find_protocol_by_id(int id)
 {
         switch (id) {
@@ -259 +259 @@
 }
 
+static int find_protocol_id(const char *name)
+{
+        if (!strcmp(name, "oscar")) return 1;
+        if (!strcmp(name, "msn")) return 4;
+        if (!strcmp(name, "yahoo")) return 2;
+        if (!strcmp(name, "jabber")) return 8;
+
+        return -1;
+}
+
 int bitlbee_load( irc_t *irc, char* password )
 {
         char s[512];
         char *line;
-        char proto[20];
+        int proto;
         char nick[MAX_NICK_LENGTH+1];
         FILE *fp;
@@ -298 +308 @@
         fp = fopen( s, "r" );
         if( !fp ) return( 0 );
-        while( fscanf( fp, "%s %s %s", s, proto, nick ) > 0 )
+        while( fscanf( fp, "%s %d %s", s, &proto, nick ) > 0 )
         {
                 struct prpl *prpl;
 
-                prpl = find_protocol(proto);
-
-                /* Older files saved the protocol number rather then the protocol name */
-                if (!prpl && atoi(proto)) {
-                        prpl = find_protocol_by_id(atoi(proto));
-                }
+                prpl = find_protocol_by_id(proto);
 
                 if (!prpl)
@@ -368 +373 @@
                 s[169] = 0; /* Prevent any overflow (169 ~ 512 / 3) */
                 http_encode( s );
-                g_snprintf( s + strlen( s ), 510 - strlen( s ), " %s %s", n->proto->name, n->nick );
+                g_snprintf( s + strlen( s ), 510 - strlen( s ), " %d %s", find_protocol_id(n->proto->name), n->nick );
                 if( fprintf( fp, "%s\n", s ) != strlen( s ) + 1 )
                 {