pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [17025] trunk/libgaim/protocols/silc/ops.c

[<dat...@us...>]

Revision: 17025
Author:   datallah
Date:     2006-08-24 14:09:45 -0700 (Thu, 24 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17025&view=rev

Log Message:
-----------
fix CID 175, 176 (unused values)

Modified Paths:
--------------
    trunk/libgaim/protocols/silc/ops.c
Modified: trunk/libgaim/protocols/silc/ops.c
===================================================================
--- trunk/libgaim/protocols/silc/ops.c	2006-08-24 20:25:57 UTC (rev 17024)
+++ trunk/libgaim/protocols/silc/ops.c	2006-08-24 21:09:45 UTC (rev 17025)
@@ -445,7 +445,6 @@
 	SilcHashTableList htl;
 	SilcChannelUser chu;
 	char buf[512], buf2[512], *tmp, *name;
-	SilcBuffer buffer;
 	SilcNotifyType notify;
 	GaimBuddy *b;
 	int i;
@@ -461,7 +460,7 @@
 	case SILC_NOTIFY_TYPE_INVITE:
 		{
 			GHashTable *components;
-			channel = va_arg(va, SilcChannelEntry);
+			va_arg(va, SilcChannelEntry);
 			name = va_arg(va, char *);
 			client_entry = va_arg(va, SilcClientEntry);
 
@@ -616,7 +615,7 @@
 		(void)va_arg(va, char *);
 		(void)va_arg(va, char *);
 		(void)va_arg(va, SilcPublicKey);
-		buffer = va_arg(va, SilcBuffer);
+		(void)va_arg(va, SilcBuffer);
 		channel = va_arg(va, SilcChannelEntry);
 
 		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
@@ -1509,7 +1508,6 @@
 	case SILC_COMMAND_INFO:
 		{
 
-			SilcServerEntry server_entry;
 			char *server_name;
 			char *server_info;
 			char tmp[256];
@@ -1521,7 +1519,7 @@
 				return;
 			}
 
-			server_entry = va_arg(vp, SilcServerEntry);
+			(void)va_arg(vp, SilcServerEntry);
 			server_name = va_arg(vp, char *);
 			server_info = va_arg(vp, char *);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17439] trunk/libgaim/protocols/silc/ops.c

[<nos...@us...>]

Revision: 17439
          http://svn.sourceforge.net/gaim/?rev=17439&view=rev
Author:   nosnilmot
Date:     2006-10-07 10:05:27 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
Fix Coverity CID 219 - don't pass NULL to strcmp

Modified Paths:
--------------
    trunk/libgaim/protocols/silc/ops.c

Modified: trunk/libgaim/protocols/silc/ops.c
===================================================================
--- trunk/libgaim/protocols/silc/ops.c	2006-10-07 17:03:26 UTC (rev 17438)
+++ trunk/libgaim/protocols/silc/ops.c	2006-10-07 17:05:27 UTC (rev 17439)
@@ -890,8 +890,9 @@
 							if (b->account != gc->account)
 								continue;
 							f = gaim_blist_node_get_string(bnode, "public-key");
-							if (!strcmp(f, buf))
+							if (f && !strcmp(f, buf))
 								goto cont;
+							b = NULL;
 						}
 					}
 				}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.