summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2013-09-23 11:49:14 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-16 09:35:32 -0700
commit3006297a0e45417e5988536bf5dbeb65ac7cce8d (patch)
tree63e62b00f3eeee15e745ece2535f84566e7ef7ab
parent68a65f5fe54c2b21bfe16ef3a0b48956ecf5658a (diff)
downloadgit-3006297a0e45417e5988536bf5dbeb65ac7cce8d.tar.gz
contrib/git-credential-gnome-keyring.c: use glib messaging functions
Rather than roll our own, let's use the messaging functions provided by glib. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/credential/gnome-keyring/git-credential-gnome-keyring.c33
1 files changed, 4 insertions, 29 deletions
diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
index 273c43bcc4..b70bd53959 100644
--- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
+++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <string.h>
-#include <stdarg.h>
#include <stdlib.h>
#include <glib.h>
#include <gnome-keyring.h>
@@ -58,30 +57,6 @@ struct credential_operation
#define CREDENTIAL_OP_END \
{ NULL,NULL }
-/* ---------------- common helper functions ----------------- */
-
-static inline void warning(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- fprintf(stderr, "warning: ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, "\n" );
- va_end(ap);
-}
-
-static inline void error(const char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- fprintf(stderr, "error: ");
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, "\n" );
- va_end(ap);
-}
-
/* ----------------- GNOME Keyring functions ----------------- */
/* create a special keyring option string, if path is given */
@@ -127,7 +102,7 @@ static int keyring_get(struct credential *c)
return EXIT_SUCCESS;
if (result != GNOME_KEYRING_RESULT_OK) {
- error("%s",gnome_keyring_result_to_message(result));
+ g_critical("%s", gnome_keyring_result_to_message(result));
return EXIT_FAILURE;
}
@@ -220,7 +195,7 @@ static int keyring_erase(struct credential *c)
if (result != GNOME_KEYRING_RESULT_OK)
{
- error("%s",gnome_keyring_result_to_message(result));
+ g_critical("%s", gnome_keyring_result_to_message(result));
return EXIT_FAILURE;
}
@@ -234,7 +209,7 @@ static int keyring_erase(struct credential *c)
if (result != GNOME_KEYRING_RESULT_OK)
{
- error("%s",gnome_keyring_result_to_message(result));
+ g_critical("%s", gnome_keyring_result_to_message(result));
return EXIT_FAILURE;
}
@@ -292,7 +267,7 @@ static int credential_read(struct credential *c)
value = strchr(buf,'=');
if (!value) {
- warning("invalid credential line: %s", key);
+ g_warning("invalid credential line: %s", key);
gnome_keyring_memory_free(buf);
return -1;
}