summaryrefslogtreecommitdiff
path: root/contrib/credential
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2013-09-23 18:49:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-16 16:35:31 (GMT)
commit8bb7a54c57d5bd8113886fc04be8d22d10337eef (patch)
tree56205a5f36f8867465c2eb876aebe58f5782887f /contrib/credential
parentff55c47d0f737cd33594e864a0e5a5e1d32fdd13 (diff)
downloadgit-8bb7a54c57d5bd8113886fc04be8d22d10337eef.zip
git-8bb7a54c57d5bd8113886fc04be8d22d10337eef.tar.gz
git-8bb7a54c57d5bd8113886fc04be8d22d10337eef.tar.bz2
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 <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/credential')
-rw-r--r--contrib/credential/gnome-keyring/git-credential-gnome-keyring.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
index 43b19dd..b692e1f 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)