diff options
Diffstat (limited to 'src/triplet.c')
-rw-r--r-- | src/triplet.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/triplet.c b/src/triplet.c index 3083c64..9dfdf2c 100644 --- a/src/triplet.c +++ b/src/triplet.c @@ -60,6 +60,7 @@ hash_triplet_free (void *data) for (up = tp->uploader_list; up; ) { struct uploader_info *next = up->next; + free (up->fpr); free (up); up = next; } @@ -94,7 +95,7 @@ register_file (struct file_info *finfo, const struct spool *spool) grecs_alloc_die (); } - key.name = xmalloc (finfo->root_len + 1); + key.name = grecs_malloc (finfo->root_len + 1); memcpy (key.name, finfo->name, finfo->root_len); key.name[finfo->root_len] = 0; @@ -378,7 +379,7 @@ format_file_data (struct file_triplet *trp, enum file_type type, char **pret) /* Size */ if (grecs_asprintf (&sptr, &slen, "%lu", (unsigned long) info->sb.st_size)) - xalloc_die (); + grecs_alloc_die (); /* Figure out padding and format the buffer */ slen = strlen (sptr); @@ -391,7 +392,7 @@ format_file_data (struct file_triplet *trp, enum file_type type, char **pret) modes, user_name, group_name, ugswidth - pad + slen, sptr, timebuf, info->name)) - xalloc_die (); + grecs_alloc_die (); free (sptr); *pret = buf; return 0; @@ -411,7 +412,7 @@ expand_triplet_ls_full (struct metadef *def, void *data) if (format_file_data (trp, file_directive, &buf[file_directive]) == 0) size += strlen (buf[file_directive]) + 1; - def->value = def->storage = xmalloc (size + 1); + def->value = def->storage = grecs_malloc (size + 1); def->value[0] = 0; if (buf[file_dist]) { @@ -446,7 +447,7 @@ expand_triplet_ls_upload (struct metadef *def, void *data) if (format_file_data (trp, file_signature, &buf[file_signature]) == 0) size += strlen (buf[file_signature]) + 1; - def->value = def->storage = xmalloc (size + 1); + def->value = def->storage = grecs_malloc (size + 1); def->value[0] = 0; if (buf[file_dist]) { @@ -552,7 +553,7 @@ expand_email_user (struct metadef *def, void *data) size_t size = 0; if (grecs_asprintf (&def->storage, &size, "\"%s\" <%s>", trp->uploader->realname, trp->uploader->email)) - xalloc_die (); + grecs_alloc_die (); def->value = def->storage; } return def->value; @@ -594,7 +595,7 @@ expand_check_result (struct metadef *def, void *data) def->storage = NULL; if (grecs_asprintf (&def->storage, &size, "%d", WEXITSTATUS (status))) - xalloc_die (); + grecs_alloc_die (); } else if (WIFSIGNALED (status)) { @@ -602,7 +603,7 @@ expand_check_result (struct metadef *def, void *data) def->storage = NULL; if (grecs_asprintf (&def->storage, &size, "SIG+%d", WTERMSIG (status))) - xalloc_die (); + grecs_alloc_die (); } else return def->value = "[unrecognized return code]"; |