From b5210a1e31afb9f0adf369cde11c612f3365432e Mon Sep 17 00:00:00 2001 From: Peter Lieven Date: Mon, 23 Jan 2017 15:40:09 +0100 Subject: [PATCH 036/110] sync: fix return value for various sync commands all sync commands that return an integer value are supposed to return a negative value on error. However, state.status is positive non-zero on error. Fix this by returning -1 if the state.status is not SCSI_STATUS_GOOD. Reported-by: Sitsofe Wheeler Signed-off-by: Peter Lieven --- lib/sync.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/sync.c b/lib/sync.c index 3b907c0..0e4d42b 100644 --- a/lib/sync.c +++ b/lib/sync.c @@ -111,7 +111,7 @@ iscsi_connect_sync(struct iscsi_context *iscsi, const char *portal) /* clear connect_data so it doesnt point to our stack */ iscsi->connect_data = NULL; - return state.status; + return (state.status == SCSI_STATUS_GOOD) ? 0 : -1; } int @@ -132,7 +132,7 @@ iscsi_full_connect_sync(struct iscsi_context *iscsi, event_loop(iscsi, &state); - return state.status; + return (state.status == SCSI_STATUS_GOOD) ? 0 : -1; } int iscsi_login_sync(struct iscsi_context *iscsi) @@ -149,7 +149,7 @@ int iscsi_login_sync(struct iscsi_context *iscsi) event_loop(iscsi, &state); - return state.status; + return (state.status == SCSI_STATUS_GOOD) ? 0 : -1; } int iscsi_logout_sync(struct iscsi_context *iscsi) @@ -166,7 +166,7 @@ int iscsi_logout_sync(struct iscsi_context *iscsi) event_loop(iscsi, &state); - return state.status; + return (state.status == SCSI_STATUS_GOOD) ? 0 : -1; } static void @@ -213,7 +213,7 @@ int iscsi_reconnect_sync(struct iscsi_context *iscsi) reconnect_event_loop(iscsi, &state); - return state.status; + return (state.status == SCSI_STATUS_GOOD) ? 0 : -1; } static void @@ -270,7 +270,7 @@ iscsi_task_mgmt_sync(struct iscsi_context *iscsi, event_loop(iscsi, &state); - return state.status; + return (state.status == SCSI_STATUS_GOOD) ? 0 : -1; } int -- 1.8.3.1