diff options
Diffstat (limited to 'src/verify.c')
-rw-r--r-- | src/verify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/verify.c b/src/verify.c index a49983c..c8fef11 100644 --- a/src/verify.c +++ b/src/verify.c | |||
@@ -104,25 +104,25 @@ fill_project_name (struct file_triplet *trp) | |||
104 | trp->file[file_directive].name); | 104 | trp->file[file_directive].name); |
105 | return 1; | 105 | return 1; |
106 | } | 106 | } |
107 | 107 | ||
108 | fp = fopen (trp->file[file_directive].name, "r"); | 108 | fp = fopen (trp->file[file_directive].name, "r"); |
109 | if (!fp) | 109 | if (!fp) |
110 | { | 110 | { |
111 | logmsg (LOG_ERR, _("cannot open file %s: %s"), | 111 | logmsg (LOG_ERR, _("cannot open file %s: %s"), |
112 | trp->file[file_directive].name, strerror (errno)); | 112 | trp->file[file_directive].name, strerror (errno)); |
113 | return 1; | 113 | return 1; |
114 | } | 114 | } |
115 | 115 | ||
116 | blurb = xmalloc (size + 1); | 116 | blurb = grecs_malloc (size + 1); |
117 | 117 | ||
118 | rc = fread (blurb, size, 1, fp); | 118 | rc = fread (blurb, size, 1, fp); |
119 | fclose (fp); | 119 | fclose (fp); |
120 | 120 | ||
121 | if (rc != 1) | 121 | if (rc != 1) |
122 | { | 122 | { |
123 | logmsg (LOG_ERR, _("error reading file %s: %s"), | 123 | logmsg (LOG_ERR, _("error reading file %s: %s"), |
124 | trp->file[file_directive].name, strerror (errno)); | 124 | trp->file[file_directive].name, strerror (errno)); |
125 | free (blurb); | 125 | free (blurb); |
126 | return 1; | 126 | return 1; |
127 | } | 127 | } |
128 | 128 | ||
@@ -173,25 +173,25 @@ fill_project_name (struct file_triplet *trp) | |||
173 | txtacc_1grow (trp->acc, 0); | 173 | txtacc_1grow (trp->acc, 0); |
174 | trp->project = txtacc_finish (trp->acc, 0); | 174 | trp->project = txtacc_finish (trp->acc, 0); |
175 | } | 175 | } |
176 | else | 176 | else |
177 | trp->project = trp->relative_dir; | 177 | trp->project = trp->relative_dir; |
178 | 178 | ||
179 | return 0; | 179 | return 0; |
180 | } | 180 | } |
181 | 181 | ||
182 | struct uploader_info * | 182 | struct uploader_info * |
183 | new_uploader_info (struct uploader_info *src) | 183 | new_uploader_info (struct uploader_info *src) |
184 | { | 184 | { |
185 | struct uploader_info *p = xmalloc (sizeof (*p)); | 185 | struct uploader_info *p = grecs_malloc (sizeof (*p)); |
186 | p->next = NULL; | 186 | p->next = NULL; |
187 | p->name = src->name; | 187 | p->name = src->name; |
188 | p->realname = src->realname; | 188 | p->realname = src->realname; |
189 | p->gpg_key = src->gpg_key; | 189 | p->gpg_key = src->gpg_key; |
190 | p->email = src->email; | 190 | p->email = src->email; |
191 | p->fpr = NULL; | 191 | p->fpr = NULL; |
192 | return p; | 192 | return p; |
193 | } | 193 | } |
194 | 194 | ||
195 | struct uploader_info * | 195 | struct uploader_info * |
196 | uploader_find_frp (struct uploader_info *list, const char *fpr) | 196 | uploader_find_frp (struct uploader_info *list, const char *fpr) |
197 | { | 197 | { |