Changes in / [c511365:3933853]

Files:

• conf.h (modified) (1 diff)
• crypting.h (modified) (1 diff)
• help.h (modified) (1 diff)
• lib/proxy.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (3 diffs)
• storage.h (modified) (1 diff)

conf.h

@@ -51 +51 @@
 } conf_t;
 
-G_GNUC_MALLOC conf_t *conf_load( int argc, char *argv[] );
+conf_t *conf_load( int argc, char *argv[] );
 void conf_loaddefaults( irc_t *irc );
 

crypting.h

@@ -25 +25 @@
 
 int checkpass (const char *password, const char *md5sum);
-G_GNUC_MALLOC char *hashpass (const char *password);
-G_GNUC_MALLOC char *obfucrypt (char *line, const char *password);
-G_GNUC_MALLOC char *deobfucrypt (char *line, const char *password);
+char *hashpass (const char *password);
+char *obfucrypt (char *line, const char *password);
+char *deobfucrypt (char *line, const char *password);

help.h

@@ -43 +43 @@
 } help_t;
 
-G_GNUC_MALLOC help_t *help_init( help_t **help, const char *helpfile );
+help_t *help_init( help_t **help, const char *helpfile );
 char *help_get( help_t **help, char *string );
 

lib/proxy.c

@@ -211 +211 @@
         }
 
-        if (strlen(proxyuser) > 0) {
+        if (proxyuser && *proxyuser) {
                 char *t1, *t2;
                 t1 = g_strdup_printf("%s:%s", proxyuser, proxypass);
@@ -539 +539 @@
         phb->data = data;
         
-        if ((proxytype == PROXY_NONE) || strlen(proxyhost) > 0 || !proxyport || (proxyport == -1))
+        if ((proxytype == PROXY_NONE) || !proxyhost || !proxyhost[0] || !proxyport || (proxyport == -1))
                 return proxy_connect_none(host, port, phb);
         else if (proxytype == PROXY_HTTP)

protocols/nogaim.c

@@ -36 +36 @@
 #include <ctype.h>
 
-static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
+static int remove_chat_buddy_silent( struct groupchat *b, char *handle );
 
 GSList *connections;
@@ -556 +556 @@
                 /* Remove him/her from the conversations to prevent PART messages after he/she QUIT already */
                 for( c = ic->conversations; c; c = c->next )
-                        remove_chat_buddy_silent( c, handle );
+                        remove_chat_buddy_silent( c, (char*) handle );
         }
         
@@ -821 +821 @@
 }
 
-static int remove_chat_buddy_silent( struct groupchat *b, const char *handle )
+static int remove_chat_buddy_silent( struct groupchat *b, char *handle )
 {
         GList *i;

storage.h

@@ -62 +62 @@
 
 void register_storage_backend(storage_t *);
-G_GNUC_MALLOC GList *storage_init(const char *primary, char **migrate);
+GList *storage_init(const char *primary, char **migrate);
 
 #endif /* __STORAGE_H__ */