Merge branch '1767-scan-build-fixes' into 'master'

Various small scan-build fixes

See merge request GNOME/glib!1088
This commit is contained in:
Nirbheek Chauhan
2019-09-13 12:37:37 +00:00
19 changed files with 44 additions and 18 deletions

View File

@@ -542,13 +542,12 @@ g_credentials_set_unix_user (GCredentials *credentials,
uid_t uid,
GError **error)
{
gboolean ret;
gboolean ret = FALSE;
g_return_val_if_fail (G_IS_CREDENTIALS (credentials), FALSE);
g_return_val_if_fail (uid != -1, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
ret = FALSE;
#if G_CREDENTIALS_USE_LINUX_UCRED
credentials->native.uid = uid;
ret = TRUE;

View File

@@ -170,6 +170,7 @@ name_new (GDBusDaemon *daemon, const char *str)
static Name *
name_ref (Name *name)
{
g_assert (name->refcount > 0);
name->refcount++;
return name;
}
@@ -177,6 +178,7 @@ name_ref (Name *name)
static void
name_unref (Name *name)
{
g_assert (name->refcount > 0);
if (--name->refcount == 0)
{
g_hash_table_remove (name->daemon->names, name->name);
@@ -1463,10 +1465,11 @@ filter_function (GDBusConnection *connection,
gpointer user_data)
{
Client *client = user_data;
const char *types[] = {"invalid", "method_call", "method_return", "error", "signal" };
if (0)
g_printerr ("%s%s %s %d(%d) sender: %s destination: %s %s %s.%s\n",
{
const char *types[] = {"invalid", "method_call", "method_return", "error", "signal" };
g_printerr ("%s%s %s %d(%d) sender: %s destination: %s %s %s.%s\n",
client->id,
incoming? "->" : "<-",
types[g_dbus_message_get_message_type (message)],
@@ -1477,6 +1480,7 @@ filter_function (GDBusConnection *connection,
g_dbus_message_get_path (message),
g_dbus_message_get_interface (message),
g_dbus_message_get_member (message));
}
if (incoming)
{

View File

@@ -25,7 +25,9 @@
#error "config.h must be included prior to gio_trace.h"
#endif
#ifdef HAVE_DTRACE
/* Ignore probes when doing static analysis, as they do weird things which
* confuses the analyser. */
#if defined(HAVE_DTRACE) && !defined(__clang_analyzer__)
/* include the generated probes header and put markers in code */
#include "gio_probes.h"