From: Jan Kiszka <[email protected]> No functional changes, just cleanups.
Signed-off-by: Jan Kiszka <[email protected]> --- Makefile.am | 1 + tools/bg_utils.c | 12 ++++++------ tools/ebgpart.c | 31 ++++++++++++++++--------------- tools/ebgpart.h | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7745bb1..6038f30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) -include config.h AM_CFLAGS = \ -Wno-unused-parameter \ + -Wmissing-prototypes \ -fshort-wchar \ -DHAVE_ENDIAN_H \ -D_GNU_SOURCE diff --git a/tools/bg_utils.c b/tools/bg_utils.c index 026abb9..1a5dd76 100644 --- a/tools/bg_utils.c +++ b/tools/bg_utils.c @@ -89,7 +89,7 @@ static char *get_mountpoint(char *devpath) return NULL; } -bool mount_partition(CONFIG_PART *cfgpart) +static bool mount_partition(CONFIG_PART *cfgpart) { char tmpdir_template[256]; char *mountpoint; @@ -121,7 +121,7 @@ bool mount_partition(CONFIG_PART *cfgpart) return true; } -void unmount_partition(CONFIG_PART *cfgpart) +static void unmount_partition(CONFIG_PART *cfgpart) { if (!cfgpart) { return; @@ -159,7 +159,7 @@ static FILE *open_config_file(CONFIG_PART *cfgpart, char *mode) return config; } -bool probe_config_file(CONFIG_PART *cfgpart) +static bool probe_config_file(CONFIG_PART *cfgpart) { bool do_unmount = false; if (!cfgpart) { @@ -206,7 +206,7 @@ bool probe_config_file(CONFIG_PART *cfgpart) return false; } -bool probe_config_partitions(CONFIG_PART *cfgpart) +static bool probe_config_partitions(CONFIG_PART *cfgpart) { PedDevice *dev = NULL; char devpath[4096]; @@ -273,7 +273,7 @@ bool probe_config_partitions(CONFIG_PART *cfgpart) return true; } -bool read_env(CONFIG_PART *part, BG_ENVDATA *env) +static bool read_env(CONFIG_PART *part, BG_ENVDATA *env) { if (!part) { return false; @@ -310,7 +310,7 @@ bool read_env(CONFIG_PART *part, BG_ENVDATA *env) return result; } -bool write_env(CONFIG_PART *part, BG_ENVDATA *env) +static bool write_env(CONFIG_PART *part, BG_ENVDATA *env) { if (!part) { return false; diff --git a/tools/ebgpart.c b/tools/ebgpart.c index 878cc5e..d0997bd 100644 --- a/tools/ebgpart.c +++ b/tools/ebgpart.c @@ -28,7 +28,7 @@ void ebgpart_beverbose(bool v) verbosity = v; } -void add_block_dev(PedDevice *dev) +static void add_block_dev(PedDevice *dev) { if (!first_device) { first_device = dev; @@ -41,7 +41,7 @@ void add_block_dev(PedDevice *dev) d->next = dev; } -char *GUID_to_str(uint8_t *g) +static char *GUID_to_str(uint8_t *g) { snprintf(buffer, 37, "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%" "02X%02X%02X%02X%02X", @@ -50,7 +50,7 @@ char *GUID_to_str(uint8_t *g) return buffer; } -char *type_to_name(char t) +static char *type_to_name(char t) { switch (t) { case MBR_TYPE_FAT12: @@ -69,8 +69,8 @@ char *type_to_name(char t) return "not supported"; } -bool check_GPT_FAT_entry(int fd, struct EFIpartitionentry *e, - PedFileSystemType *pfst, uint32_t i) +static bool check_GPT_FAT_entry(int fd, struct EFIpartitionentry *e, + PedFileSystemType *pfst, uint32_t i) { if (strcmp(GPT_PARTITION_GUID_FAT_NTFS, GUID_to_str(e->type_GUID)) != 0 && @@ -131,7 +131,8 @@ bool check_GPT_FAT_entry(int fd, struct EFIpartitionentry *e, return true; } -void read_GPT_entries(int fd, uint64_t table_LBA, uint32_t num, PedDevice *dev) +static void read_GPT_entries(int fd, uint64_t table_LBA, uint32_t num, + PedDevice *dev) { off64_t offset; struct EFIpartitionentry e; @@ -185,9 +186,9 @@ void read_GPT_entries(int fd, uint64_t table_LBA, uint32_t num, PedDevice *dev) } } -void scanLogicalVolumes(int fd, off64_t extended_start_LBA, - struct Masterbootrecord *ebr, int i, - PedPartition *partition, int lognum) +static void scanLogicalVolumes(int fd, off64_t extended_start_LBA, + struct Masterbootrecord *ebr, int i, + PedPartition *partition, int lognum) { struct Masterbootrecord next_ebr; PedFileSystemType *pfst; @@ -246,7 +247,7 @@ scl_out_of_mem: if (partition->next) free(partition->next); } -bool check_partition_table(PedDevice *dev) +static bool check_partition_table(PedDevice *dev) { int fd; struct Masterbootrecord mbr; @@ -346,8 +347,8 @@ bool check_partition_table(PedDevice *dev) return true; } -int scan_devdir(unsigned int fmajor, unsigned int fminor, char *fullname, - unsigned int maxlen) +static int scan_devdir(unsigned int fmajor, unsigned int fminor, char *fullname, + unsigned int maxlen) { int result = -1; @@ -398,7 +399,7 @@ static int get_major_minor(char *filename, unsigned int *major, unsigned int *mi return 0; } -void ped_device_probe_all() +void ped_device_probe_all(void) { struct dirent *sysblockfile; char fullname[DEV_FILENAME_LEN]; @@ -457,7 +458,7 @@ void ped_device_probe_all() closedir(sysblockdir); } -void ped_partition_destroy(PedPartition *p) +static void ped_partition_destroy(PedPartition *p) { if (!p) return; if (!p->fs_type) goto fs_type_Null; @@ -467,7 +468,7 @@ fs_type_Null: free(p); } -void ped_device_destroy(PedDevice *d) +static void ped_device_destroy(PedDevice *d) { if (!d) return; if (d->model) free(d->model); diff --git a/tools/ebgpart.h b/tools/ebgpart.h index 918602e..097bf8f 100644 --- a/tools/ebgpart.h +++ b/tools/ebgpart.h @@ -131,7 +131,7 @@ typedef struct _PedDisk { PedPartition *part_list; } PedDisk; -void ped_device_probe_all(); +void ped_device_probe_all(void); PedDevice *ped_device_get_next(const PedDevice *dev); PedDisk *ped_disk_new(const PedDevice *dev); PedPartition *ped_disk_next_partition(const PedDisk *pd, -- 2.12.3 -- You received this message because you are subscribed to the Google Groups "EFI Boot Guard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/efibootguard-dev/803b3ce1-439c-ede9-d663-42a4816db2fe%40siemens.com. For more options, visit https://groups.google.com/d/optout.
