warning-fixes
author Myhailo Danylenko <isbear@ukrpost.net>
Sat, 28 Jul 2012 19:04:29 +0300
changeset 34 94b6e4aa74a3
parent 31 e02c22bf6115
permissions -rw-r--r--
Add fix-module-messages

# HG changeset patch
# Parent b5ea7efbf1f97502016888c5c7f463bae703c13e
Fix some compiler warnings

diff -r b5ea7efbf1f9 mcabber/mcabber/commands.c
--- a/mcabber/mcabber/commands.c	Thu Jul 19 08:03:37 2012 +0300
+++ b/mcabber/mcabber/commands.c	Thu Jul 19 08:04:52 2012 +0300
@@ -1949,13 +1949,11 @@
       enum imstatus rstatus;
       const char *rst_msg;
       time_t rst_time;
-      struct pgp_data *rpgp;
 
       rprio   = buddy_getresourceprio(bud, p_res->data);
       rstatus = buddy_getstatus(bud, p_res->data);
       rst_msg = buddy_getstatusmsg(bud, p_res->data);
       rst_time = buddy_getstatustime(bud, p_res->data);
-      rpgp = buddy_resource_pgp(bud, p_res->data);
 
       snprintf(buffer, 4095, "Resource: [%c] (%d) %s", imstatus2char[rstatus],
                rprio, (char*)p_res->data);
@@ -1974,6 +1972,8 @@
                                  0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0);
       }
 #ifdef HAVE_GPGME
+      struct pgp_data *rpgp = buddy_resource_pgp(bud, p_res->data);
+
       if (rpgp && rpgp->sign_keyid) {
         snprintf(buffer, 4095, "PGP key id: %s", rpgp->sign_keyid);
         scr_WriteIncomingMessage(bjid, buffer,
diff -r b5ea7efbf1f9 mcabber/mcabber/xmpp_helper.c
--- a/mcabber/mcabber/xmpp_helper.c	Thu Jul 19 08:03:37 2012 +0300
+++ b/mcabber/mcabber/xmpp_helper.c	Thu Jul 19 08:04:52 2012 +0300
@@ -22,6 +22,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>   // snprintf
 
 #include "xmpp_helper.h"
 #include "settings.h"