Add macros outsize() for out_size() and outhint() for out_hint() that check

for errors in a similar way as outf() for out_text().

diff --git a/WHATS_NEW b/WHATS_NEW
index f4fb979aeae1d2b08addaafb5320252e13ff793e..f264951c775cebd9739f1d6c434ac46d619680ab 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.57 -
 ====================================
+  Add macros outsize() and outhint().
   Use offsetof() macro for FIELD() macro in lib/report/report.c.
   Rename mirror_device_fault_policy to mirror_image_fault policy.
   Remove empty PV devices if lvconvert --repair is using defined policies.

diff --git a/lib/format_text/export.c b/lib/format_text/export.c
index 72d61585bfd3d53113352802a84291b87e4a15c8..f776957e1ca386e3f97602ad60e164193aae3eaf 100644 (file)
--- a/lib/format_text/export.c
+++ b/lib/format_text/export.c
@@ -386,9 +386,8 @@ static int _print_vg(struct formatter *f, struct volume_group *vg)
        if (vg->system_id && *vg->system_id)
                outf(f, "system_id = \"%s\"", vg->system_id);
 
-       if (!out_size(f, (uint64_t) vg->extent_size, "extent_size = %u",
-                     vg->extent_size))
-               return_0;
+       outsize(f, (uint64_t) vg->extent_size, "extent_size = %u",
+               vg->extent_size);
        outf(f, "max_lv = %u", vg->max_lv);
        outf(f, "max_pv = %u", vg->max_pv);
 
@@ -453,9 +452,8 @@ static int _print_pvs(struct formatter *f, struct volume_group *vg)
                        return 0;
                }
 
-               if (!out_hint(f, "device = \"%s\"",
-                             escape_double_quotes(buf, pv_dev_name(pv))))
-                       return_0;
+               outhint(f, "device = \"%s\"",
+                       escape_double_quotes(buf, pv_dev_name(pv)));
                outnl(f);
 
                if (!_print_flag_config(f, pv->status, PV_FLAGS))
@@ -467,13 +465,11 @@ static int _print_pvs(struct formatter *f, struct volume_group *vg)
                        outf(f, "tags = %s", buffer);
                }
 
-               if (!out_size(f, pv->size, "dev_size = %" PRIu64, pv->size))
-                       return_0;
+               outsize(f, pv->size, "dev_size = %" PRIu64, pv->size);
 
                outf(f, "pe_start = %" PRIu64, pv->pe_start);
-               if (!out_size(f, vg->extent_size * (uint64_t) pv->pe_count,
-                             "pe_count = %u", pv->pe_count))
-                       return_0;
+               outsize(f, vg->extent_size * (uint64_t) pv->pe_count,
+                       "pe_count = %u", pv->pe_count);
 
                _dec_indent(f);
                outf(f, "}");
@@ -493,9 +489,8 @@ static int _print_segment(struct formatter *f, struct volume_group *vg,
        _inc_indent(f);
 
        outf(f, "start_extent = %u", seg->le);
-       if (!out_size(f, (uint64_t) seg->len * vg->extent_size,
-                     "extent_count = %u", seg->len))
-               return_0;
+       outsize(f, (uint64_t) seg->len * vg->extent_size,
+               "extent_count = %u", seg->len);
 
        outnl(f);
        outf(f, "type = \"%s\"", seg->segtype->name);

diff --git a/lib/format_text/text_export.h b/lib/format_text/text_export.h
index cdba82f4204af47dc75010d57a25c35e937400be..f1b69e1b57b1d3311742b81aa7a3fcf0d64f5113 100644 (file)
--- a/lib/format_text/text_export.h
+++ b/lib/format_text/text_export.h
@@ -16,6 +16,8 @@
 #ifndef _LVM_TEXT_EXPORT_H
 #define _LVM_TEXT_EXPORT_H
 
+#define outsize(args...) do {if (!out_size(args)) return_0;} while (0)
+#define outhint(args...) do {if (!out_hint(args)) return_0;} while (0)
 #define outf(args...) do {if (!out_text(args)) return_0;} while (0)
 #define outnl(f) do {if (!out_newline(f)) return_0;} while (0)