[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7
Mike Christie
michaelc at cs.wisc.edu
Sat Apr 7 15:43:43 UTC 2012
The following commit has been merged in the upstream-mnc branch:
commit 77e1ab9f73921171d5f684e0c20836e78957b5af
Author: Mike Christie <michaelc at cs.wisc.edu>
Date: Tue Aug 2 00:16:58 2011 -0500
iscsi tools: handle compile warnings about unused variables
path is not used in a couple functions in iscsi_sysfs.c, so
remove it.
diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
index 55a5438..d967fa4 100644
--- a/usr/iscsi_sysfs.c
+++ b/usr/iscsi_sysfs.c
@@ -842,7 +842,6 @@ char *iscsi_sysfs_get_blockdev_from_lun(int host_no, int target, int lun)
{
char devpath[PATH_SIZE];
char path_full[PATH_SIZE];
- char *path;
char id[NAME_SIZE];
DIR *dirfd;
struct dirent *dent;
@@ -861,7 +860,6 @@ char *iscsi_sysfs_get_blockdev_from_lun(int host_no, int target, int lun)
sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
if(sysfs_len >= sizeof(path_full))
sysfs_len = sizeof(path_full) - 1;
- path = &path_full[sysfs_len];
strlcat(path_full, devpath, sizeof(path_full));
dirfd = opendir(path_full);
@@ -926,7 +924,6 @@ static uint32_t get_target_no_from_sid(uint32_t sid, int *err)
{
char devpath[PATH_SIZE];
char path_full[PATH_SIZE];
- char *path;
char id[NAME_SIZE];
DIR *dirfd;
struct dirent *dent;
@@ -951,7 +948,6 @@ static uint32_t get_target_no_from_sid(uint32_t sid, int *err)
sysfs_len = strlcpy(path_full, sysfs_path, sizeof(path_full));
if(sysfs_len >= sizeof(path_full))
sysfs_len = sizeof(path_full) - 1;
- path = &path_full[sysfs_len];
strlcat(path_full, devpath, sizeof(path_full));
strlcat(path_full, "/device", sizeof(devpath));
--
Debian Open-iSCSI Packaging
More information about the Pkg-iscsi-maintainers
mailing list