Author: dick
Date: 2007-05-21 07:58:43 -0400 (Mon, 21 May 2007)
New Revision: 77757
Modified:
trunk/mono/mono/io-layer/ChangeLog
trunk/mono/mono/io-layer/io-portability.c
Log:
2007-05-21 Dick Porter <[EMAIL PROTECTED]>
* io-portability.c (_wapi_g_dir_open): Don't propagate any errors
from the second call to g_dir_open, preserve the original error if
the second call still fails but clear the error if it succeeds.
Modified: trunk/mono/mono/io-layer/ChangeLog
===================================================================
--- trunk/mono/mono/io-layer/ChangeLog 2007-05-21 11:48:14 UTC (rev 77756)
+++ trunk/mono/mono/io-layer/ChangeLog 2007-05-21 11:58:43 UTC (rev 77757)
@@ -1,3 +1,9 @@
+2007-05-21 Dick Porter <[EMAIL PROTECTED]>
+
+ * io-portability.c (_wapi_g_dir_open): Don't propagate any errors
+ from the second call to g_dir_open, preserve the original error if
+ the second call still fails but clear the error if it succeeds.
+
2007-05-10 Dick Porter <[EMAIL PROTECTED]>
* sockets.c (_wapi_recvfrom): Refine the fix to bug 75705 so EINTR
Modified: trunk/mono/mono/io-layer/io-portability.c
===================================================================
--- trunk/mono/mono/io-layer/io-portability.c 2007-05-21 11:48:14 UTC (rev
77756)
+++ trunk/mono/mono/io-layer/io-portability.c 2007-05-21 11:58:43 UTC (rev
77757)
@@ -669,7 +669,7 @@
(*error)->code == G_FILE_ERROR_NAMETOOLONG) &&
portability_helpers > 0) {
gchar *located_filename = find_file (path, TRUE);
- GError *tmp_error;
+ GError *tmp_error = NULL;
if (located_filename == NULL) {
return(NULL);
@@ -677,8 +677,8 @@
ret = g_dir_open (located_filename, flags, &tmp_error);
g_free (located_filename);
- if (tmp_error != NULL) {
- g_propagate_error (error, tmp_error);
+ if (tmp_error == NULL) {
+ g_clear_error (error);
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
