Apply clang-tidy formatting

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
fedora-modularity · Oct 17, 2019 · ebaf12b · ebaf12b
1 parent 9306b6d
commit ebaf12b
Show file tree

Hide file tree

Showing 56 changed files with 1,251 additions and 600 deletions.
diff --git a/modulemd/include/modulemd-2.0/modulemd-component-module.h b/modulemd/include/modulemd-2.0/modulemd-component-module.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-component.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/modulemd-2.0/modulemd-component-rpm.h b/modulemd/include/modulemd-2.0/modulemd-component-rpm.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-component.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/modulemd-2.0/modulemd-defaults-v1.h b/modulemd/include/modulemd-2.0/modulemd-defaults-v1.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-defaults.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/modulemd-2.0/modulemd-module-index-merger.h b/modulemd/include/modulemd-2.0/modulemd-module-index-merger.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-module-index.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/modulemd-2.0/modulemd-module-index.h b/modulemd/include/modulemd-2.0/modulemd-module-index.h
@@ -13,10 +13,10 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-module.h"
-#include "modulemd-translation.h"
 #include "modulemd-subdocument-info.h"
+#include "modulemd-translation.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/modulemd-2.0/modulemd-module-stream-v1.h b/modulemd/include/modulemd-2.0/modulemd-module-stream-v1.h
@@ -13,15 +13,15 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-buildopts.h"
-#include "modulemd-component.h"
 #include "modulemd-component-module.h"
 #include "modulemd-component-rpm.h"
+#include "modulemd-component.h"
 #include "modulemd-deprecated.h"
 #include "modulemd-module-stream.h"
 #include "modulemd-profile.h"
 #include "modulemd-service-level.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/modulemd-2.0/modulemd-module-stream-v2.h b/modulemd/include/modulemd-2.0/modulemd-module-stream-v2.h
@@ -13,16 +13,16 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-buildopts.h"
-#include "modulemd-component.h"
 #include "modulemd-component-module.h"
 #include "modulemd-component-rpm.h"
+#include "modulemd-component.h"
 #include "modulemd-dependencies.h"
 #include "modulemd-module-stream.h"
 #include "modulemd-profile.h"
 #include "modulemd-rpm-map-entry.h"
 #include "modulemd-service-level.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/modulemd-2.0/modulemd-module-stream.h b/modulemd/include/modulemd-2.0/modulemd-module-stream.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <glib.h>
 #include <glib-object.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 
 #include "modulemd-deprecated.h"

diff --git a/modulemd/include/modulemd-2.0/modulemd-module.h b/modulemd/include/modulemd-2.0/modulemd-module.h
@@ -13,11 +13,11 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-defaults.h"
 #include "modulemd-deprecated.h"
 #include "modulemd-module-stream.h"
 #include "modulemd-translation.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
@@ -131,7 +131,7 @@ MMD_DEPRECATED_FOR (modulemd_module_get_stream_by_NSVCA)
 ModulemdModuleStream *
 modulemd_module_get_stream_by_NSVC (ModulemdModule *self,
                                     const gchar *stream_name,
-                                    const guint64 version,
+                                    guint64 version,
                                     const gchar *context);
 
 
