You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2001/09/19 20:43:51 UTC
cvs commit: apr/dso/win32 dso.c
wrowe 01/09/19 11:43:51
Modified: dso/win32 dso.c
Log:
As pointed out by Mladen Turk <mt...@mappingsoft.com>, the Win9x case
never fixed the rv from apr_dso_load. Here's the leanest fix, along
with assuring we have the pool context, even if all we return is an
error result.
Revision Changes Path
1.24 +3 -1 apr/dso/win32/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/win32/dso.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dso.c 2001/09/04 21:20:57 1.23
+++ dso.c 2001/09/19 18:43:51 1.24
@@ -119,16 +119,18 @@
os_handle = LoadLibraryEx(path, NULL, 0);
if (!os_handle)
rv = apr_get_os_error();
+ else
+ rv = APR_SUCCESS;
SetErrorMode(em);
}
*res_handle = apr_pcalloc(ctx, sizeof(**res_handle));
+ (*res_handle)->cont = ctx;
if (rv) {
return ((*res_handle)->load_error = rv);
}
(*res_handle)->handle = (void*)os_handle;
- (*res_handle)->cont = ctx;
(*res_handle)->load_error = APR_SUCCESS;
apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);