]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
libkmod: move load_reg() further up
authorEmil Velikov <emil.l.velikov@gmail.com>
Mon, 12 Feb 2024 17:23:12 +0000 (17:23 +0000)
committerLucas De Marchi <lucas.de.marchi@gmail.com>
Tue, 30 Apr 2024 20:34:28 +0000 (15:34 -0500)
We're about to reference it in comp_types with next commit.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
libkmod/libkmod-file.c

index 20f9d62680999fcbbc0f541c96853e0f05e5f7b1..5b8b1eb6b6a995605d716bbbee348c5e41f6e800 100644 (file)
@@ -358,18 +358,6 @@ static int load_zlib(struct kmod_file *file)
 
 static const char magic_zlib[] = {0x1f, 0x8b};
 
-static const struct comp_type {
-       size_t magic_size;
-       enum kmod_file_compression_type compression;
-       const char *magic_bytes;
-       int (*load)(struct kmod_file *file);
-} comp_types[] = {
-       {sizeof(magic_zstd),    KMOD_FILE_COMPRESSION_ZSTD, magic_zstd, load_zstd},
-       {sizeof(magic_xz),      KMOD_FILE_COMPRESSION_XZ, magic_xz, load_xz},
-       {sizeof(magic_zlib),    KMOD_FILE_COMPRESSION_ZLIB, magic_zlib, load_zlib},
-       {0,                     KMOD_FILE_COMPRESSION_NONE, NULL, NULL}
-};
-
 static int load_reg(struct kmod_file *file)
 {
        struct stat st;
@@ -388,6 +376,18 @@ static int load_reg(struct kmod_file *file)
        return 0;
 }
 
+static const struct comp_type {
+       size_t magic_size;
+       enum kmod_file_compression_type compression;
+       const char *magic_bytes;
+       int (*load)(struct kmod_file *file);
+} comp_types[] = {
+       {sizeof(magic_zstd),    KMOD_FILE_COMPRESSION_ZSTD, magic_zstd, load_zstd},
+       {sizeof(magic_xz),      KMOD_FILE_COMPRESSION_XZ, magic_xz, load_xz},
+       {sizeof(magic_zlib),    KMOD_FILE_COMPRESSION_ZLIB, magic_zlib, load_zlib},
+       {0,                     KMOD_FILE_COMPRESSION_NONE, NULL, NULL}
+};
+
 struct kmod_elf *kmod_file_get_elf(struct kmod_file *file)
 {
        int err;