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/21 11:15:17 UTC
svn commit: r806470 - in /commons/sandbox/runtime/trunk/src/main:
java/org/apache/commons/runtime/ native/include/
native/include/arch/windows/ native/os/hpux/ native/os/unix/
native/os/win32/ native/shared/
Author: mturk
Date: Fri Aug 21 09:15:14 2009
New Revision: 806470
URL: http://svn.apache.org/viewvc?rev=806470&view=rev
Log:
Remove trailing tabs. No functional change
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SharedMemory.java
commons/sandbox/runtime/trunk/src/main/native/include/acr_crypto.h
commons/sandbox/runtime/trunk/src/main/native/include/acr_descriptor.h
commons/sandbox/runtime/trunk/src/main/native/include/acr_shm.h
commons/sandbox/runtime/trunk/src/main/native/include/acr_time.h
commons/sandbox/runtime/trunk/src/main/native/include/acr_xdr.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c
commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c
commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/dirent.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c
commons/sandbox/runtime/trunk/src/main/native/shared/base64.c
commons/sandbox/runtime/trunk/src/main/native/shared/memory.c
commons/sandbox/runtime/trunk/src/main/native/shared/sema.c
commons/sandbox/runtime/trunk/src/main/native/shared/sha1.c
commons/sandbox/runtime/trunk/src/main/native/shared/sha2.c
commons/sandbox/runtime/trunk/src/main/native/shared/shm.c
commons/sandbox/runtime/trunk/src/main/native/shared/xdr.c
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java Fri Aug 21 09:15:14 2009
@@ -25,7 +25,7 @@
abstract class AbstractPointer implements Pointer
{
- protected boolean ISCONST;
+ protected boolean ISCONST;
/**
* Create new {@code null} Pointer instance.
* <p>
@@ -42,7 +42,7 @@
* @see Memory#malloc()
*/
public static final Pointer createInstance()
- throws OutOfMemoryError
+ throws OutOfMemoryError
{
return Memory.malloc();
}
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/MbString.java Fri Aug 21 09:15:14 2009
@@ -381,7 +381,7 @@
public static final byte[] strdup(MbString src)
throws NullPointerException
{
- byte[] copy = new byte[src.length()];
+ byte[] copy = new byte[src.length()];
System.arraycopy(src.mbstr, 0, copy, 0, src.mblen);
return copy;
@@ -402,8 +402,8 @@
public static final byte[] strndup(MbString src, int len)
throws NullPointerException
{
- int length = Math.min(src.length(), len);
- byte[] copy = new byte[length];
+ int length = Math.min(src.length(), len);
+ byte[] copy = new byte[length];
System.arraycopy(src.mbstr, 0, copy, 0, length);
return copy;
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SharedMemory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SharedMemory.java?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SharedMemory.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SharedMemory.java Fri Aug 21 09:15:14 2009
@@ -167,7 +167,7 @@
}
else {
throw new ClosedDescriptorException();
- }
+ }
}
private static native int close0(Descriptor shm)
@@ -193,7 +193,7 @@
}
else {
throw new ClosedDescriptorException();
- }
+ }
}
private static native long size0(Descriptor shm)
@@ -209,7 +209,7 @@
}
else {
throw new ClosedDescriptorException();
- }
+ }
}
private static native Pointer map0(Descriptor shm)
@@ -231,7 +231,7 @@
}
else {
throw new ClosedDescriptorException();
- }
+ }
}
private static native Pointer map1(Descriptor shm, long off, long size)
@@ -255,7 +255,7 @@
}
else {
throw new ClosedDescriptorException();
- }
+ }
}
}
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_crypto.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_crypto.h?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_crypto.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_crypto.h Fri Aug 21 09:15:14 2009
@@ -76,7 +76,7 @@
};
-/**
+/**
* Size of the SHA1 DIGEST
*/
#define ACR_SHA1_DIGESTSIZE 20
@@ -305,33 +305,33 @@
* @param coded The encoded string
* @return the maximum required buffer length for the plain text string
* including the terminating zero char.
- */
+ */
ACR_DECLARE(size_t) ACR_Base64DecodeLen(const char *coded);
/**
* Decode a string to plain text
* @param dst The destination string for the plain text
- * @param coded The encoded string
+ * @param coded The encoded string
* @return the length of the plain text string
- */
+ */
ACR_DECLARE(size_t) ACR_Base64Decode(unsigned char *dst,
const char *coded);
/**
* Decode a string to plain text
* @param dst The destination string for the plain text
- * @param coded The encoded string
+ * @param coded The encoded string
* @return the length of the plain text string
- */
+ */
ACR_DECLARE(size_t) ACR_Base64DecodeA(char *dst,
const char *coded);
/**
- * Given the length of an un-encrypted string, get the length of the
+ * Given the length of an un-encrypted string, get the length of the
* encrypted string.
* @param len the length of an unencrypted string.
* @return the length of the string after it is encrypted
- */
+ */
ACR_DECLARE(size_t) ACR_Base64EncodeLen(size_t len);
/**
@@ -340,7 +340,7 @@
* @param data The plain data to encode
* @param len The length of the plain data
* @return the length of the encoded string
- */
+ */
ACR_DECLARE(size_t) ACR_Base64Encode(char *dst,
const unsigned char *data,
size_t len);
@@ -351,7 +351,7 @@
* @param src The original string in plain text
* @param len The length of the plain text string
* @return the length of the encoded string
- */
+ */
ACR_DECLARE(size_t) ACR_Base64EncodeA(char *dst,
const char *src,
size_t len);
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_descriptor.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_descriptor.h?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_descriptor.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_descriptor.h Fri Aug 21 09:15:14 2009
@@ -46,7 +46,7 @@
typedef enum {
ACR_DESC_CLOSE,
ACR_DESC_SYNC,
- ACR_DESC_FLUSH
+ ACR_DESC_FLUSH
} acr_descriptor_cb_type_e;
typedef struct acr_descriptor_cb_t {
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_shm.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_shm.h?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_shm.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_shm.h Fri Aug 21 09:15:14 2009
@@ -63,7 +63,7 @@
* from the subsystem. In all cases, the apr_shm_baseaddr_get()
* function will return the first usable byte of memory.
* @return The shared memory structure to create.
- *
+ *
*/
ACR_DECLARE(int) ACR_ShmCreate(JNIEnv *env, acr_size_t reqsize,
const acr_pchar_t *filename);
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_time.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_time.h?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_time.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_time.h Fri Aug 21 09:15:14 2009
@@ -36,7 +36,7 @@
*/
#define ACR_TIME_C(val) ACR_INT64_C(val)
-/**
+/**
* Number of microseconds since 00:00:00 january 1, 1970 UTC
*/
ACR_DECLARE(acr_time_t) ACR_TimeNow(void);
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_xdr.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_xdr.h?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_xdr.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_xdr.h Fri Aug 21 09:15:14 2009
@@ -34,7 +34,7 @@
*
*/
-/**
+/**
* Convert macros using network byte order functions.
* On some systems they are optimized asembler functions.
*/
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=806470&r1=806469&r2=806470&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 Fri Aug 21 09:15:14 2009
@@ -353,12 +353,12 @@
static ACR_FORCEINLINE void *x_memzero(void *p, size_t len)
{
volatile char *ptr = (volatile char *)p;
-
+
while (len) {
*ptr = 0;
ptr++;
len--;
- }
+ }
return p;
}
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h Fri Aug 21 09:15:14 2009
@@ -67,15 +67,15 @@
JNIEXPORT RT JNICALL Java_org_apache_commons_runtime_platform_windows_##CL##_##FN
/* Number of micro-seconds between the beginning of the Windows epoch
- * (Jan. 1, 1601) and the Unix epoch (Jan. 1, 1970)
+ * (Jan. 1, 1601) and the Unix epoch (Jan. 1, 1970)
*/
#define ACR_DELTA_EPOCH_IN_USEC 11644473600000000I64
-/**
+/**
* Critical section spin count
- * XXX: MSVCRT uses 4000 which might not be an optimal value
+ * XXX: MSVCRT uses 4000 which might not be an optimal value
*/
-#define ACR_SPINCOUNT 4000
+#define ACR_SPINCOUNT 4000
/**
* Include needed functions from portable layer
Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c Fri Aug 21 09:15:14 2009
@@ -78,7 +78,7 @@
return ACR_EINVAL;
}
/* Anonymous shared memory or
- * we are calling this from forked child.
+ * we are calling this from forked child.
*/
if (m->filename == NULL) {
if (m->base && shmdt(m->base) == -1) {
@@ -217,7 +217,7 @@
return -1;
/* Check if they want anonymous or name-based shared memory */
if (filename == NULL) {
- shm->filename = NULL;
+ shm->filename = NULL;
shm->reqsize = reqsize;
shm->realsize = reqsize;
shm->shmkey = IPC_PRIVATE;
@@ -317,7 +317,7 @@
} while (rc == (acr_size_t)-1 && errno == EINTR);
if (rc == -1) {
rc = ACR_GET_OS_ERROR();
- goto finally;
+ goto finally;
}
finally:
if (file > 0)
@@ -448,7 +448,7 @@
if (IS_INVALID_HANDLE(m) || ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
rc = ACR_EINVAL;
goto finally;
- }
+ }
if ((shmid = shmget(m->shmkey, 0, SHM_R | SHM_W)) == -1) {
rc = ACR_GET_OS_ERROR();
goto finally;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c Fri Aug 21 09:15:14 2009
@@ -485,7 +485,7 @@
} while (rc != 0);
if (!name) {
- /*
+ /*
* Unlink the semaphore immediately, so it can't be accessed externally.
* However this prevents calling attach.
*/
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c Fri Aug 21 09:15:14 2009
@@ -114,7 +114,7 @@
} while (rc != 0);
if (!name) {
- /*
+ /*
* Unlink the semaphore immediately, so it can't be accessed externally.
* However this prevents calling attach.
*/
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/dirent.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/dirent.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/dirent.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/dirent.c Fri Aug 21 09:15:14 2009
@@ -257,7 +257,7 @@
}
fprintf(stdout, "\nOpened : %S\n", dir->d_name);
fprintf(stdout, "Current pos : %d\n", telldir(dir));
-
+
while ((entry = readdir(dir))) {
fprintf(stdout, " Dir Entry : (%d) %s\n", telldir(dir), entry->d_name);
}
@@ -272,7 +272,7 @@
while ((entry = readdir(dir))) {
fprintf(stdout, " Dir Entry : (%d) %s\n", telldir(dir), entry->d_name);
}
-
+
fprintf(stdout, "Finished : %d\n", dir->d_stat);
closedir(dir);
fflush(stdout);
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=806470&r1=806469&r2=806470&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 Fri Aug 21 09:15:14 2009
@@ -73,7 +73,7 @@
if (m->filename) {
/* Remove file if file backed.
* The call will fail if there are still shared
- * memory segments attached to it.
+ * memory segments attached to it.
*/
DeleteFileW(m->filename);
free((void *)(m->filename));
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/time.c Fri Aug 21 09:15:14 2009
@@ -31,6 +31,6 @@
GetSystemTimeAsFileTime(&time);
FileTimeToAprTime(&aprtime, &time);
- return aprtime;
+ return aprtime;
}
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/base64.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/base64.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/base64.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/base64.c Fri Aug 21 09:15:14 2009
@@ -161,7 +161,7 @@
ACR_DECLARE(size_t) ACR_Base64DecodeA(char *bufplain, const char *bufcoded)
{
size_t len;
-
+
len = ACR_Base64Decode((unsigned char *)bufplain, bufcoded);
bufplain[len] = '\0';
return len;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/memory.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/memory.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/memory.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/memory.c Fri Aug 21 09:15:14 2009
@@ -335,7 +335,7 @@
/* Trying to realloc on something we didn't alloc first.
*/
ACR_ThrowException(_E, THROW_NMARK, ACR_EX_ERUNTIME, ACR_EFAULT);
- return;
+ return;
}
np = ACR_Realloc(_E, THROW_NMARK, op, ss);
if (!np) {
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/sema.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/sema.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/sema.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/sema.c Fri Aug 21 09:15:14 2009
@@ -44,7 +44,7 @@
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, semd);
- if (sd > 0) {
+ if (sd > 0) {
ACR_DescriptorClear(_E, semd);
rc = ACR_SemaphoreClose(_E, sd);
}
@@ -60,7 +60,7 @@
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, semd);
- if (sd > 0) {
+ if (sd > 0) {
rc = ACR_SemaphoreWait(_E, sd);
}
if (rc != ACR_SUCCESS) {
@@ -78,7 +78,7 @@
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, semd);
- if (sd > 0) {
+ if (sd > 0) {
rc = ACR_SemaphoreTryWait(_E, sd);
}
if (rc != ACR_SUCCESS) {
@@ -99,7 +99,7 @@
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, semd);
- if (sd > 0) {
+ if (sd > 0) {
rc = ACR_SemaphoreRelease(_E, sd);
}
@@ -114,7 +114,7 @@
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, semd);
- if (sd > 0) {
+ if (sd > 0) {
rc = ACR_SemaphoreReset(_E, sd);
}
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/sha1.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/sha1.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/sha1.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/sha1.c Fri Aug 21 09:15:14 2009
@@ -138,7 +138,7 @@
context->state[4] = 0xC3D2E1F0;
}
-/*
+/*
* Update the SHA digest
*/
ACR_DECLARE(void) ACR_SHA1Update(acr_sha1_ctx_t *context,
@@ -194,7 +194,7 @@
ACR_SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */
}
-/*
+/*
* Finish computing the SHA digest
*/
ACR_DECLARE(void) ACR_SHA1Final(unsigned char digest[ACR_SHA1_DIGEST_LENGTH],
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/sha2.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/sha2.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/sha2.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/sha2.c Fri Aug 21 09:15:14 2009
@@ -18,7 +18,7 @@
/*
* FILE: sha2.c
* AUTHOR: Aaron D. Gifford <me...@aarongifford.com>
- *
+ *
* Copyright (c) 2000-2001, Aaron D. Gifford
* All rights reserved.
*
@@ -386,11 +386,11 @@
/* Part of the message block expansion: */
s0 = W256[(j+1)&0x0f];
s0 = sigma0_256(s0);
- s1 = W256[(j+14)&0x0f];
+ s1 = W256[(j+14)&0x0f];
s1 = sigma1_256(s1);
/* Apply the SHA-256 compression function to update a..h */
- T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] +
+ T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] +
(W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
T2 = Sigma0_256(a) + Maj(a, b, c);
h = g;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/shm.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/shm.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/shm.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/shm.c Fri Aug 21 09:15:14 2009
@@ -45,7 +45,7 @@
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, shmd);
- if (sd > 0) {
+ if (sd > 0) {
ACR_DescriptorClear(_E, shmd);
rc = ACR_ShmClose(_E, sd);
}
@@ -60,7 +60,7 @@
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, shmd);
- if (sd > 0) {
+ if (sd > 0) {
ACR_DescriptorSetInt(_E, shmd, -1);
rc = ACR_ShmDetach(_E, sd);
}
@@ -72,7 +72,7 @@
{
jobject mpo = NULL;
int sd;
-
+
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, shmd);
@@ -95,7 +95,7 @@
{
jobject mpo = NULL;
int sd;
-
+
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, shmd);
@@ -121,7 +121,7 @@
{
jlong rv = 0;
int sd;
-
+
UNREFERENCED_O;
sd = ACR_DescriptorGetInt(_E, shmd);
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/xdr.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/xdr.c?rev=806470&r1=806469&r2=806470&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/xdr.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/xdr.c Fri Aug 21 09:15:14 2009
@@ -52,18 +52,18 @@
(*xdr)->size = len;
(*xdr)->used = 0;
(*xdr)->read = 0;
-#if CC_IS_BIG_ENDIAN
+#if CC_IS_BIG_ENDIAN
(*xdr)->swap = 0;
#else
(*xdr)->swap = nbo == ACR_XDR_NATIVE_BYTE_ORDER ? 0 : 1;
-#endif
+#endif
(*xdr)->buff = (acr_byte_t *)(*xdr) + ACR_ALIGN_DEFAULT(sizeof(acr_xdr_t));
return ACR_SUCCESS;
}
ACR_DECLARE(int) ACR_XdrInitEx(acr_xdr_t **xdr, acr_byte_t *buf, size_t len,
- int nbo)
+ int nbo)
{
*xdr = (acr_xdr_t *)buf;
@@ -72,11 +72,11 @@
(*xdr)->size = len - ACR_ALIGN_DEFAULT(sizeof(acr_xdr_t));
(*xdr)->used = 0;
(*xdr)->read = 0;
-#if CC_IS_BIG_ENDIAN
+#if CC_IS_BIG_ENDIAN
(*xdr)->swap = 0;
#else
(*xdr)->swap = nbo == ACR_XDR_NATIVE_BYTE_ORDER ? 0 : 1;
-#endif
+#endif
(*xdr)->buff = buf + ACR_ALIGN_DEFAULT(sizeof(acr_xdr_t));
return ACR_SUCCESS;
@@ -302,12 +302,12 @@
ACR_DECLARE(acr_uint32_t) ACR_XdrReadLen(int nbo, acr_byte_t *buff)
{
acr_uint32_t val = 0;
-#if CC_IS_BIG_ENDIAN
+#if CC_IS_BIG_ENDIAN
int swap = 0;
#else
int swap = nbo == ACR_XDR_NATIVE_BYTE_ORDER ? 0 : 1;
-#endif
-
+#endif
+
ACR_P_32_DEC(swap, buff, val);
return val;
}
@@ -539,7 +539,7 @@
{
int rc;
size_t used = 0;
- acr_int32_t rv = 0;
+ acr_int32_t rv = 0;
rc = xdr_dec_i32(xdr->buff + xdr->read, xdr->used - xdr->read,
xdr->swap, &used, &rv);
if (rc == ACR_SUCCESS)
@@ -551,7 +551,7 @@
{
int rc;
size_t used = 0;
- acr_uint32_t rv = 0;
+ acr_uint32_t rv = 0;
rc = xdr_dec_u32(xdr->buff + xdr->read, xdr->used - xdr->read,
xdr->swap, &used, &rv);
if (rc == ACR_SUCCESS)
@@ -563,7 +563,7 @@
{
int rc;
size_t used = 0;
- acr_int64_t rv = 0;
+ acr_int64_t rv = 0;
rc = xdr_dec_i64(xdr->buff + xdr->read, xdr->used - xdr->read,
xdr->swap, &used, &rv);
if (rc == ACR_SUCCESS)
@@ -575,7 +575,7 @@
{
int rc;
size_t used = 0;
- acr_uint64_t rv = 0;
+ acr_uint64_t rv = 0;
rc = xdr_dec_u64(xdr->buff + xdr->read, xdr->used - xdr->read,
xdr->swap, &used, &rv);
if (rc == ACR_SUCCESS)
@@ -626,7 +626,7 @@
{
int rc;
size_t used = 0;
- float rv = 0.0;
+ float rv = 0.0;
rc = xdr_dec_f32(xdr->buff + xdr->read, xdr->used - xdr->read,
xdr->swap, &used, &rv);
if (rc == ACR_SUCCESS)
@@ -638,7 +638,7 @@
{
int rc;
size_t used = 0;
- double rv = 0.0;
+ double rv = 0.0;
rc = xdr_dec_f64(xdr->buff + xdr->read, xdr->used - xdr->read,
xdr->swap, &used, &rv);
if (rc == ACR_SUCCESS)