diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2012-07-02 22:15:38 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2012-07-02 22:15:38 +1000 |
| commit | 4908d44e675a9a81e6d24d3a3ca90459a4fd24e3 (patch) | |
| tree | ddb3fc23dc210d3a70e96be547659d2d26c196f4 | |
| parent | 7b30501bf53c3d5df9691f8e52b1f76bb61f2a35 (diff) | |
| download | openssh-git-4908d44e675a9a81e6d24d3a3ca90459a4fd24e3.tar.gz | |
- 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-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sftp-client.c | 5 | ||||
| -rw-r--r-- | ssh-pkcs11-helper.c | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -13,6 +13,9 @@ - dtucker@cvs.openbsd.org 2012/07/02 08:50:03 [ssh.c] set interactive ToS for forwarded X11 sessions. ok djm@ + - 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@ 20120629 - OpenBSD CVS Sync diff --git a/sftp-client.c b/sftp-client.c index d7eff70b..85f2bd44 100644 --- a/sftp-client.c +++ b/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.96 2011/09/12 08:46:15 markus Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.97 2012/07/02 12:13:26 dtucker Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -757,7 +757,8 @@ do_realpath(struct sftp_conn *conn, char *path) longname = buffer_get_string(&msg, NULL); a = decode_attrib(&msg); - debug3("SSH_FXP_REALPATH %s -> %s", path, filename); + debug3("SSH_FXP_REALPATH %s -> %s size %lu", path, filename, + (unsigned long)a->size); xfree(longname); diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c index cd33515f..fcb5defc 100644 --- a/ssh-pkcs11-helper.c +++ b/ssh-pkcs11-helper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11-helper.c,v 1.3 2010/02/24 06:12:53 djm Exp $ */ +/* $OpenBSD: ssh-pkcs11-helper.c,v 1.4 2012/07/02 12:13:26 dtucker Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -168,13 +168,13 @@ process_sign(void) { u_char *blob, *data, *signature = NULL; u_int blen, dlen, slen = 0; - int ok = -1, flags, ret; + int ok = -1, ret; Key *key, *found; Buffer msg; blob = get_string(&blen); data = get_string(&dlen); - flags = get_int(); /* XXX ignore */ + (void)get_int(); /* XXX ignore flags */ if ((key = key_from_blob(blob, blen)) != NULL) { if ((found = lookup_key(key)) != NULL) { |