Run clang-format.shusers/simark/clang-format

Change-Id: Ia948cc26d534b0dd02702244d52434b1a2093968

1 files changed, 26 insertions, 22 deletions

diff --git a/gdb/producer.c b/gdb/producer.c
index 655eb97..fd4a2a4 100644
--- a/gdb/producer.c
+++ b/gdb/producer.c
@@ -29,7 +29,7 @@ producer_is_gcc_ge_4 (const char *producer)
 {
   int major, minor;
 
-  if (! producer_is_gcc (producer, &major, &minor))
+  if (!producer_is_gcc (producer, &major, &minor))
     return -1;
   if (major < 4)
     return -1;
@@ -80,7 +80,7 @@ producer_is_icc_ge_19 (const char *producer)
 {
   int major, minor;
 
-  if (! producer_is_icc (producer, &major, &minor))
+  if (!producer_is_icc (producer, &major, &minor))
     return false;
 
   return major >= 19;
@@ -123,8 +123,9 @@ producer_is_icc (const char *producer, int *major, int *minor)
 bool
 producer_is_llvm (const char *producer)
 {
-  return ((producer != NULL) && (startswith (producer, "clang ")
-				 || startswith (producer, " F90 Flang ")));
+  return ((producer != NULL)
+	  && (startswith (producer, "clang ")
+	      || startswith (producer, " F90 Flang ")));
 }
 
 /* See producer.h.  */
@@ -152,8 +153,10 @@ producer_is_clang (const char *producer, int *major, int *minor)
 }
 
 #if defined GDB_SELF_TEST
-namespace selftests {
-namespace producer {
+namespace selftests
+{
+namespace producer
+{
 
 static void
 producer_parsing_tests ()
@@ -175,8 +178,8 @@ Intel(R) 64, \
 Version 14.0.1.074 Build 20130716";
 
     int major = 0, minor = 0;
-    SELF_CHECK (producer_is_icc (extern_f_14_0, &major, &minor)
-		&& major == 14 && minor == 0);
+    SELF_CHECK (producer_is_icc (extern_f_14_0, &major, &minor) && major == 14
+		&& minor == 0);
     SELF_CHECK (!producer_is_gcc (extern_f_14_0, &major, &minor));
   }
 
@@ -187,8 +190,8 @@ Intel(R) 64, \
 Version 14.0";
 
     int major = 0, minor = 0;
-    SELF_CHECK (producer_is_icc (intern_f_14, &major, &minor)
-		&& major == 14 && minor == 0);
+    SELF_CHECK (producer_is_icc (intern_f_14, &major, &minor) && major == 14
+		&& minor == 0);
     SELF_CHECK (!producer_is_gcc (intern_f_14, &major, &minor));
   }
 
@@ -198,8 +201,8 @@ Intel(R) C++ Intel(R) 64 Compiler XE for applications running on \
 Intel(R) 64, \
 Version 14.0";
     int major = 0, minor = 0;
-    SELF_CHECK (producer_is_icc (intern_c_14, &major, &minor)
-		&& major == 14 && minor == 0);
+    SELF_CHECK (producer_is_icc (intern_c_14, &major, &minor) && major == 14
+		&& minor == 0);
     SELF_CHECK (!producer_is_gcc (intern_c_14, &major, &minor));
   }
 
@@ -209,8 +212,8 @@ Intel(R) C++ Intel(R) 64 Compiler for applications running on \
 Intel(R) 64, \
 Version 18.0 Beta";
     int major = 0, minor = 0;
-    SELF_CHECK (producer_is_icc (intern_c_18, &major, &minor)
-		&& major == 18 && minor == 0);
+    SELF_CHECK (producer_is_icc (intern_c_18, &major, &minor) && major == 18
+		&& minor == 0);
   }
 
   {
@@ -218,16 +221,16 @@ Version 18.0 Beta";
     SELF_CHECK (!producer_is_icc (gnu, NULL, NULL));
 
     int major = 0, minor = 0;
-    SELF_CHECK (producer_is_gcc (gnu, &major, &minor)
-		&& major == 4 && minor == 7);
+    SELF_CHECK (producer_is_gcc (gnu, &major, &minor) && major == 4
+		&& minor == 7);
   }
 
   {
     static const char gnu_exp[] = "GNU C++14 5.0.0 20150123 (experimental)";
     int major = 0, minor = 0;
     SELF_CHECK (!producer_is_icc (gnu_exp, NULL, NULL));
-    SELF_CHECK (producer_is_gcc (gnu_exp, &major, &minor)
-		&& major == 5 && minor == 0);
+    SELF_CHECK (producer_is_gcc (gnu_exp, &major, &minor) && major == 5
+		&& minor == 0);
   }
 
   {
@@ -246,16 +249,17 @@ Version 18.0 Beta";
     SELF_CHECK (producer_is_llvm (flang_llvm_exp));
   }
 }
-}
-}
+} // namespace producer
+} // namespace selftests
 #endif
 
 void _initialize_producer ();
+
 void
 _initialize_producer ()
 {
 #if defined GDB_SELF_TEST
-  selftests::register_test
-    ("producer-parser", selftests::producer::producer_parsing_tests);
+  selftests::register_test ("producer-parser",
+			    selftests::producer::producer_parsing_tests);
 #endif
 }