adjustments to NoticeError use with wolfsftp

Author: JacobBarthelmeh

src/wolfsftp.c

@@ -6989,14 +6989,12 @@ static int SFTP_STAT(WOLFSSH* ssh, char* dir, WS_SFTP_FILEATRB* atr, byte type)
                 WLOG(WS_LOG_SFTP, "SFTP LSTAT STATE: SEND_TYPE_REQ");
                 ret = SendPacketType(ssh, type, (byte*)dir, state->dirSz);
                 if (ret != WS_SUCCESS) {
-                    if (ssh->error == WS_WANT_READ ||
-                            ssh->error == WS_WANT_WRITE)
+                    if (NoticeError(ssh)) {
                         return WS_FATAL_ERROR;
-                    else {
-                        ret_fatal = 1;
-                        state->state = STATE_LSTAT_CLEANUP;
-                        continue;
                     }
+                    ret_fatal = 1;
+                    state->state = STATE_LSTAT_CLEANUP;
+                    continue;
                 }
                 state->state = STATE_LSTAT_GET_HEADER;
                 FALL_THROUGH;
@@ -7007,14 +7005,12 @@ static int SFTP_STAT(WOLFSSH* ssh, char* dir, WS_SFTP_FILEATRB* atr, byte type)
                 ret = SFTP_GetHeader(ssh, &state->reqId, &state->type,
                         &state->buffer);
                 if (ret <= 0) {
-                    if (ssh->error == WS_WANT_READ ||
-                            ssh->error == WS_WANT_WRITE)
+                    if (NoticeError(ssh)) {
                         return WS_FATAL_ERROR;
-                    else {
-                        state->state = STATE_LSTAT_CLEANUP;
-                        ret_fatal = 1;
-                        continue;
                     }
+                    state->state = STATE_LSTAT_CLEANUP;
+                    ret_fatal = 1;
+                    continue;
                 }
 
                 state->state = STATE_LSTAT_CHECK_REQ_ID;
@@ -7726,12 +7722,8 @@ int wolfSSH_SFTP_SendReadPacket(WOLFSSH* ssh, byte* handle, word32 handleSz,
                     if (NoticeError(ssh)) {
                         return WS_FATAL_ERROR;
                     }
-                    if (ssh->error != WS_WANT_READ &&
-                            ssh->error != WS_WANT_WRITE) {
-                        state->state = STATE_SEND_READ_CLEANUP;
-                        continue;
-                    }
-                    return ret;
+                    state->state = STATE_SEND_READ_CLEANUP;
+                    continue;
                 }
                 wolfSSH_SFTP_buffer_free(ssh, &state->buffer);
                 state->state = STATE_SEND_READ_GET_HEADER;
@@ -8855,9 +8847,9 @@ int wolfSSH_SFTP_Get(WOLFSSH* ssh, char* from,
                 WLOG(WS_LOG_SFTP, "SFTP GET STATE: STAT");
                 ret = wolfSSH_SFTP_STAT(ssh, from, &state->attrib);
                 if (ret != WS_SUCCESS) {
-                    if (ssh->error == WS_WANT_READ ||
-                            ssh->error == WS_WANT_WRITE)
+                    if (NoticeError(ssh)) {
                         return WS_FATAL_ERROR;
+                    }
                     WLOG(WS_LOG_SFTP, "Error verifying file");
                     state->state = STATE_GET_CLEANUP;
                     continue;
@@ -8882,8 +8874,7 @@ int wolfSSH_SFTP_Get(WOLFSSH* ssh, char* from,
                 ret = wolfSSH_SFTP_Open(ssh, from, WOLFSSH_FXF_READ, NULL,
                         state->handle, &state->handleSz);
                 if (ret != WS_SUCCESS) {
-                    if (ssh->error == WS_WANT_READ ||
-                            ssh->error == WS_WANT_WRITE) {
+                    if (NoticeError(ssh)) {
                         return WS_FATAL_ERROR;
                     }
                     WLOG(WS_LOG_SFTP, "Error getting handle");