From b90e9912f1c4794c606eda794440c5b64cfc189b Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 1 Sep 2011 10:25:22 +0000 Subject: [PATCH] Use size_t return type Since these function returns buffer size - use size_t type for them. --- WHATS_NEW | 1 + lib/cache/lvmcache.c | 4 ++-- lib/format_text/export.c | 6 +++--- lib/format_text/import-export.h | 2 +- lib/metadata/metadata.h | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 64e7695b3..c45c4e348 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.89 - ================================== + Use size_t return type for text_vg_export_raw() and export_vg_to_buffer(). Add configure --enable-lvmetad for building the (experimental) LVMetaD. Fix resource leak when strdup fails in _get_device_status() (2.02.85). Directly allocate buffer memory in a pvck scan instead of using a mempool. diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index cde807f34..6fdd976ad 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -102,7 +102,7 @@ static void _store_metadata(struct volume_group *vg, unsigned precommitted) char uuid[64] __attribute__((aligned(8))); struct lvmcache_vginfo *vginfo; char *data; - int size; + size_t size; if (!(vginfo = vginfo_from_vgid((const char *)&vg->id))) { stack; @@ -132,7 +132,7 @@ static void _store_metadata(struct volume_group *vg, unsigned precommitted) return; } - log_debug("Metadata cache: VG %s (%s) stored (%d bytes%s).", + log_debug("Metadata cache: VG %s (%s) stored (%" PRIsize_t " bytes%s).", vginfo->vgname, uuid, size, precommitted ? ", precommitted" : ""); } diff --git a/lib/format_text/export.c b/lib/format_text/export.c index 2bead7fd5..d0bf48770 100644 --- a/lib/format_text/export.c +++ b/lib/format_text/export.c @@ -775,10 +775,10 @@ int text_vg_export_file(struct volume_group *vg, const char *desc, FILE *fp) } /* Returns amount of buffer used incl. terminating NUL */ -int text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf) +size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf) { struct formatter *f; - int r = 0; + size_t r = 0; _init(); @@ -809,7 +809,7 @@ int text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf) return r; } -int export_vg_to_buffer(struct volume_group *vg, char **buf) +size_t export_vg_to_buffer(struct volume_group *vg, char **buf) { return text_vg_export_raw(vg, "", buf); } diff --git a/lib/format_text/import-export.h b/lib/format_text/import-export.h index 4ecbf9b65..235c38742 100644 --- a/lib/format_text/import-export.h +++ b/lib/format_text/import-export.h @@ -65,7 +65,7 @@ char *alloc_printed_tags(struct dm_list *tags); int read_tags(struct dm_pool *mem, struct dm_list *tags, const struct dm_config_value *cv); int text_vg_export_file(struct volume_group *vg, const char *desc, FILE *fp); -int text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf); +size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf); struct volume_group *text_vg_import_file(struct format_instance *fid, const char *file, time_t *when, char **desc); diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index 97bb22452..ec7767524 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -454,7 +454,7 @@ void lv_calculate_readahead(const struct logical_volume *lv, uint32_t *read_ahea /* * For internal metadata caching. */ -int export_vg_to_buffer(struct volume_group *vg, char **buf); +size_t export_vg_to_buffer(struct volume_group *vg, char **buf); int export_vg_to_config_tree(struct volume_group *vg, struct dm_config_tree **cft); struct volume_group *import_vg_from_buffer(const char *buf, struct format_instance *fid); -- 2.43.5