aboutsummaryrefslogtreecommitdiff
path: root/client/wallet-rekey.c
diff options
context:
space:
mode:
authorRuss Allbery <eagle@eyrie.org>2018-05-27 20:59:59 -0700
committerRuss Allbery <eagle@eyrie.org>2018-05-27 20:59:59 -0700
commitbdcb3741db27d6b773ce7cdf05aab063a70ea100 (patch)
tree11e11bb646e0b58db6e23b59e3c856ea59ef3545 /client/wallet-rekey.c
parent62a9101895a2d596bf91231f119d338d2025ff08 (diff)
Update to rra-c-util 7.2 and C TAP Harness 4.3
Update to rra-c-util 7.2: * Improve configure output for krb5-config testing. * Define UINT32_MAX for systems that don't have it. * Add SPDX-License-Identifier headers to all substantial source files. * Fix new warnings from GCC 7 and Clang warnings. * Require Test::Strict 0.25 or later to run those tests. * Fix off-by-one error in return-value checks for snprintf. * Use Autoconf to probe for supported warning flags. * Fix running module-version-t -u with current versions of Perl. * Use C_TAP_SOURCE and C_TAP_BUILD instead of SOURCE and BUILD. Update to C TAP Harness 4.3: * Add support for valgrind and libtool in test lists. * Report test failures as left and right, not wanted and expected. * Fix string comparisons with NULL pointers and the string "(null)". * Add SPDX-License-Identifier headers to all substantial source files. * Avoid zero-length realloc allocations in breallocarray. * Fix new warnings from GCC 7 and Clang warnings. * Use C_TAP_SOURCE and C_TAP_BUILD instead of SOURCE and BUILD.
Diffstat (limited to 'client/wallet-rekey.c')
-rw-r--r--client/wallet-rekey.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/client/wallet-rekey.c b/client/wallet-rekey.c
index 95cd328..2809efc 100644
--- a/client/wallet-rekey.c
+++ b/client/wallet-rekey.c
@@ -3,6 +3,7 @@
*
* Written by Russ Allbery <eagle@eyrie.org>
* and Jon Robertson <jonrober@stanford.edu>
+ * Copyright 2018 Russ Allbery <eagle@eyrie.org>
* Copyright 2010
* The Board of Trustees of the Leland Stanford Junior University
*
@@ -40,7 +41,7 @@ Options:\n\
/*
* Display the usage message for wallet-rekey.
*/
-static void
+static void __attribute__((__noreturn__))
usage(int status)
{
fprintf((status == 0) ? stdout : stderr, usage_message, WALLET_PORT,
@@ -83,13 +84,12 @@ main(int argc, char *argv[])
break;
case 'h':
usage(0);
- break;
case 'p':
errno = 0;
tmp = strtol(optarg, &end, 10);
if (tmp <= 0 || tmp > 65535 || *end != '\0')
die("invalid port number %s", optarg);
- options.port = tmp;
+ options.port = (unsigned short) tmp;
break;
case 's':
options.server = optarg;
@@ -100,10 +100,8 @@ main(int argc, char *argv[])
case 'v':
printf("%s\n", PACKAGE_STRING);
exit(0);
- break;
default:
usage(1);
- break;
}
}
argc -= optind;