changeset 1476:77afd831f8f7

Avoid mixed declarations and code Build failures reported by H. D. Oezbilen.
author Mikael Berthe <mikael@lilotux.net>
date Thu, 17 Apr 2008 21:01:09 +0200
parents ef09de538e8f
children ec6a3b61c73e
files mcabber/src/jab_iq.c mcabber/src/jabglue.c mcabber/src/roster.c mcabber/src/screen.c
diffstat 4 files changed, 35 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/jab_iq.c	Tue Apr 15 07:48:46 2008 +0200
+++ b/mcabber/src/jab_iq.c	Thu Apr 17 21:01:09 2008 +0200
@@ -1100,15 +1100,17 @@
 
 static void xmlnode_insert_dataform_result_message(xmlnode node, char *message)
 {
-  xmlnode x = xmlnode_insert_tag(node, "x");
+  xmlnode x, field, value;
+
+  x = xmlnode_insert_tag(node, "x");
   xmlnode_put_attrib(x, "type", "result");
   xmlnode_put_attrib(x, "xmlns", "jabber:x:data");
 
-  xmlnode field = xmlnode_insert_tag(x, "field");
+  field = xmlnode_insert_tag(x, "field");
   xmlnode_put_attrib(field, "type", "text-single");
   xmlnode_put_attrib(field, "var", "message");
 
-  xmlnode value = xmlnode_insert_tag(field, "value");
+  value = xmlnode_insert_tag(field, "value");
   xmlnode_insert_cdata(value, message, -1);
 }
 
