From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun, 8 Sep 2024 10:38:12 +0000 (+0100)
Subject: libkmod: reformat and clang-format off arrays
X-Git-Tag: v34~390
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c7b6d692ad6495a22a6b661e1f16e2184d46d14;p=thirdparty%2Fkmod.git

libkmod: reformat and clang-format off arrays

For some arrays, clang-format does far than ideal jobs reformatting. Do
so manually and ban clang-format from interfering.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/118
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c
index ff4f5259..f1779346 100644
--- a/libkmod/libkmod-file.c
+++ b/libkmod/libkmod-file.c
@@ -47,10 +47,12 @@ static const struct comp_type {
 	const char *magic_bytes;
 	int (*load)(struct kmod_file *file);
 } comp_types[] = {
-	{sizeof(magic_zstd),	KMOD_FILE_COMPRESSION_ZSTD, magic_zstd, kmod_file_load_zstd},
-	{sizeof(magic_xz),	KMOD_FILE_COMPRESSION_XZ, magic_xz, kmod_file_load_xz},
-	{sizeof(magic_zlib),	KMOD_FILE_COMPRESSION_ZLIB, magic_zlib, kmod_file_load_zlib},
-	{0,			KMOD_FILE_COMPRESSION_NONE, NULL, load_reg},
+	// clang-format off
+	{ sizeof(magic_zstd), KMOD_FILE_COMPRESSION_ZSTD, magic_zstd, kmod_file_load_zstd },
+	{ sizeof(magic_xz), KMOD_FILE_COMPRESSION_XZ, magic_xz, kmod_file_load_xz },
+	{ sizeof(magic_zlib), KMOD_FILE_COMPRESSION_ZLIB, magic_zlib, kmod_file_load_zlib },
+	{ 0, KMOD_FILE_COMPRESSION_NONE, NULL, load_reg },
+	// clang-format on
 };
 
 struct kmod_elf *kmod_file_get_elf(struct kmod_file *file)
diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
index 3a4bdf5c..c4af9789 100644
--- a/libkmod/libkmod-signature.c
+++ b/libkmod/libkmod-signature.c
@@ -47,15 +47,17 @@ enum pkey_hash_algo {
 };
 
 const char *const pkey_hash_algo[PKEY_HASH__LAST] = {
-	[PKEY_HASH_MD4]		= "md4",
-	[PKEY_HASH_MD5]		= "md5",
-	[PKEY_HASH_SHA1]	= "sha1",
-	[PKEY_HASH_RIPE_MD_160]	= "rmd160",
-	[PKEY_HASH_SHA256]	= "sha256",
-	[PKEY_HASH_SHA384]	= "sha384",
-	[PKEY_HASH_SHA512]	= "sha512",
-	[PKEY_HASH_SHA224]	= "sha224",
-	[PKEY_HASH_SM3]		= "sm3",
+	// clang-format off
+	[PKEY_HASH_MD4] = "md4",
+	[PKEY_HASH_MD5] = "md5",
+	[PKEY_HASH_SHA1] = "sha1",
+	[PKEY_HASH_RIPE_MD_160] = "rmd160",
+	[PKEY_HASH_SHA256] = "sha256",
+	[PKEY_HASH_SHA384] = "sha384",
+	[PKEY_HASH_SHA512] = "sha512",
+	[PKEY_HASH_SHA224] = "sha224",
+	[PKEY_HASH_SM3] = "sm3",
+	// clang-format on
 };
 
 enum pkey_id_type {
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 42aba715..8c71d8a4 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -32,20 +32,24 @@ static const struct {
 	const char *fn;
 	const char *prefix;
 } index_files[] = {
+	// clang-format off
 	[KMOD_INDEX_MODULES_DEP] = { .fn = "modules.dep", .prefix = "" },
 	[KMOD_INDEX_MODULES_ALIAS] = { .fn = "modules.alias", .prefix = "alias " },
-	[KMOD_INDEX_MODULES_SYMBOL] = { .fn = "modules.symbols", .prefix = "alias "},
+	[KMOD_INDEX_MODULES_SYMBOL] = { .fn = "modules.symbols", .prefix = "alias " },
 	[KMOD_INDEX_MODULES_BUILTIN_ALIAS] = { .fn = "modules.builtin.alias", .prefix = "" },
-	[KMOD_INDEX_MODULES_BUILTIN] = { .fn = "modules.builtin", .prefix = ""},
+	[KMOD_INDEX_MODULES_BUILTIN] = { .fn = "modules.builtin", .prefix = "" },
+	// clang-format on
 };
 
 static const char *const default_config_paths[] = {
+	// clang-format off
 	SYSCONFDIR "/modprobe.d",
 	"/run/modprobe.d",
 	"/usr/local/lib/modprobe.d",
 	DISTCONFDIR "/modprobe.d",
 	"/lib/modprobe.d",
 	NULL,
+	// clang-format on
 };
 
 struct kmod_ctx {