@@ -158,7 +158,7 @@ modulemd_module_get_stream_by_NSVC (ModulemdModule *self,
 GPtrArray *
 modulemd_module_search_streams (ModulemdModule *self,
                                 const gchar *stream_name,
-                                const guint64 version,
+                                guint64 version,
                                 const gchar *context,
                                 const gchar *arch);
 
@@ -185,7 +185,7 @@ modulemd_module_search_streams (ModulemdModule *self,
 ModulemdModuleStream *
 modulemd_module_get_stream_by_NSVCA (ModulemdModule *self,
                                      const gchar *stream_name,
-                                     const guint64 version,
+                                     guint64 version,
                                      const gchar *context,
                                      const gchar *arch,
                                      GError **error);
@@ -210,7 +210,7 @@ modulemd_module_get_stream_by_NSVCA (ModulemdModule *self,
 void
 modulemd_module_remove_streams_by_NSVCA (ModulemdModule *self,
                                          const gchar *stream_name,
-                                         const guint64 version,
+                                         guint64 version,
                                          const gchar *context,
                                          const gchar *arch);
 

diff --git a/modulemd/include/modulemd-2.0/modulemd-translation.h b/modulemd/include/modulemd-2.0/modulemd-translation.h
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-translation-entry.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/modulemd-2.0/modulemd.h b/modulemd/include/modulemd-2.0/modulemd.h
@@ -14,27 +14,27 @@
 #pragma once
 
 #include "modulemd-buildopts.h"
-#include "modulemd-component.h"
 #include "modulemd-component-module.h"
 #include "modulemd-component-rpm.h"
+#include "modulemd-component.h"
 #include "modulemd-compression.h"
-#include "modulemd-defaults.h"
 #include "modulemd-defaults-v1.h"
+#include "modulemd-defaults.h"
 #include "modulemd-dependencies.h"
 #include "modulemd-deprecated.h"
 #include "modulemd-errors.h"
-#include "modulemd-module.h"
-#include "modulemd-module-index.h"
 #include "modulemd-module-index-merger.h"
-#include "modulemd-module-stream.h"
+#include "modulemd-module-index.h"
 #include "modulemd-module-stream-v1.h"
 #include "modulemd-module-stream-v2.h"
+#include "modulemd-module-stream.h"
+#include "modulemd-module.h"
 #include "modulemd-profile.h"
 #include "modulemd-rpm-map-entry.h"
 #include "modulemd-service-level.h"
 #include "modulemd-subdocument-info.h"
-#include "modulemd-translation.h"
 #include "modulemd-translation-entry.h"
+#include "modulemd-translation.h"
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/private/modulemd-defaults-v1-private.h b/modulemd/include/private/modulemd-defaults-v1-private.h
@@ -13,10 +13,10 @@
 
 #pragma once
 
-#include <glib-object.h>
-#include <yaml.h>
 #include "modulemd-defaults-v1.h"
 #include "modulemd-subdocument-info.h"
+#include <glib-object.h>
+#include <yaml.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/private/modulemd-module-index-private.h b/modulemd/include/private/modulemd-module-index-private.h
@@ -13,9 +13,9 @@
 
 #pragma once
 
+#include "modulemd-module-index.h"
 #include <glib-object.h>
 #include <yaml.h>
-#include "modulemd-module-index.h"
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/private/modulemd-module-stream-private.h b/modulemd/include/private/modulemd-module-stream-private.h
@@ -13,13 +13,13 @@
 
 #pragma once
 
-#include <glib-object.h>
 #include "modulemd-module-stream.h"
-#include "modulemd-translation.h"
 #include "modulemd-translation-entry.h"
-#include "private/modulemd-yaml.h"
+#include "modulemd-translation.h"
 #include "private/modulemd-module-stream-v1-private.h"
 #include "private/modulemd-module-stream-v2-private.h"
+#include "private/modulemd-yaml.h"
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/modulemd/include/private/modulemd-module-stream-v1-private.h b/modulemd/include/private/modulemd-module-stream-v1-private.h
@@ -13,10 +13,10 @@
 
 #pragma once
 
-#include <glib-object.h>
-#include <yaml.h>
 #include "modulemd-module-stream-v1.h"
 #include "modulemd-subdocument-info.h"
+#include <glib-object.h>
+#include <yaml.h>
 
 
 G_BEGIN_DECLS

diff --git a/modulemd/include/private/modulemd-module-stream-v2-private.h b/modulemd/include/private/modulemd-module-stream-v2-private.h
@@ -13,10 +13,10 @@
 
 #pragma once
 
-#include <glib-object.h>
-#include <yaml.h>
 #include "modulemd-module-stream-v2.h"
 #include "modulemd-subdocument-info.h"
+#include <glib-object.h>
+#include <yaml.h>
 
 
 G_BEGIN_DECLS

diff --git a/modulemd/include/private/modulemd-yaml.h b/modulemd/include/private/modulemd-yaml.h
@@ -646,7 +646,7 @@ mmd_emitter_scalar (yaml_emitter_t *emitter,
 gboolean
 mmd_emitter_strv (yaml_emitter_t *emitter,
                   yaml_sequence_style_t seq_style,
-                  const GStrv list,
+                  GStrv list,
                   GError **error);
 
 

diff --git a/modulemd/modulemd-buildopts.c b/modulemd/modulemd-buildopts.c
@@ -50,20 +50,28 @@ modulemd_buildopts_equals (ModulemdBuildopts *self_1,
                            ModulemdBuildopts *self_2)
 {
   if (!self_1 && !self_2)
-    return TRUE;
+    {
+      return TRUE;
+    }
 
   if (!self_1 || !self_2)
-    return FALSE;
+    {
+      return FALSE;
+    }
 
   g_return_val_if_fail (MODULEMD_IS_BUILDOPTS (self_1), FALSE);
   g_return_val_if_fail (MODULEMD_IS_BUILDOPTS (self_2), FALSE);
 
   if (!modulemd_hash_table_sets_are_equal (self_1->whitelist,
                                            self_2->whitelist))
-    return FALSE;
+    {
+      return FALSE;
+    }
 
   if (g_strcmp0 (self_1->rpm_macros, self_2->rpm_macros) != 0)
-    return FALSE;
+    {
+      return FALSE;
+    }
 
   return TRUE;
 }
@@ -266,8 +274,10 @@ modulemd_buildopts_parse_yaml (yaml_parser_t *parser,
 
         case YAML_SCALAR_EVENT:
           if (!in_map)
-            MMD_YAML_ERROR_EVENT_EXIT_BOOL (
-              error, event, "Missing mapping in buildopts");
+            {
+              MMD_YAML_ERROR_EVENT_EXIT_BOOL (
+                error, event, "Missing mapping in buildopts");
+            }
 
           if (g_str_equal ((const gchar *)event.data.scalar.value, "rpms"))
             {
@@ -330,8 +340,10 @@ modulemd_buildopts_parse_rpm_buildopts (yaml_parser_t *parser,
 
         case YAML_SCALAR_EVENT:
           if (!in_map)
-            MMD_YAML_ERROR_EVENT_EXIT_BOOL (
-              error, event, "Missing mapping in buildopts rpms entry");
+            {
+              MMD_YAML_ERROR_EVENT_EXIT_BOOL (
+                error, event, "Missing mapping in buildopts rpms entry");
+            }
 
           if (g_str_equal (event.data.scalar.value, "whitelist"))
             {
@@ -351,11 +363,13 @@ modulemd_buildopts_parse_rpm_buildopts (yaml_parser_t *parser,
             {
               value = modulemd_yaml_parse_string (parser, &nested_error);
               if (!value)
-                MMD_YAML_ERROR_EVENT_EXIT_BOOL (
-                  error,
-                  event,
-                  "Failed to parse rpm_macros in buildopts: %s",
-                  nested_error->message);
+                {
+                  MMD_YAML_ERROR_EVENT_EXIT_BOOL (
+                    error,
+                    event,
+                    "Failed to parse rpm_macros in buildopts: %s",
+                    nested_error->message);
+                }
               modulemd_buildopts_set_rpm_macros (buildopts, value);
               g_clear_pointer (&value, g_free);
             }