[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. 2.0.871.3-1-24-ga79a06d

Ritesh Raj Sarraf rrs at researchut.com
Tue Jun 8 18:24:06 UTC 2010


The following commit has been merged in the master branch:
commit ab302efeac15677ce2d8720d36e64f7f1482aea6
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Tue Jun 8 19:05:31 2010 +0530

    refresh debian/patches/002_bianry_spelling_error_fix.patch

diff --git a/debian/patches/002_bianry_spelling_error_fix.patch b/debian/patches/002_bianry_spelling_error_fix.patch
index c659ae7..31396ee 100644
--- a/debian/patches/002_bianry_spelling_error_fix.patch
+++ b/debian/patches/002_bianry_spelling_error_fix.patch
@@ -1,55 +1,55 @@
 Fix many spelling errors in source code
-Index: open-iscsi-guido/usr/initiator.c
+Index: b/usr/initiator.c
 ===================================================================
---- open-iscsi-guido.orig/usr/initiator.c	2010-01-26 17:06:03.161370550 +0530
-+++ open-iscsi-guido/usr/initiator.c	2010-01-26 17:16:39.761387591 +0530
+--- a/usr/initiator.c	2010-06-08 14:09:09.999743105 +0530
++++ b/usr/initiator.c	2010-06-08 19:04:43.309050527 +0530
 @@ -1719,7 +1719,7 @@
-	case STATE_LOGGED_IN:
-	case STATE_IN_LOGOUT:
-	case STATE_LOGOUT_REQUESTED:
+ 	case STATE_LOGGED_IN:
+ 	case STATE_IN_LOGOUT:
+ 	case STATE_LOGOUT_REQUESTED:
 -		/* read incomming PDU */
 +		/* read incoming PDU */
-		if (!iscsi_io_recv_pdu(conn, &hdr, ISCSI_DIGEST_NONE,
-			    conn->data, ISCSI_DEF_MAX_RECV_SEG_LEN,
-			    ISCSI_DIGEST_NONE, 0)) {
+ 		if (!iscsi_io_recv_pdu(conn, &hdr, ISCSI_DIGEST_NONE,
+ 			    conn->data, ISCSI_DEF_MAX_RECV_SEG_LEN,
+ 			    ISCSI_DIGEST_NONE, 0)) {
 @@ -1743,12 +1743,12 @@
-		break;
-	case STATE_XPT_WAIT:
-		iscsi_conn_context_put(conn_context);
+ 		break;
+ 	case STATE_XPT_WAIT:
+ 		iscsi_conn_context_put(conn_context);
 -		log_debug(1, "ignoring incomming PDU in XPT_WAIT. "
 +		log_debug(1, "ignoring incoming PDU in XPT_WAIT. "
-			  "let connection re-establish or fail");
-		break;
-	case STATE_CLEANUP_WAIT:
-		iscsi_conn_context_put(conn_context);
+ 			  "let connection re-establish or fail");
+ 		break;
+ 	case STATE_CLEANUP_WAIT:
+ 		iscsi_conn_context_put(conn_context);
 -		log_debug(1, "ignoring incomming PDU in XPT_WAIT. "
 +		log_debug(1, "ignoring incoming PDU in XPT_WAIT. "
-			  "let connection cleanup");
-		break;
-	default:
-Index: open-iscsi-guido/usr/initiator.h
+ 			  "let connection cleanup");
+ 		break;
+ 	default:
+Index: b/usr/initiator.h
 ===================================================================
---- open-iscsi-guido.orig/usr/initiator.h	2010-01-26 17:06:03.161370550 +0530
-+++ open-iscsi-guido/usr/initiator.h	2010-01-26 17:16:39.765382303 +0530
+--- a/usr/initiator.h	2010-06-08 14:09:09.991750787 +0530
++++ b/usr/initiator.h	2010-06-08 19:04:43.309050527 +0530
 @@ -143,7 +143,7 @@
-	int socket_fd;
-	/* address being used for normal session connection */
-	struct sockaddr_storage saddr;
+ 	int socket_fd;
+ 	/* address being used for normal session connection */
+ 	struct sockaddr_storage saddr;
 -	/* address recieved during login */
 +	/* address received during login */
-	struct sockaddr_storage failback_saddr;
-	int tcp_window_size;
-	int type_of_service;
-Index: open-iscsi-guido/usr/netlink.c
+ 	struct sockaddr_storage failback_saddr;
+ 	int tcp_window_size;
+ 	int type_of_service;
+Index: b/usr/netlink.c
 ===================================================================
---- open-iscsi-guido.orig/usr/netlink.c	2010-01-26 17:06:03.173370609 +0530
-+++ open-iscsi-guido/usr/netlink.c	2010-01-26 17:16:39.765382303 +0530
+--- a/usr/netlink.c	2010-06-08 14:09:09.983743663 +0530
++++ b/usr/netlink.c	2010-06-08 19:04:43.313051715 +0530
 @@ -282,7 +282,7 @@
-				}
-				if (ev->iferror == -ENOSYS)
-					/* not fatal so let caller handle log */
+ 				}
+ 				if (ev->iferror == -ENOSYS)
+ 					/* not fatal so let caller handle log */
 -					log_debug(1, "Recieved iferror %d: %s",
 +					log_debug(1, "Received iferror %d: %s",
-						  ev->iferror,
-						  strerror(ev->iferror));
-				else if (ev->iferror < 0)
+ 						  ev->iferror,
+ 						  strerror(ev->iferror));
+ 				else if (ev->iferror < 0)

-- 
Debian Open-iSCSI Packaging



More information about the Pkg-iscsi-maintainers mailing list