X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=apps%2Ferrstr.c;h=9e97698be347dbc3a9f32da64674d3b40fd2459f;hb=576bcdb5bdc1311064a108098eedc4a0723615ba;hp=5fda799d1486b76b76a69f439f39fe271f4618a9;hpb=412c8507ee61aeb1fcac4b6e84cd7e6501789124;p=openssl.git

diff --git a/apps/errstr.c b/apps/errstr.c
index 5fda799d14..9e97698be3 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -11,8 +11,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
+#include "progs.h"
 #include <openssl/bio.h>
-#include <openssl/lhash.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
@@ -20,10 +20,14 @@ typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP
 } OPTION_CHOICE;
 
-OPTIONS errstr_options[] = {
+const OPTIONS errstr_options[] = {
     {OPT_HELP_STR, 1, '-', "Usage: %s [options] errnum...\n"},
-    {OPT_HELP_STR, 1, '-', "  errnum  Error number\n"},
+
+    OPT_SECTION("General"),
     {"help", OPT_HELP, '-', "Display this summary"},
+
+    OPT_PARAMETERS(),
+    {"errnum", 0, 0, "Error number(s) to decode"},
     {NULL}
 };
 
@@ -50,18 +54,18 @@ int errstr_main(int argc, char **argv)
 
     ret = 0;
     for (argv = opt_rest(); *argv; argv++) {
-        if (sscanf(*argv, "%lx", &l) == 0)
+        if (sscanf(*argv, "%lx", &l) == 0) {
             ret++;
-        else {
+        } else {
             /* We're not really an SSL application so this won't auto-init, but
              * we're still interested in SSL error strings
              */
             OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS
                              | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-            ERR_error_string_n(l, buf, sizeof buf);
+            ERR_error_string_n(l, buf, sizeof(buf));
             BIO_printf(bio_out, "%s\n", buf);
         }
     }
  end:
-    return (ret);
+    return ret;
 }