commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r812384 - in /commons/sandbox/runtime/trunk/src/main/native: include/arch/windows/acr_arch.h os/win32/file.c test/testsuite.c
Date Tue, 08 Sep 2009 08:28:31 GMT
Author: mturk
Date: Tue Sep  8 08:28:31 2009
New Revision: 812384

URL: http://svn.apache.org/viewvc?rev=812384&view=rev
Log:
Fix typos

Modified:
    commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
    commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c
    commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c

Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h?rev=812384&r1=812383&r2=812384&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h Tue Sep
 8 08:28:31 2009
@@ -643,8 +643,8 @@
 #ifdef CreateSymbolicLinkW
 #undef CreateSymbolicLinkW
 #endif
-#ifndef SYMBOLIC_LINK_FLAG_DIRECTORORY
-#define SYMBOLIC_LINK_FLAG_DIRECTORORY 0x01
+#ifndef SYMBOLIC_LINK_FLAG_DIRECTORY
+#define SYMBOLIC_LINK_FLAG_DIRECTORY 0x01
 #endif
 ACR_DECLARE_LATE_DLL_FUNC(SYSDLL_KERNEL32, BOOL, FALSE,
                           WINAPI, CreateSymbolicLinkW, 0, (

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c?rev=812384&r1=812383&r2=812384&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c Tue Sep  8 08:28:31 2009
@@ -16,6 +16,8 @@
 
 #include "acr.h"
 #include "acr_private.h"
+#define ACR_WANT_LATE_DLL
+#include "acr_arch.h"
 #include "acr_error.h"
 #include "acr_memory.h"
 #include "acr_port.h"
@@ -23,9 +25,6 @@
 #include "acr_descriptor.h"
 #include "acr_file.h"
 
-#define ACR_WANT_LATE_DLL
-#include "acr_arch.h"
-
 /**
  * Win32 file functions
  *
@@ -185,10 +184,10 @@
 
         FS2BS(J2W(target));
         if (ACR_FileTypeGet(NULL, J2W(target)) == ACR_FT_DIR) {
-            dwFlags = SYMBOLIC_LINK_FLAG_DIRECTORORY;
+            dwFlags = SYMBOLIC_LINK_FLAG_DIRECTORY;
         }
         else if (tlen > 1 && J2W(target)[tlen - 1 ] == L'\\') {
-            dwFlags = SYMBOLIC_LINK_FLAG_DIRECTORORY;
+            dwFlags = SYMBOLIC_LINK_FLAG_DIRECTORY;
         }
         if (ACR_HAVE_LATE_DLL_FUNC(CreateSymbolicLinkW)) {
             if (!CreateSymbolicLinkW(J2W(lnkname), J2W(target), dwFlags)) {
@@ -203,7 +202,7 @@
             else
                 rc = JNI_TRUE;
         }
-        else if (dwFlags ==  SYMBOLIC_LINK_FLAG_DIRECTORORY) {
+        else if (dwFlags ==  SYMBOLIC_LINK_FLAG_DIRECTORY) {
             HANDLE token = NULL;
             HANDLE hlink = INVALID_HANDLE_VALUE;
             PREPARSE_DATA_BUFFER rdb;

Modified: commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c?rev=812384&r1=812383&r2=812384&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c Tue Sep  8 08:28:31 2009
@@ -25,7 +25,6 @@
 #include "acr_tables.h"
 #include "acr_vm.h"
 #include "acr_clazz.h"
-#include "acr_port.h"
 #include "acr_pointer.h"
 #include "acr_descriptor.h"
 #include "acr_file.h"
@@ -415,9 +414,6 @@
 
         return -1;
     }
-    i = pimatch(argv[0], argv[1], &end);
-    printf("pmatch returned  %d\n", i);
-    printf("pmatch ended on '%s'\n", end);
     i = ACR_StrMatchA(argv[0], argv[1], &mp, 0);
     printf("smatch returned  %d\n", i);
     printf("smatch ended on '%s'\n", argv[0] + mp);



Mime
View raw message