mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 11:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

iscsi-scstd: Rearrange driver major number lookup code

Browse Source 
Introduce a function for looking up the driver major number.
This patch does not change any functionality but makes the source
code easier to read and also makes it easier for Coverity to
analyze this code.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6368 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-06-17 00:22:14 +00:00
parent 165b0f1d10
commit dfcb53a9b2
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
iscsi-scst/usr/misc.c
View File

@@ -25,36 +25,48 @@
#include "iscsid.h"
int create_and_open_dev(const char *dev, int readonly)
int driver_major(const char *dev)
{
FILE *f;
char devname[256];
char buf[256];
int devn;
int ctlfd = -1;
int err;
int flags;
f = fopen("/proc/devices", "r");
if (!f) {
err = -errno;
devn = -errno;
perror("Cannot open control path to the driver");
goto out;
}
devn = 0;
devn = -ENOENT;
while (fgets(buf, sizeof(buf), f)) {
if (sscanf(buf, "%d %s", &devn, devname) == 2 &&
devn > 0 && strcmp(devname, dev) == 0)
break;
devn = 0;
devn = -ENOENT;
}
fclose(f);
if (!devn) {
err = -ENOENT;
if (devn < 0)
printf("cannot find %s in /proc/devices - "
"make sure the module is loaded\n", dev);
out:
return devn;
}
int create_and_open_dev(const char *dev, int readonly)
{
char devname[256];
int devn;
int ctlfd = -1;
int err;
int flags;
devn = driver_major(dev);
if (devn < 0) {
err = devn;
goto out;
}