You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/08/22 17:50:56 UTC
svn commit: r806864 - in
/commons/sandbox/runtime/trunk/src/main/native/os/win32: dso.c pmutex.c
pshm.c temps.c
Author: mturk
Date: Sat Aug 22 15:50:56 2009
New Revision: 806864
URL: http://svn.apache.org/viewvc?rev=806864&view=rev
Log:
Various typos
Modified:
commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/temps.c
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c?rev=806864&r1=806863&r2=806864&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c Sat Aug 22 15:50:56 2009
@@ -16,6 +16,7 @@
#include "acr.h"
#include "acr_private.h"
+#define ACR_WANT_LATE_DLL
#include "acr_arch.h"
#include "acr_error.h"
#include "acr_memory.h"
@@ -49,7 +50,7 @@
if (!handle) {
wchar_t *ignored;
wchar_t fpath[ACR_HBUFF_SIZ];
- rv = ACR_GET_OS_ERROR();
+ rc = ACR_GET_OS_ERROR();
if (GetFullPathNameW(path, ACR_HBUFF_LEN, fpath, &ignored)) {
if (SetDllDirectoryW(fpath)) {
handle = LoadLibraryExW(path, NULL, 0);
@@ -101,10 +102,7 @@
void *retval = GetProcAddress(handle, symname);
if (retval == NULL) {
rc = ACR_GET_OS_ERROR();
- if (IS_VALID_HANDLE(_E)) {
- ACR_ThrowExceptionA(_E, THROW_NMARK, ACR_EX_ULINK, dlerror());
- }
- ACR_SET_OS_ERROR(rc);
+ ACR_THROW_EX_IF_ERR(ACR_EX_ULINK, rc);
}
return retval;
}
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c?rev=806864&r1=806863&r2=806864&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c Sat Aug 22 15:50:56 2009
@@ -124,7 +124,7 @@
if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
return ACR_EFTYPE;
}
- if (IS_INVALID_HANDLE(m)) {
+ if (IS_INVALID_HANDLE(wh[0])) {
return ACR_EBADF;
}
do {
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c?rev=806864&r1=806863&r2=806864&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c Sat Aug 22 15:50:56 2009
@@ -87,7 +87,7 @@
{
int rc;
- if (ACR_IOH_TYPE(dso) != ACR_DT_SHM) {
+ if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
return ACR_EFTYPE;
}
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/temps.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/temps.c?rev=806864&r1=806863&r2=806864&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/temps.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/temps.c Sat Aug 22 15:50:56 2009
@@ -43,8 +43,7 @@
}
ACR_DECLARE(int) ACR_TempFileMake(JNIEnv *_E, const wchar_t *tmpath,
- const wchar_t *prefix, int preserve,
- wchar_t **filename)
+ const wchar_t *prefix, int preserve)
{
return -1;
}