@@ -1140,6 +1142,8 @@
   xmlnode_put_attrib(command, "xmlns", NS_COMMANDS);
 
   if (!sessionid) {
+    xmlnode value;
+
     sessionid = generate_session_id("set-status");
     xmlnode_put_attrib(command, "sessionid", sessionid);
     g_free(sessionid);
@@ -1161,7 +1165,7 @@
     xmlnode_put_attrib(y, "type", "hidden");
     xmlnode_put_attrib(y, "var", "FORM_TYPE");
 
-    xmlnode value = xmlnode_insert_tag(y, "value");
+    value = xmlnode_insert_tag(y, "value");
     xmlnode_insert_cdata(value, "http://jabber.org/protocol/rc", -1);
 
     y = xmlnode_insert_tag(x, "field");
@@ -1217,7 +1221,7 @@
 
 static void _callback_foreach_buddy_groupchat(gpointer rosterdata, void *param)
 {
-  xmlnode value;
+  xmlnode value, option;
   xmlnode *field;
   const char *room_jid, *nickname;
   char *desc;
@@ -1228,7 +1232,7 @@
   if (!nickname) return;
   field = param;
 
-  xmlnode option = xmlnode_insert_tag(*field, "option");
+  option = xmlnode_insert_tag(*field, "option");
   value = xmlnode_insert_tag(option, "value");
   xmlnode_insert_cdata(value, room_jid, -1);
   desc = g_strdup_printf("%s on %s", nickname, room_jid);
@@ -1253,6 +1257,8 @@
   xmlnode_put_attrib(command, "xmlns", NS_COMMANDS);
 
   if (!sessionid) {
+    xmlnode title, instructions, field, value;
+
     sessionid = generate_session_id("leave-groupchats");
     xmlnode_put_attrib(command, "sessionid", sessionid);
     g_free(sessionid);
@@ -1262,18 +1268,18 @@
     xmlnode_put_attrib(x, "type", "form");
     xmlnode_put_attrib(x, "xmlns", "jabber:x:data");
 
-    xmlnode title = xmlnode_insert_tag(x, "title");
+    title = xmlnode_insert_tag(x, "title");
     xmlnode_insert_cdata(title, "Leave groupchat(s)", -1);
 
-    xmlnode instructions = xmlnode_insert_tag(x, "instructions");
+    instructions = xmlnode_insert_tag(x, "instructions");
     xmlnode_insert_cdata(instructions, "What groupchats do you want to leave?",
                          -1);
 
-    xmlnode field = xmlnode_insert_tag(x, "field");
+    field = xmlnode_insert_tag(x, "field");
     xmlnode_put_attrib(field, "type", "hidden");
     xmlnode_put_attrib(field, "var", "FORM_TYPE");
 
-    xmlnode value = xmlnode_insert_tag(field, "value");
+    value = xmlnode_insert_tag(field, "value");
     xmlnode_insert_cdata(value, "http://jabber.org/protocol/rc", -1);
 
     field = xmlnode_insert_tag(x, "field");
@@ -1288,9 +1294,10 @@
   {
     xmlnode form = xmlnode_get_tag(x, "x?xmlns=jabber:x:data");
     if (form) {
+      xmlnode x, gc;
+
       xmlnode_put_attrib(command, "status", "completed");
-      xmlnode gc = xmlnode_get_tag(form, "field?var=groupchats");
-      xmlnode x;
+      gc = xmlnode_get_tag(form, "field?var=groupchats");
 
       for (x = xmlnode_get_firstchild(gc) ; x ; x = xmlnode_get_nextsibling(x))
       {
--- a/mcabber/src/jabglue.c	Tue Apr 15 07:48:46 2008 +0200
+++ b/mcabber/src/jabglue.c	Thu Apr 17 21:01:09 2008 +0200
@@ -903,7 +903,7 @@
   const char *bjid;
 #ifdef JEP0085
   GSList *resources, *p_res, *p_next;
-  struct jep0085 *jep85 = NULL;;
+  struct jep0085 *jep85 = NULL;
 #endif
 #ifdef JEP0022
   struct jep0022 *jep22;
--- a/mcabber/src/roster.c	Tue Apr 15 07:48:46 2008 +0200
+++ b/mcabber/src/roster.c	Thu Apr 17 21:01:09 2008 +0200
@@ -668,8 +668,8 @@
     buddylist_build();
 
   if (unread_list_modified) {
+    guint unread_count = g_slist_length(unread_list);
     hlog_save_state();
-    guint unread_count = g_slist_length(unread_list);
     /* Call external command */
     hk_ext_cmd("", 'U', (guchar)MIN(255, unread_count), NULL);
   }
--- a/mcabber/src/screen.c	Tue Apr 15 07:48:46 2008 +0200
+++ b/mcabber/src/screen.c	Thu Apr 17 21:01:09 2008 +0200
@@ -302,9 +302,9 @@
     g_free(muclow);
   } else {//Add or overwrite
     if (strcmp(muc, "*")) {
-      ensure_string_htable(&muccolors, g_free);
       muccoltype *value = g_new(muccoltype, 1);
       *value = type;
+      ensure_string_htable(&muccolors, g_free);
       g_hash_table_replace(muccolors, muclow, value);
     } else {
       glob_muccol = type;
@@ -1095,25 +1095,32 @@
 
       // The MUC nick - overwrite with proper color
       if (line->mucnicklen) {
+        char *mucjid;
+        char tmp;
+        nickcolor *actual = NULL;
+        muccoltype type, *typetmp;
+
         // Store the char after the nick
-        char tmp = line->text[line->mucnicklen];
-        muccoltype type = glob_muccol, *typetmp;
+        tmp = line->text[line->mucnicklen];
+        type = glob_muccol;
         // Terminate the string after the nick
         line->text[line->mucnicklen] = '\0';
-        char *mucjid = g_utf8_strdown(CURRENT_JID, -1);
+        mucjid = g_utf8_strdown(CURRENT_JID, -1);
         if (muccolors) {
           typetmp = g_hash_table_lookup(muccolors, mucjid);
           if (typetmp)
             type = *typetmp;
         }
         g_free(mucjid);
-        nickcolor *actual = NULL;
         // Need to generate some random color?
         if ((type == MC_ALL) && (!nickcolors ||
             !g_hash_table_lookup(nickcolors, line->text))) {
+          char *snick, *mnick;
+          nickcolor *nc;
+          snick = g_strdup(line->text);
+          mnick = g_strdup(line->text);
+          nc = g_new(nickcolor, 1);
           ensure_string_htable(&nickcolors, NULL);
-          char *snick = g_strdup(line->text), *mnick = g_strdup(line->text);
-          nickcolor *nc = g_new(nickcolor, 1);
           nc->color = nickcols[random() % nickcolcount];
           nc->manual = FALSE;
           *snick = '<';