Skip to content

Commit

Permalink
contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_…
Browse files Browse the repository at this point in the history
…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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
drafnel authored and gitster committed Oct 16, 2013
1 parent ff55c47 commit 8bb7a54
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 8bb7a54

Please sign in to comment.