diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-21 16:44:50 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-21 16:44:52 +0900 |
commit | fe3198df666851a69a48da0e862920aff42f801a (patch) | |
tree | a75cd18ae7a442f6741c201457edcc13154fc28f /src | |
parent | fc56666cc2b9b14c32939398f34b0231f207cc4e (diff) | |
download | systemd-fe3198df666851a69a48da0e862920aff42f801a.tar.gz |
uki-util: rename KernelType -> KernelImageType
The name KernelType is slightly ambiguous. The type is about kernel
image. Let's rename the enum to clarify that.
Diffstat (limited to 'src')
-rw-r--r-- | src/boot/bootctl-uki.c | 8 | ||||
-rw-r--r-- | src/shared/uki-util.c | 20 | ||||
-rw-r--r-- | src/shared/uki-util.h | 18 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/boot/bootctl-uki.c b/src/boot/bootctl-uki.c index eda79218fc..0f17cb661d 100644 --- a/src/boot/bootctl-uki.c +++ b/src/boot/bootctl-uki.c @@ -5,27 +5,27 @@ #include "uki-util.h" int verb_kernel_identify(int argc, char *argv[], void *userdata) { - KernelType t; + KernelImageType t; int r; r = inspect_kernel(argv[1], &t, NULL, NULL, NULL); if (r < 0) return r; - puts(kernel_type_to_string(t)); + puts(kernel_image_type_to_string(t)); return 0; } int verb_kernel_inspect(int argc, char *argv[], void *userdata) { _cleanup_free_ char *cmdline = NULL, *uname = NULL, *pname = NULL; - KernelType t; + KernelImageType t; int r; r = inspect_kernel(argv[1], &t, &cmdline, &uname, &pname); if (r < 0) return r; - printf("Kernel Type: %s\n", kernel_type_to_string(t)); + printf("Kernel Type: %s\n", kernel_image_type_to_string(t)); if (cmdline) printf(" Cmdline: %s\n", cmdline); if (uname) diff --git a/src/shared/uki-util.c b/src/shared/uki-util.c index bd3b932f41..262e90e14f 100644 --- a/src/shared/uki-util.c +++ b/src/shared/uki-util.c @@ -19,13 +19,13 @@ static const uint8_t name_initrd[8] = ".initrd"; static const uint8_t name_cmdline[8] = ".cmdline"; static const uint8_t name_uname[8] = ".uname"; -static const char * const kernel_type_table[_KERNEL_TYPE_MAX] = { - [KERNEL_TYPE_UNKNOWN] = "unknown", - [KERNEL_TYPE_UKI] = "uki", - [KERNEL_TYPE_PE] = "pe", +static const char * const kernel_image_type_table[_KERNEL_IMAGE_TYPE_MAX] = { + [KERNEL_IMAGE_TYPE_UNKNOWN] = "unknown", + [KERNEL_IMAGE_TYPE_UKI] = "uki", + [KERNEL_IMAGE_TYPE_PE] = "pe", }; -DEFINE_STRING_TABLE_LOOKUP_TO_STRING(kernel_type, KernelType); +DEFINE_STRING_TABLE_LOOKUP_TO_STRING(kernel_image_type, KernelImageType); static int pe_sections(FILE *f, struct PeSectionHeader **ret, size_t *ret_n) { _cleanup_free_ struct PeSectionHeader *sections = NULL; @@ -256,7 +256,7 @@ static int inspect_uki( int inspect_kernel( const char *filename, - KernelType *ret_type, + KernelImageType *ret_type, char **ret_cmdline, char **ret_uname, char **ret_pretty_name) { @@ -264,7 +264,7 @@ int inspect_kernel( _cleanup_fclose_ FILE *f = NULL; _cleanup_free_ struct PeSectionHeader *sections = NULL; size_t scount; - KernelType t; + KernelImageType t; int r; assert(filename); @@ -278,14 +278,14 @@ int inspect_kernel( return r; if (!sections) - t = KERNEL_TYPE_UNKNOWN; + t = KERNEL_IMAGE_TYPE_UNKNOWN; else if (is_uki(sections, scount)) { - t = KERNEL_TYPE_UKI; + t = KERNEL_IMAGE_TYPE_UKI; r = inspect_uki(f, sections, scount, ret_cmdline, ret_uname, ret_pretty_name); if (r < 0) return r; } else - t = KERNEL_TYPE_PE; + t = KERNEL_IMAGE_TYPE_PE; if (ret_type) *ret_type = t; diff --git a/src/shared/uki-util.h b/src/shared/uki-util.h index e579f46259..d1875920cc 100644 --- a/src/shared/uki-util.h +++ b/src/shared/uki-util.h @@ -5,19 +5,19 @@ #include "macro.h" -typedef enum KernelType { - KERNEL_TYPE_UNKNOWN, - KERNEL_TYPE_UKI, - KERNEL_TYPE_PE, - _KERNEL_TYPE_MAX, - _KERNEL_TYPE_INVALID = -EINVAL, -} KernelType; +typedef enum KernelImageType { + KERNEL_IMAGE_TYPE_UNKNOWN, + KERNEL_IMAGE_TYPE_UKI, + KERNEL_IMAGE_TYPE_PE, + _KERNEL_IMAGE_TYPE_MAX, + _KERNEL_IMAGE_TYPE_INVALID = -EINVAL, +} KernelImageType; -const char* kernel_type_to_string(KernelType t) _const_; +const char* kernel_image_type_to_string(KernelImageType t) _const_; int inspect_kernel( const char *filename, - KernelType *ret_type, + KernelImageType *ret_type, char **ret_cmdline, char **ret_uname, char **ret_pretty_name); |