From 7bc463adb18af1aa7db92fb77097a0acee033eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 18 Jul 2011 12:21:03 +0200 Subject: [PATCH] remove upstreamed patches --- lsscsi-0.23-fc-separators.patch | 34 -------------------------- lsscsi-0.23-null.patch | 42 --------------------------------- 2 files changed, 76 deletions(-) delete mode 100644 lsscsi-0.23-fc-separators.patch delete mode 100644 lsscsi-0.23-null.patch diff --git a/lsscsi-0.23-fc-separators.patch b/lsscsi-0.23-fc-separators.patch deleted file mode 100644 index 2940f1c..0000000 --- a/lsscsi-0.23-fc-separators.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 200225b0fe1d516171434b5bea3ec3d8e8880bf3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Thu, 6 May 2010 11:29:47 +0200 -Subject: [PATCH] fix separators for FC - ---- - lsscsi.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lsscsi.c b/lsscsi.c -index 9fa9489..1e5bb11 100644 ---- a/lsscsi.c -+++ b/lsscsi.c -@@ -1027,7 +1027,7 @@ transport_init_longer(const char * path_name, - break; - case TRANSPORT_FC: - printf(" transport=fc\n"); -- strcat(buff, "/device/fc_host:"); -+ strcat(buff, "/device/fc_host/"); - strcat(buff, cp); - if (get_value(buff, "node_name", value, NAME_LEN_MAX)) - printf(" node_name=%s\n", value); -@@ -1394,7 +1394,7 @@ transport_tport_longer(const char * devname, - return; - *cp = '\0'; - cp = basename(wd); -- strcpy(buff, "fc_remote_ports:"); -+ strcpy(buff, "fc_remote_ports/"); - strcat(buff, cp); - if (! if_directory_chdir(wd, buff)) - return; --- -1.6.6.1 - diff --git a/lsscsi-0.23-null.patch b/lsscsi-0.23-null.patch deleted file mode 100644 index afa39ed..0000000 --- a/lsscsi-0.23-null.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 298058559eac4619ce938dfd38b37f9c2f37dabc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Thu, 6 May 2010 14:14:34 +0200 -Subject: [PATCH] check for both string representation of NULL - ---- - lsscsi.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/lsscsi.c b/lsscsi.c -index 1e5bb11..a10f3aa 100644 ---- a/lsscsi.c -+++ b/lsscsi.c -@@ -2119,7 +2119,8 @@ one_host_entry(const char * dir_name, const char * devname, - { - char buff[NAME_LEN_MAX]; - char value[NAME_LEN_MAX]; -- char * nullname = ""; -+ char * nullname1 = ""; -+ char * nullname2 = "(null)"; - unsigned int host_id; - - if (opts->classic) { -@@ -2135,13 +2136,13 @@ one_host_entry(const char * dir_name, const char * devname, - strcat(buff, "/"); - strcat(buff, devname); - if ((get_value(buff, "proc_name", value, NAME_LEN_MAX)) && -- (strncmp(value, nullname, 6))) -+ (strncmp(value, nullname1, 6)) && (strncmp(value, nullname2, 6))) - printf(" %-12s ", value); - else if (if_directory_chdir(buff, "device/../driver")) { - char wd[NAME_LEN_MAX]; - - if (NULL == getcwd(wd, NAME_LEN_MAX)) -- printf(" %-12s ", nullname); -+ printf(" %-12s ", nullname2); - else - printf(" %-12s ", basename(wd)); - --- -1.6.6.1 -