@matheusbsbs / matheus-bagliano / commits / c752fcc8e0

verify_signed_buffer: drop pbuf variable

If our caller gave us a non-NULL gpg_status parameter, we write the gpg status into their strbuf. If they didn't, then we write it to a temporary local strbuf (since we still need to look at it). The variable "pbuf" adds an extra layer of indirection so that the rest of the function can just access whichever is appropriate. However, the name "pbuf" isn't very descriptive, and it's easy to get confused about what is supposed to be in it (especially because we are reading both "status" and "output" from gpg). Rather than give it a more descriptive name, we can just use gpg_status as our indirection pointer. Either it points to the caller's input, or we can point it directly to our temporary buffer. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 17, 2016 at 19:38 UTC c752fcc8e0df02c6b1bd4daec1d08f0f2bcca58a

1 file changed +4 -5

gpg-interface.c

+4 -5

@@ -211,7 +211,6 @@ int verify_signed_buffer(const char *payload, size_t payload_size,

211 char path[PATH_MAX];

212 int fd, ret;

213 struct strbuf buf = STRBUF_INIT;

214 - struct strbuf *pbuf = &buf;

214

215 fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX");

216 if (fd < 0)

@@ -242,9 +241,9 @@ int verify_signed_buffer(const char *payload, size_t payload_size,

241 strbuf_read(gpg_output, gpg.err, 0);

242 close(gpg.err);

243 }

245 - if (gpg_status)

246 - pbuf = gpg_status;

247 - strbuf_read(pbuf, gpg.out, 0);

244 + if (!gpg_status)

245 + gpg_status = &buf;

246 + strbuf_read(gpg_status, gpg.out, 0);

247 close(gpg.out);

248

249 ret = finish_command(&gpg);

@@ -252,7 +251,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,

251

252 unlink_or_warn(path);

253

255 - ret |= !strstr(pbuf->buf, "\n[GNUPG:] GOODSIG ");

254 + ret |= !strstr(gpg_status->buf, "\n[GNUPG:] GOODSIG ");

255 strbuf_release(&buf); /* no matter it was used or not */

256

257 return ret;