diff options
author | Vincent Untz <vuntz@gnome.org> | 2010-09-15 13:08:19 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-15 13:12:05 +0100 |
commit | 9c5a4e350ae324316297db4ca3af175cbc32a702 (patch) | |
tree | dbec019ff8683139fa9d230aad8f34e5527dc515 | |
parent | db4960f191d5b1d091dd76537d50194ae579e773 (diff) | |
download | telepathy-mission-control-9c5a4e350ae324316297db4ca3af175cbc32a702.tar.gz |
Fix various build warnings
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r-- | test/account-store-default.c | 7 | ||||
-rw-r--r-- | test/account-store.c | 5 | ||||
-rw-r--r-- | test/keyring-command.c | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/test/account-store-default.c b/test/account-store-default.c index 3f23cf02..32c0fe42 100644 --- a/test/account-store-default.c +++ b/test/account-store-default.c @@ -23,6 +23,8 @@ #include <glib.h> #include <string.h> +#include "account-store-default.h" + #if ENABLE_GNOME_KEYRING #include <gnome-keyring.h> @@ -165,7 +167,6 @@ static GKeyFile * default_keyfile (void) { GError *error = NULL; static GKeyFile *keyfile = NULL; - const gchar *base; const gchar *path = NULL; if (keyfile != NULL) @@ -180,7 +181,7 @@ static GKeyFile * default_keyfile (void) if (error != NULL) g_warning ("keyfile '%s' error: %s", path, error->message); else - g_warning ("keyfile '%s' error: unknown error"); + g_warning ("keyfile '%s' error: unknown error", path); g_key_file_free (keyfile); g_error_free (error); @@ -190,7 +191,7 @@ static GKeyFile * default_keyfile (void) return keyfile; } -static gboolean commit_changes () +static gboolean commit_changes (void) { gsize n = 0; gchar *data = NULL; diff --git a/test/account-store.c b/test/account-store.c index f29feaec..f35ec7ef 100644 --- a/test/account-store.c +++ b/test/account-store.c @@ -25,6 +25,7 @@ #include <string.h> #include <stdio.h> #include <glib.h> +#include <glib-object.h> #include "account-store-default.h" @@ -121,7 +122,7 @@ int main (int argc, char **argv) const Backend *store = NULL; Operation op = OP_UNKNOWN; gchar *output = NULL; - gboolean success; + gboolean success = FALSE; g_type_init (); g_set_application_name (argv[0]); @@ -240,7 +241,7 @@ usage (const gchar *name, const gchar *fmt, ...) for (i = 1; backends[i].name != NULL; i++) fprintf (stderr, " | %s", backends[i].name); - fprintf (stderr, DOCSTRING_B, name); + fprintf (stderr, DOCSTRING_B); va_start (ap, fmt); vfprintf (stderr, fmt, ap); diff --git a/test/keyring-command.c b/test/keyring-command.c index ba056feb..640f448a 100644 --- a/test/keyring-command.c +++ b/test/keyring-command.c @@ -23,6 +23,9 @@ * */ +#include <glib.h> +#include <glib/gprintf.h> +#include <glib-object.h> #include <gnome-keyring.h> @@ -91,6 +94,7 @@ remove_keyring (gchar *keyring_name) { g_warning ("Failed to remove keyring %s: %s", keyring_name, gnome_keyring_result_to_message (result)); + return FALSE; } } |