Changeset: 4755aabfa74c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4755aabfa74c
Modified Files:
        gdk/gdk_posix.c
        gdk/gdk_posix.h
Branch: globimport
Log Message:

Identation


diffs (48 lines):

diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -951,7 +951,7 @@ MT_glob_start(const char *pattern, MT_gl
        if (res->hFind == INVALID_HANDLE_VALUE) {
                GDKsyserror("MT_glob_start: FindFirstFileEx failed\n");
                FindClose(res->hFind);
-               res->hFind = 0;
+               res->opened = false;
                return -1;
        }
        return 0;
@@ -966,17 +966,13 @@ MT_glob_next(MT_glob *glob, char **res)
        if (glob->first) {
                glob->first = false;
                *res = glob->fData.cFileName;
+       } else if (FindNextFile(glob->hFind, &(glob->fData)) {
+               *res = glob->fData.cFileName;
+       } else if (GetLastError() = ERROR_NO_MORE_FILES) {
+               *res = NULL;
        } else {
-               if (FindNextFile(glob->hFind, &(glob->fData)) {
-                       *res = glob->fData.cFileName;
-               } else {
-                       if (GetLastError() = ERROR_NO_MORE_FILES) {
-                               *res = NULL;
-                       } else {
-                               GDKsyserror("MT_glob_next: FindNextFile 
failed\n");
-                               status = -1;
-                       }       
-               }
+               GDKsyserror("MT_glob_next: FindNextFile failed\n");
+               status = -1;
        }
        return status;
 }
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -130,7 +130,7 @@ gdk_export bool MT_path_absolute(const c
 
 #ifdef NATIVE_WIN32
 typedef strut {
-       bool first:1, opened:1;
+    bool first:1, opened:1;
     HANDLE hFind;
     WIN32_FIND_DATA fData;
 } MT_glob;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to