From d21380f6d1ee279003b505c95daa934c1327991d Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Thu, 30 Aug 2012 20:48:56 +0300 Subject: [PATCH] telepathy: fix Coverity warnings in new code Re-checked code with Coverity 6.0.2 and updated derived models for glib2, libpurple and telepathy-glib. There are currently 10 warnings left, i.e. 2 new ones introduced by the new code. If I understand the TAINTED_SCALAR warning correctly, then the problem is in glib2 & telepathy-glib and not in our code. --- src/telepathy/telepathy-dnsquery.c | 1 - src/telepathy/telepathy-transport.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/telepathy/telepathy-dnsquery.c b/src/telepathy/telepathy-dnsquery.c index 4c6d09e1..441e50c6 100644 --- a/src/telepathy/telepathy-dnsquery.c +++ b/src/telepathy/telepathy-dnsquery.c @@ -25,7 +25,6 @@ #include "sipe-backend.h" #include "sipe-common.h" -#include "sipe-core.h" struct sipe_dns_query { sipe_dns_resolved_cb callback; diff --git a/src/telepathy/telepathy-transport.c b/src/telepathy/telepathy-transport.c index 1a91899c..801df325 100644 --- a/src/telepathy/telepathy-transport.c +++ b/src/telepathy/telepathy-transport.c @@ -30,7 +30,6 @@ #include #include "sipe-backend.h" -#include "sipe-common.h" #include "sipe-core.h" #include "sipe-nls.h" @@ -131,7 +130,7 @@ static void socket_connected(GObject *client, result, &error); - if (error) { + if (transport->socket == NULL) { const gchar *msg = error ? error->message : "UNKNOWN"; SIPE_DEBUG_ERROR("socket_connected: failed: %s", msg); if (transport->error) -- 2.11.4.GIT