summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-07-02 22:15:38 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-07-02 22:15:38 +1000
commit4908d44e675a9a81e6d24d3a3ca90459a4fd24e3 (patch)
treeddb3fc23dc210d3a70e96be547659d2d26c196f4
parent7b30501bf53c3d5df9691f8e52b1f76bb61f2a35 (diff)
- dtucker@cvs.openbsd.org 2012/07/02 12:13:26
[ssh-pkcs11-helper.c sftp-client.c] fix a couple of "assigned but not used" warnings. ok markus@
-rw-r--r--ChangeLog3
-rw-r--r--sftp-client.c5
-rw-r--r--ssh-pkcs11-helper.c6
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a0301cc5..42b1888cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 - dtucker@cvs.openbsd.org 2012/07/02 08:50:03 13 - dtucker@cvs.openbsd.org 2012/07/02 08:50:03
14 [ssh.c] 14 [ssh.c]
15 set interactive ToS for forwarded X11 sessions. ok djm@ 15 set interactive ToS for forwarded X11 sessions. ok djm@
16 - dtucker@cvs.openbsd.org 2012/07/02 12:13:26
17 [ssh-pkcs11-helper.c sftp-client.c]
18 fix a couple of "assigned but not used" warnings. ok markus@
16 19
1720120629 2020120629
18 - OpenBSD CVS Sync 21 - OpenBSD CVS Sync
diff --git a/sftp-client.c b/sftp-client.c
index d7eff70b4..85f2bd444 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.96 2011/09/12 08:46:15 markus Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.97 2012/07/02 12:13:26 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -757,7 +757,8 @@ do_realpath(struct sftp_conn *conn, char *path)
757 longname = buffer_get_string(&msg, NULL); 757 longname = buffer_get_string(&msg, NULL);
758 a = decode_attrib(&msg); 758 a = decode_attrib(&msg);
759 759
760 debug3("SSH_FXP_REALPATH %s -> %s", path, filename); 760 debug3("SSH_FXP_REALPATH %s -> %s size %lu", path, filename,
761 (unsigned long)a->size);
761 762
762 xfree(longname); 763 xfree(longname);
763 764
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index cd33515f6..fcb5defc0 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-pkcs11-helper.c,v 1.3 2010/02/24 06:12:53 djm Exp $ */ 1/* $OpenBSD: ssh-pkcs11-helper.c,v 1.4 2012/07/02 12:13:26 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2010 Markus Friedl. All rights reserved. 3 * Copyright (c) 2010 Markus Friedl. All rights reserved.
4 * 4 *
@@ -168,13 +168,13 @@ process_sign(void)
168{ 168{
169 u_char *blob, *data, *signature = NULL; 169 u_char *blob, *data, *signature = NULL;
170 u_int blen, dlen, slen = 0; 170 u_int blen, dlen, slen = 0;
171 int ok = -1, flags, ret; 171 int ok = -1, ret;
172 Key *key, *found; 172 Key *key, *found;
173 Buffer msg; 173 Buffer msg;
174 174
175 blob = get_string(&blen); 175 blob = get_string(&blen);
176 data = get_string(&dlen); 176 data = get_string(&dlen);
177 flags = get_int(); /* XXX ignore */ 177 (void)get_int(); /* XXX ignore flags */
178 178
179 if ((key = key_from_blob(blob, blen)) != NULL) { 179 if ((key = key_from_blob(blob, blen)) != NULL) {
180 if ((found = lookup_key(key)) != NULL) { 180 if ((found = lookup_key(key)) != NULL) {