summaryrefslogtreecommitdiffstats
path: root/sshbuf-misc.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-07-07 03:05:00 +0200
committerDamien Miller <djm@mindrot.org>2019-07-08 03:45:51 +0200
commit696fb4298e80f2ebcd188986a91b49af3b7ca14c (patch)
treeb07d04b5035781544ddb0e9e9fee1476bf564850 /sshbuf-misc.c
parentupstream: still compile uuencode.c, unbreaks build (diff)
downloadopenssh-696fb4298e80f2ebcd188986a91b49af3b7ca14c.tar.xz
openssh-696fb4298e80f2ebcd188986a91b49af3b7ca14c.zip
upstream: Remove some set but never used variables. ok daraadt@
OpenBSD-Commit-ID: 824baf9c59afc66a4637017e397b9b74a41684e7
Diffstat (limited to 'sshbuf-misc.c')
-rw-r--r--sshbuf-misc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sshbuf-misc.c b/sshbuf-misc.c
index 15dcfbc79..a077a01ef 100644
--- a/sshbuf-misc.c
+++ b/sshbuf-misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshbuf-misc.c,v 1.6 2016/05/02 08:49:03 djm Exp $ */
+/* $OpenBSD: sshbuf-misc.c,v 1.7 2019/07/07 01:05:00 dtucker Exp $ */
/*
* Copyright (c) 2011 Damien Miller
*
@@ -95,14 +95,13 @@ sshbuf_dtob64(struct sshbuf *buf)
size_t len = sshbuf_len(buf), plen;
const u_char *p = sshbuf_ptr(buf);
char *ret;
- int r;
if (len == 0)
return strdup("");
plen = ((len + 2) / 3) * 4 + 1;
if (SIZE_MAX / 2 <= len || (ret = malloc(plen)) == NULL)
return NULL;
- if ((r = b64_ntop(p, len, ret, plen)) == -1) {
+ if (b64_ntop(p, len, ret, plen) == -1) {
explicit_bzero(ret, plen);
free(ret);
return NULL;