- 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@

diff --git a/ChangeLog b/ChangeLog
index 4a0301cc550ca114c54bc7b66b1a7176903ccbe2..42b1888cbbb5f0b6c43c2b638a6e7cb022de2bfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 d7eff70b438c5237914b796006b18e514fd09acb..85f2bd444b33bd518205785693e8f3c5594da17e 100644 (file)
--- 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 cd33515f62f9d96fadfcf9040d971448fd680f30..fcb5defc08b60560cbc99c8be6fbeac0ddc68282 100644 (file)
--- 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) {