Update formatting for rra-c-util 10.0

rra-c-util 10.0 will use slightly different clang-format options
to align with INN.  Adopt those for pam-krb5.

diff --git a/.clang-format b/.clang-format
index 993594ce794e36ddfabd2a77c1f944d7fa902633..da1e4e8030d3664e456d4cd40f00ac8f0b3d0fc7 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,7 @@
 # The canonical version of this file is maintained in the rra-c-util package,
 # which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 #
-# Copyright 2020 Russ Allbery <eagle@eyrie.org>
+# Copyright 2020-2021 Russ Allbery <eagle@eyrie.org>
 #
 # Copying and distribution of this file, with or without modification, are
 # permitted in any medium without royalty provided the copyright notice
@@ -17,6 +17,7 @@ Language: Cpp
 BasedOnStyle: LLVM
 AlignConsecutiveMacros: true
 AlignEscapedNewlines: Left
+AllowShortEnumsOnASingleLine: false
 AlwaysBreakAfterReturnType: AllDefinitions
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: WebKit

diff --git a/pam-util/options.h b/pam-util/options.h
index 404df3c43f3bf9fcceacb957d9f8a503f69ee538..062d095e8e7e799358d6e0838f34a918e3063aca 100644 (file)
--- a/pam-util/options.h
+++ b/pam-util/options.h
@@ -57,7 +57,8 @@ struct vector;
  * on comma, space, and tab.  (This is the same as would be done with the
  * value of a PAM setting when the target variable type is a list.)
  */
-enum type {
+enum type
+{
     TYPE_BOOLEAN,
     TYPE_NUMBER,
     TYPE_TIME,

diff --git a/tests/fakepam/internal.h b/tests/fakepam/internal.h
index 2f62a461a75f20e12c712e157d8cd79d6625fb58..3c6fedacd45e3764b0193c85a007898233f7cf21 100644 (file)
--- a/tests/fakepam/internal.h
+++ b/tests/fakepam/internal.h
@@ -44,7 +44,8 @@ struct script_config;
 typedef int (*pam_call)(pam_handle_t *, int, int, const char **);
 
 /* The possible PAM groups as element numbers in an array of options. */
-enum group_type {
+enum group_type
+{
     GROUP_ACCOUNT = 0,
     GROUP_AUTH = 1,
     GROUP_PASSWORD = 2,

diff --git a/tests/runtests.c b/tests/runtests.c
index 1050120c7f084405b20ad02d584f1b1440a2ffcd..54ec1c93d08ba022e8eb773b980da220a1f16cf4 100644 (file)
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -156,13 +156,24 @@
 #endif
 
 /* Test status codes. */
-enum test_status { TEST_FAIL, TEST_PASS, TEST_SKIP, TEST_INVALID };
+enum test_status
+{
+    TEST_FAIL,
+    TEST_PASS,
+    TEST_SKIP,
+    TEST_INVALID
+};
 
 /* Really, just a boolean, but this is more self-documenting. */
-enum test_verbose { CONCISE = 0, VERBOSE = 1 };
+enum test_verbose
+{
+    CONCISE = 0,
+    VERBOSE = 1
+};
 
 /* Indicates the state of our plan. */
-enum plan_status {
+enum plan_status
+{
     PLAN_INIT,    /* Nothing seen yet. */
     PLAN_FIRST,   /* Plan seen before any tests. */
     PLAN_PENDING, /* Test seen and no plan yet. */

diff --git a/tests/tap/kerberos.h b/tests/tap/kerberos.h
index 066490509df2c9db0bfbd36ce6852cb13dab1f26..53dd09619c960b7bb3133c86431796e8888a2f4b 100644 (file)
--- a/tests/tap/kerberos.h
+++ b/tests/tap/kerberos.h
@@ -58,7 +58,8 @@ struct kerberos_config {
  * certain configuration information isn't available.  "_BOTH" means that the
  * tests require both keytab and password, but PKINIT is not required.
  */
-enum kerberos_needs {
+enum kerberos_needs
+{
     /* clang-format off */
     TAP_KRB_NEEDS_NONE     = 0x00,
     TAP_KRB_NEEDS_KEYTAB   = 0x01,