diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2024-02-12 17:23:12 +0000 |
|---|---|---|
| committer | Lucas De Marchi <lucas.de.marchi@gmail.com> | 2024-04-30 15:34:28 -0500 |
| commit | 045fd571c4a7198aa15dec96c83713bb43df23c9 (patch) | |
| tree | bea8da5277a454aefc7098f16cc787b6c9cf9411 | |
| parent | 61bf8e74b9e0ad143f34d2e351cfe3491912da88 (diff) | |
| download | kmod-045fd571c4a7198aa15dec96c83713bb43df23c9.tar.gz | |
libkmod: move load_reg() further up
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>
| -rw-r--r-- | libkmod/libkmod-file.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c index 20f9d62..5b8b1eb 100644 --- a/libkmod/libkmod-file.c +++ b/libkmod/libkmod-file.c @@ -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; |