ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/sysfs: cleanup function names 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-06-15 11:57:48 +02:00
parent 345ddd2828
commit ab628c7c18
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sysfs.h
View File

@ -94,6 +94,7 @@ int sysfs_devno_to_wholedisk(dev_t dev, char *diskname,
int sysfs_devno_is_dm_private(dev_t devno, char **uuid);
int sysfs_devno_is_wholedisk(dev_t devno);
dev_t sysfs_devname_to_devno(const char *name);
dev_t __sysfs_devname_to_devno(const char *prefix, const char *name, const char *parent);
char *sysfs_devno_to_devpath(dev_t devno, char *buf, size_t bufsiz);
char *sysfs_devno_to_devname(dev_t devno, char *buf, size_t bufsiz);
@ -101,8 +102,8 @@ int sysfs_blkdev_scsi_get_hctl(struct path_cxt *pc, int *h, int *c, int *t, int
char *sysfs_blkdev_scsi_host_strdup_attribute(struct path_cxt *pc,
const char *type, const char *attr);
int sysfs_blkdev_scsi_host_is(struct path_cxt *pc, const char *type);
int sysfs_scsi_has_attribute(struct path_cxt *pc, const char *attr);
int sysfs_scsi_path_contains(struct path_cxt *pc, const char *pattern);
int sysfs_blkdev_scsi_has_attribute(struct path_cxt *pc, const char *attr);
int sysfs_blkdev_scsi_path_contains(struct path_cxt *pc, const char *pattern);
#endif /* UTIL_LINUX_SYSFS_H */

7
lib/sysfs.c
View File

@ -19,7 +19,6 @@
static void sysfs_blkdev_deinit_path(struct path_cxt *pc);
static int sysfs_blkdev_enoent_redirect(struct path_cxt *pc, const char *path, int *dirfd);
static dev_t __sysfs_devname_to_devno(const char *prefix, const char *name, const char *parent);
/*
* Debug stuff (based on include/debug.h)
@ -811,7 +810,7 @@ static char *scsi_attribute_path(struct path_cxt *pc,
return (len < 0 || (size_t) len >= bufsz) ? NULL : buf;
}
int sysfs_scsi_has_attribute(struct path_cxt *pc, const char *attr)
int sysfs_blkdev_scsi_has_attribute(struct path_cxt *pc, const char *attr)
{
char path[PATH_MAX];
struct stat st;
@ -822,7 +821,7 @@ int sysfs_scsi_has_attribute(struct path_cxt *pc, const char *attr)
return stat(path, &st) == 0;
}
int sysfs_scsi_path_contains(struct path_cxt *pc, const char *pattern)
int sysfs_blkdev_scsi_path_contains(struct path_cxt *pc, const char *pattern)
{
char path[PATH_MAX], linkc[PATH_MAX];
struct stat st;
@ -858,7 +857,7 @@ static dev_t read_devno(const char *path)
return dev;
}
static dev_t __sysfs_devname_to_devno(const char *prefix, const char *name, const char *parent)
dev_t __sysfs_devname_to_devno(const char *prefix, const char *name, const char *parent)
{
char buf[PATH_MAX];
char *_name = NULL; /* name as encoded in sysfs */