shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

dev-type: use text format as direct arg for printf

Browse Source 
Put common printf() case into a function and use
the string with text format as direct arg to make
the compile time validation of args easier and
code shorter.

Switch log_error() to log_warn(), since 'return 0'
doesn't cause any failure here.
This commit is contained in:
Zdenek Kabelac 2013-11-22 12:57:35 +01:00
parent 6fa95d17ee
commit d079c81ab4
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/device/dev-type.c
View File

@ -445,13 +445,25 @@ out:
#ifdef __linux__ #ifdef __linux__
static int _snprintf_attr(char *buf, size_t buf_size, const char *sysfs_dir,
const char *attribute, dev_t dev)
{
if (dm_snprintf(buf, buf_size, "%s/dev/block/%d:%d/%s", sysfs_dir,
(int)MAJOR(dev), (int)MINOR(dev),
attribute) < 0) {
log_warn("dm_snprintf %s failed.", attribute);
return 0;
}
return 1;
}
static unsigned long _dev_topology_attribute(struct dev_types *dt, static unsigned long _dev_topology_attribute(struct dev_types *dt,
const char *attribute, const char *attribute,
struct device *dev) struct device *dev)
{ {
const char *sysfs_dir = dm_sysfs_dir(); const char *sysfs_dir = dm_sysfs_dir();
static const char sysfs_fmt_str[] = "%s/dev/block/%d:%d/%s"; char path[PATH_MAX], buffer[64];
char path[PATH_MAX+1], buffer[64];
FILE *fp; FILE *fp;
struct stat info; struct stat info;
dev_t uninitialized_var(primary); dev_t uninitialized_var(primary);
@ -463,12 +475,8 @@ static unsigned long _dev_topology_attribute(struct dev_types *dt,
if (!sysfs_dir || !*sysfs_dir) if (!sysfs_dir || !*sysfs_dir)
return_0; return_0;
if (dm_snprintf(path, PATH_MAX, sysfs_fmt_str, sysfs_dir, if (!_snprintf_attr(path, sizeof(path), sysfs_dir, attribute, dev->dev))
(int)MAJOR(dev->dev), (int)MINOR(dev->dev), return_0;
attribute) < 0) {
log_error("dm_snprintf %s failed", attribute);
return 0;
}
/* /*
* check if the desired sysfs attribute exists * check if the desired sysfs attribute exists
@ -484,12 +492,9 @@ static unsigned long _dev_topology_attribute(struct dev_types *dt,
return 0; return 0;
/* get attribute from partition's primary device */ /* get attribute from partition's primary device */
if (dm_snprintf(path, PATH_MAX, sysfs_fmt_str, sysfs_dir, if (!_snprintf_attr(path, sizeof(path), sysfs_dir, attribute, primary))
(int)MAJOR(primary), (int)MINOR(primary), return_0;
attribute) < 0) {
log_error("primary dm_snprintf %s failed", attribute);
return 0;
}
if (stat(path, &info) == -1) { if (stat(path, &info) == -1) {
if (errno != ENOENT) if (errno != ENOENT)
log_sys_error("stat", path); log_sys_error("stat", path);