diff options
author | Cong <congusbongus@gmail.com> | 2016-03-12 14:30:07 +0300 |
---|---|---|
committer | Cong <congusbongus@gmail.com> | 2016-03-12 14:30:07 +0300 |
commit | 631cd61465e30cd1c433f6aae66ce60a1430a029 (patch) | |
tree | 9a6d783daa1c8e1911003efbdf81277bd4037b60 /tinydir.h | |
parent | c8ac289cf710782f1acc4601a2415530fc456dd1 (diff) |
Remove unneeded error local var
Diffstat (limited to 'tinydir.h')
-rwxr-xr-x | tinydir.h | 26 |
1 files changed, 10 insertions, 16 deletions
@@ -278,10 +278,7 @@ void tinydir_close(tinydir_dir *dir) memset(dir->path, 0, sizeof(dir->path)); dir->has_next = 0; dir->n_files = 0; - if (dir->_files != NULL) - { - _TINYDIR_FREE(dir->_files); - } + _TINYDIR_FREE(dir->_files); dir->_files = NULL; #ifdef _MSC_VER if (dir->_h != INVALID_HANDLE_VALUE) @@ -296,10 +293,7 @@ void tinydir_close(tinydir_dir *dir) } dir->_d = NULL; dir->_e = NULL; - if (dir->_ep != NULL) - { - _TINYDIR_FREE(dir->_ep); - } + _TINYDIR_FREE(dir->_ep); dir->_ep = NULL; #endif } @@ -307,10 +301,6 @@ void tinydir_close(tinydir_dir *dir) _TINYDIR_FUNC int tinydir_next(tinydir_dir *dir) { -#ifndef _MSC_VER - int error; -#endif - if (dir == NULL) { errno = EINVAL; @@ -325,10 +315,14 @@ int tinydir_next(tinydir_dir *dir) #ifdef _MSC_VER if (FindNextFileA(dir->_h, &dir->_f) == 0) #else - if (dir->_ep == NULL) return -1; - error = readdir_r(dir->_d, dir->_ep, &dir->_e); - if (error != 0) return -1; - + if (dir->_ep == NULL) + { + return -1; + } + if (readdir_r(dir->_d, dir->_ep, &dir->_e) != 0) + { + return -1; + } if (dir->_e == NULL) #endif { |