admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

sync: fix return value for various sync commands

Browse Source 
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 <sitsofe@yahoo.com>
Signed-off-by: Peter Lieven <pl@kamp.de>
This commit is contained in:
Peter Lieven
2017-01-23 15:40:09 +01:00
parent 9f4f6f85d0
commit b5210a1e31
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/sync.c
View File

@@ -111,7 +111,7 @@ iscsi_connect_sync(struct iscsi_context *iscsi, const char *portal)
/* clear connect_data so it doesnt point to our stack */ /* clear connect_data so it doesnt point to our stack */
iscsi->connect_data = NULL; iscsi->connect_data = NULL;
return state.status; return (state.status == SCSI_STATUS_GOOD) ? 0 : -1;
} }
int int
@@ -132,7 +132,7 @@ iscsi_full_connect_sync(struct iscsi_context *iscsi,
event_loop(iscsi, &state); event_loop(iscsi, &state);
return state.status; return (state.status == SCSI_STATUS_GOOD) ? 0 : -1;
} }
int iscsi_login_sync(struct iscsi_context *iscsi) int iscsi_login_sync(struct iscsi_context *iscsi)
@@ -149,7 +149,7 @@ int iscsi_login_sync(struct iscsi_context *iscsi)
event_loop(iscsi, &state); event_loop(iscsi, &state);
return state.status; return (state.status == SCSI_STATUS_GOOD) ? 0 : -1;
} }
int iscsi_logout_sync(struct iscsi_context *iscsi) int iscsi_logout_sync(struct iscsi_context *iscsi)
@@ -166,7 +166,7 @@ int iscsi_logout_sync(struct iscsi_context *iscsi)
event_loop(iscsi, &state); event_loop(iscsi, &state);
return state.status; return (state.status == SCSI_STATUS_GOOD) ? 0 : -1;
} }
static void static void
@@ -213,7 +213,7 @@ int iscsi_reconnect_sync(struct iscsi_context *iscsi)
reconnect_event_loop(iscsi, &state); reconnect_event_loop(iscsi, &state);
return state.status; return (state.status == SCSI_STATUS_GOOD) ? 0 : -1;
} }
static void static void
@@ -270,7 +270,7 @@ iscsi_task_mgmt_sync(struct iscsi_context *iscsi,
event_loop(iscsi, &state); event_loop(iscsi, &state);
return state.status; return (state.status == SCSI_STATUS_GOOD) ? 0 : -1;
} }
int int