From 8bb7a54c57d5bd8113886fc04be8d22d10337eef Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Mon, 23 Sep 2013 11:49:10 -0700 Subject: contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object() Rather than carefully allocating memory for sprintf() to write into, let's make use of the glib helper function g_strdup_printf(), which makes things a lot easier and less error-prone. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- .../gnome-keyring/git-credential-gnome-keyring.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'contrib/credential/gnome-keyring') diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c index 43b19dd5a2..b692e1f890 100644 --- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c +++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c @@ -112,21 +112,13 @@ static inline char *xstrdup(const char *str) /* create a special keyring option string, if path is given */ static char* keyring_object(struct credential *c) { - char* object = NULL; - if (!c->path) - return object; - - object = (char*) malloc(strlen(c->host)+strlen(c->path)+8); - if (!object) - die_errno(errno); + return NULL; if (c->port) - sprintf(object,"%s:%hd/%s",c->host,c->port,c->path); - else - sprintf(object,"%s/%s",c->host,c->path); + return g_strdup_printf("%s:%hd/%s", c->host, c->port, c->path); - return object; + return g_strdup_printf("%s/%s", c->host, c->path); } static int keyring_get(struct credential *c) -- cgit v1.2.3