shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

cleanup: easier print of historical lv

Browse Source 
Drop unneeded macros.
This commit is contained in:
Zdenek Kabelac 2021-03-09 12:30:25 +01:00
parent 177b63becc
commit c05077f4d4
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/format_text/export.c
View File

@ -880,45 +880,50 @@ bad:
return 0; return 0;
} }
static int _print_historical_lv(struct formatter *f, struct historical_logical_volume *hlv) static int _print_historical_lv_with_descendants(struct formatter *f, struct historical_logical_volume *hlv,
char *descendants_buffer)
{ {
char buffer[40]; char buffer[40];
char *descendants_buffer = NULL;
int r = 0;
if (!id_write_format(&hlv->lvid.id[1], buffer, sizeof(buffer))) if (!id_write_format(&hlv->lvid.id[1], buffer, sizeof(buffer)))
goto_out; return_0;
if (!_alloc_printed_indirect_descendants(&hlv->indirect_glvs, &descendants_buffer)) outnl(f);
goto_out; outf(f, "%s {", hlv->name);
outnlgo(f);
outfgo(f, "%s {", hlv->name);
_inc_indent(f); _inc_indent(f);
outfgo(f, "id = \"%s\"", buffer); outf(f, "id = \"%s\"", buffer);
if (!_print_timestamp(f, "creation_time", hlv->timestamp, buffer, sizeof(buffer))) if (!_print_timestamp(f, "creation_time", hlv->timestamp, buffer, sizeof(buffer)))
goto_out; return_0;
if (!_print_timestamp(f, "removal_time", hlv->timestamp_removed, buffer, sizeof(buffer))) if (!_print_timestamp(f, "removal_time", hlv->timestamp_removed, buffer, sizeof(buffer)))
goto_out; return_0;
if (hlv->indirect_origin) { if (hlv->indirect_origin) {
if (hlv->indirect_origin->is_historical) if (hlv->indirect_origin->is_historical)
outfgo(f, "origin = \"%s%s\"", HISTORICAL_LV_PREFIX, hlv->indirect_origin->historical->name); outf(f, "origin = \"%s%s\"", HISTORICAL_LV_PREFIX, hlv->indirect_origin->historical->name);
else else
outfgo(f, "origin = \"%s\"", hlv->indirect_origin->live->name); outf(f, "origin = \"%s\"", hlv->indirect_origin->live->name);
} }
if (descendants_buffer) if (descendants_buffer)
outfgo(f, "descendants = %s", descendants_buffer); outf(f, "descendants = %s", descendants_buffer);
_dec_indent(f); _dec_indent(f);
outfgo(f, "}"); outf(f, "}");
return 1;
}
static int _print_historical_lv(struct formatter *f, struct historical_logical_volume *hlv)
{
char *descendants_buffer = NULL;
int r = 0;
if (_alloc_printed_indirect_descendants(&hlv->indirect_glvs, &descendants_buffer))
r = _print_historical_lv_with_descendants(f, hlv, descendants_buffer);
r = 1;
out:
free(descendants_buffer); free(descendants_buffer);
return r; return r;

2
lib/format_text/text_export.h
View File

@ -20,9 +20,7 @@
#define outhint(args...) do {if (!out_hint(args)) return_0;} while (0) #define outhint(args...) do {if (!out_hint(args)) return_0;} while (0)
#define outfc(args...) do {if (!out_text_with_comment(args)) return_0;} while (0) #define outfc(args...) do {if (!out_text_with_comment(args)) return_0;} while (0)
#define outf(args...) do {if (!out_text(args)) return_0;} while (0) #define outf(args...) do {if (!out_text(args)) return_0;} while (0)
#define outfgo(args...) do {if (!out_text(args)) goto_out;} while (0)
#define outnl(f) do {if (!out_newline(f)) return_0;} while (0) #define outnl(f) do {if (!out_newline(f)) return_0;} while (0)
#define outnlgo(f) do {if (!out_newline(f)) goto_out;} while (0)
struct formatter; struct formatter;
struct lv_segment; struct lv_segment;