Small simplification in mkerr.pl

As suggested in https://github.com/openssl/openssl/pull/5275 Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5288)
2018-02-08 18:47:30 -05:00 · 2018-02-08 18:47:30 -05:00 · a699b8e4ca
parent 2e8b0ef8f4
commit a699b8e4ca
32 changed files with 51 additions and 143 deletions
--- a/crypto/ocsp/ocsp_err.c
+++ b/crypto/ocsp/ocsp_err.c
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -18,7 +18,8 @@ static const ERR_STRING_DATA OCSP_str_functs[] = {
    {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_ADD1_STATUS, 0),
     "OCSP_basic_add1_status"},
    {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_SIGN, 0), "OCSP_basic_sign"},
-    {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_SIGN_CTX, 0), "OCSP_basic_sign_ctx"},
+    {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_SIGN_CTX, 0),
+     "OCSP_basic_sign_ctx"},
    {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_BASIC_VERIFY, 0), "OCSP_basic_verify"},
    {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_CERT_ID_NEW, 0), "OCSP_cert_id_new"},
    {ERR_PACK(ERR_LIB_OCSP, OCSP_F_OCSP_CHECK_DELEGATED, 0),
--- a/include/internal/dsoerr.h
+++ b/include/internal/dsoerr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_DSO

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_DSO_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * DSO function codes.
--- a/include/openssl/asn1err.h
+++ b/include/openssl/asn1err.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_ASN1ERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_ASN1_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * ASN1 function codes.
--- a/include/openssl/asyncerr.h
+++ b/include/openssl/asyncerr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_ASYNCERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_ASYNC_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * ASYNC function codes.
--- a/include/openssl/bioerr.h
+++ b/include/openssl/bioerr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_BIOERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_BIO_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * BIO function codes.
--- a/include/openssl/bnerr.h
+++ b/include/openssl/bnerr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_BNERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_BN_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * BN function codes.
--- a/include/openssl/buffererr.h
+++ b/include/openssl/buffererr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_BUFERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_BUF_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * BUF function codes.
--- a/include/openssl/cmserr.h
+++ b/include/openssl/cmserr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_CMS

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_CMS_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * CMS function codes.
--- a/include/openssl/comperr.h
+++ b/include/openssl/comperr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_COMP

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_COMP_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * COMP function codes.
--- a/include/openssl/conferr.h
+++ b/include/openssl/conferr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_CONFERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_CONF_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * CONF function codes.
--- a/include/openssl/cryptoerr.h
+++ b/include/openssl/cryptoerr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_CRYPTOERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_CRYPTO_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * CRYPTO function codes.
--- a/include/openssl/cterr.h
+++ b/include/openssl/cterr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_CT

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_CT_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * CT function codes.
--- a/include/openssl/dherr.h
+++ b/include/openssl/dherr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_DH

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_DH_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * DH function codes.
--- a/include/openssl/dsaerr.h
+++ b/include/openssl/dsaerr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_DSA

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_DSA_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * DSA function codes.
--- a/include/openssl/ecerr.h
+++ b/include/openssl/ecerr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_EC

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_EC_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * EC function codes.
--- a/include/openssl/engineerr.h
+++ b/include/openssl/engineerr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_ENGINE

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_ENGINE_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * ENGINE function codes.
--- a/include/openssl/evperr.h
+++ b/include/openssl/evperr.h
@ -12,12 +12,9 @@
 # define HEADER_EVPERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_EVP_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * EVP function codes.
--- a/include/openssl/kdferr.h
+++ b/include/openssl/kdferr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_KDFERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_KDF_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * KDF function codes.
--- a/include/openssl/objectserr.h
+++ b/include/openssl/objectserr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_OBJERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_OBJ_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * OBJ function codes.
--- a/include/openssl/ocsperr.h
+++ b/include/openssl/ocsperr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_OCSP

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_OCSP_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * OCSP function codes.
--- a/include/openssl/pemerr.h
+++ b/include/openssl/pemerr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_PEMERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_PEM_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * PEM function codes.
--- a/include/openssl/pkcs12err.h
+++ b/include/openssl/pkcs12err.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_PKCS12ERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_PKCS12_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * PKCS12 function codes.
--- a/include/openssl/pkcs7err.h
+++ b/include/openssl/pkcs7err.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_PKCS7ERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_PKCS7_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * PKCS7 function codes.
--- a/include/openssl/randerr.h
+++ b/include/openssl/randerr.h
@ -12,12 +12,9 @@
 # define HEADER_RANDERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_RAND_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * RAND function codes.
--- a/include/openssl/rsaerr.h
+++ b/include/openssl/rsaerr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_RSAERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_RSA_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * RSA function codes.
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@ -12,12 +12,9 @@
 # define HEADER_SSLERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_SSL_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * SSL function codes.
--- a/include/openssl/storeerr.h
+++ b/include/openssl/storeerr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_OSSL_STOREERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_OSSL_STORE_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * OSSL_STORE function codes.
--- a/include/openssl/tserr.h
+++ b/include/openssl/tserr.h
@ -16,12 +16,9 @@
 # ifndef OPENSSL_NO_TS

 #  ifdef  __cplusplus
-extern "C" {
+extern "C"
 #  endif
 int ERR_load_TS_strings(void);
-#  ifdef  __cplusplus
-}
-#  endif

 /*
 * TS function codes.
--- a/include/openssl/uierr.h
+++ b/include/openssl/uierr.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_UIERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_UI_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * UI function codes.
--- a/include/openssl/x509err.h
+++ b/include/openssl/x509err.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_X509ERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_X509_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * X509 function codes.
--- a/include/openssl/x509v3err.h
+++ b/include/openssl/x509v3err.h
@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2017 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
 * this file except in compliance with the License.  You can obtain a copy
@ -12,12 +12,9 @@
 # define HEADER_X509V3ERR_H

 # ifdef  __cplusplus
-extern "C" {
+extern "C"
 # endif
 int ERR_load_X509V3_strings(void);
-# ifdef  __cplusplus
-}
-# endif

 /*
 * X509V3 function codes.
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@ -471,12 +471,9 @@ EOF
        }
        print OUT <<"EOF";
 #${indent}ifdef  __cplusplus
-extern \"C\" {
+extern \"C\"
 #${indent}endif
 int ERR_load_${lib}_strings(void);
-#${indent}ifdef  __cplusplus
-}
-#${indent}endif
 EOF
    } else {
        print OUT <<"EOF";