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: report: reuse existing _uuid_disp fn to report pv_uuid field

Browse Source
This commit is contained in:
Peter Rajnoha 2015-09-21 11:34:03 +02:00
parent 83a52c07b7
commit f644431346
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/report/report.c
View File

@ -1271,6 +1271,18 @@ static int _chars_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((
return dm_report_field_string(rh, field, (const char * const *) &data); return dm_report_field_string(rh, field, (const char * const *) &data);
} }
static int _uuid_disp(struct dm_report *rh __attribute__((unused)), struct dm_pool *mem,
struct dm_report_field *field,
const void *data, void *private __attribute__((unused)))
{
char *repstr;
if (!(repstr = id_format_and_copy(mem, data)))
return_0;
return _field_set_value(field, repstr, NULL);
}
static int _dev_name_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)), static int _dev_name_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)),
struct dm_report_field *field, struct dm_report_field *field,
const void *data, void *private __attribute__((unused))) const void *data, void *private __attribute__((unused)))
@ -2187,30 +2199,16 @@ static int _vglockargs_disp(struct dm_report *rh, struct dm_pool *mem,
return _string_disp(rh, mem, field, &repstr, private); return _string_disp(rh, mem, field, &repstr, private);
} }
static int _uuid_disp(struct dm_report *rh __attribute__((unused)), struct dm_pool *mem,
struct dm_report_field *field,
const void *data, void *private __attribute__((unused)))
{
char *repstr;
if (!(repstr = id_format_and_copy(mem, data)))
return_0;
return _field_set_value(field, repstr, NULL);
}
static int _pvuuid_disp(struct dm_report *rh __attribute__((unused)), struct dm_pool *mem, static int _pvuuid_disp(struct dm_report *rh __attribute__((unused)), struct dm_pool *mem,
struct dm_report_field *field, struct dm_report_field *field,
const void *data, void *private __attribute__((unused))) const void *data, void *private __attribute__((unused)))
{ {
const struct label *label = (const struct label *) data; const struct label *label = (const struct label *) data;
const char *repstr = "";
if (label->dev && if (!label->dev)
!(repstr = id_format_and_copy(mem, (const struct id *) label->dev->pvid))) return _field_set_value(field, "", NULL);
return_0;
return _field_set_value(field, repstr, NULL); return _uuid_disp(rh, mem, field, label->dev->pvid, private);
} }
static int _pvmdas_disp(struct dm_report *rh, struct dm_pool *mem, static int _pvmdas_disp(struct dm_report *rh, struct dm_pool *mem,