d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgeom: Remove redundant and duplicated code

Browse Source 
In g_open(), g_device_path_open().

No functional change.

Sponsored by:	Dell EMC Isilon
This commit is contained in:
Conrad Meyer 2017-09-08 15:44:52 +00:00
parent 985f4b3eb5
commit b906c1a02a
1 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/libgeom/geom_util.c
View File

@ -56,8 +56,6 @@ g_open(const char *name, int dowrite)
path = g_device_path_open(name, &fd, dowrite);
if (path != NULL)
free(path);
if (fd == -1)
return (-1);
return (fd);
}
@ -281,58 +279,45 @@ g_device_path_open(const char *devpath, int *fdp, int dowrite)
/* Make sure that we can fail. */
if (fdp != NULL)
*fdp = -1;
/* Use the device node if we're able to open it. */
do {
fd = open(devpath, dowrite ? O_RDWR : O_RDONLY);
if (fd == -1)
break;
/*
* Let try to get sectorsize, which will prove it is a GEOM
* provider.
*/
if (g_sectorsize(fd) == -1) {
close(fd);
errno = EFTYPE;
return (NULL);
}
fd = open(devpath, dowrite ? O_RDWR : O_RDONLY);
if (fd != -1) {
if ((path = strdup(devpath)) == NULL) {
close(fd);
return (NULL);
}
if (fdp != NULL)
*fdp = fd;
else
close(fd);
return (path);
} while (0);
goto fd_ok;
}
/* If we're not given an absolute path, assume /dev/ prefix. */
if (*devpath != '/') {
asprintf(&path, "%s%s", _PATH_DEV, devpath);
if (path == NULL)
return (NULL);
fd = open(path, dowrite ? O_RDWR : O_RDONLY);
if (fd == -1) {
free(path);
return (NULL);
}
/*
* Let try to get sectorsize, which will prove it is a GEOM
* provider.
*/
if (g_sectorsize(fd) == -1) {
free(path);
close(fd);
errno = EFTYPE;
return (NULL);
}
if (fdp != NULL)
*fdp = fd;
else
close(fd);
return (path);
if (*devpath == '/')
return (NULL);
asprintf(&path, "%s%s", _PATH_DEV, devpath);
if (path == NULL)
return (NULL);
fd = open(path, dowrite ? O_RDWR : O_RDONLY);
if (fd == -1) {
free(path);
return (NULL);
}
return (NULL);
fd_ok:
/*
* Let try to get sectorsize, which will prove it is a GEOM provider.
*/
if (g_sectorsize(fd) == -1) {
free(path);
close(fd);
errno = EFTYPE;
return (NULL);
}
if (fdp != NULL)
*fdp = fd;
else
close(fd);
return (path);
}
char *