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/06 20:13:32 UTC
svn commit: r801752 - in /commons/sandbox/runtime/trunk/src/main/native:
include/ include/arch/unix/ include/arch/windows/ os/darwin/ os/hpux/
os/linux/ os/solaris/ shared/
Author: mturk
Date: Thu Aug 6 18:13:31 2009
New Revision: 801752
URL: http://svn.apache.org/viewvc?rev=801752&view=rev
Log:
Use safer free as inline
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
commons/sandbox/runtime/trunk/src/main/native/os/darwin/pgroup.c
commons/sandbox/runtime/trunk/src/main/native/os/darwin/puser.c
commons/sandbox/runtime/trunk/src/main/native/os/hpux/pgroup.c
commons/sandbox/runtime/trunk/src/main/native/os/hpux/puser.c
commons/sandbox/runtime/trunk/src/main/native/os/linux/pgroup.c
commons/sandbox/runtime/trunk/src/main/native/os/linux/puser.c
commons/sandbox/runtime/trunk/src/main/native/os/solaris/pgroup.c
commons/sandbox/runtime/trunk/src/main/native/os/solaris/puser.c
commons/sandbox/runtime/trunk/src/main/native/shared/memory.c
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_private.h Thu Aug 6 18:13:31 2009
@@ -509,7 +509,6 @@
#endif
#endif
-
#ifdef __cplusplus
}
#endif
Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h Thu Aug 6 18:13:31 2009
@@ -66,6 +66,23 @@
#define ACR_IOH_FLAGS(H) acr_ioh_tab[(H) & acr_ioh_mask].flags
#define ACR_IOH(H) acr_ioh_tab[(H) & acr_ioh_mask].h
+static ACR_INLINE void x_free(void *p)
+{
+ if (p != NULL) {
+ free(p);
+ }
+}
+
+static ACR_INLINE void *x_malloc(size_t size)
+{
+ return calloc(1, size);
+}
+
+static ACR_INLINE void *x_calloc(size_t size)
+{
+ return calloc(1, size);
+}
+
/**
* Read the content of a txt file, up to the ACR_MAX_FREAD_LEN
* and remove all trailing space and control characters.
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=801752&r1=801751&r2=801752&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 Thu Aug 6 18:13:31 2009
@@ -300,6 +300,23 @@
#define ACR_IOH_FLAGS(H) acr_ioh_tab[(H) & acr_ioh_mask].flags
#define ACR_IOH(H) acr_ioh_tab[(H) & acr_ioh_mask].h
+static ACR_INLINE void x_free(void *p)
+{
+ if (p != NULL) {
+ free(p);
+ }
+}
+
+static ACR_INLINE void *x_malloc(size_t size)
+{
+ return calloc(1, size);
+}
+
+static ACR_INLINE void *x_calloc(size_t size)
+{
+ return calloc(1, size);
+}
+
static ACR_INLINE void FileTimeToAprTime(acr_time_t *result, FILETIME *input)
{
/* Convert FILETIME one 64 bit number so we can work with it. */
Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/pgroup.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/pgroup.c?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/pgroup.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/pgroup.c Thu Aug 6 18:13:31 2009
@@ -97,8 +97,7 @@
cleanup:
/* 4. stage - free the temp storage */
for (i = 0; i < n; i++) {
- if (gnames[i])
- free(gnames[i]);
+ x_free(gnames[i]);
}
free(gnames);
return grps;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/puser.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/puser.c?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/puser.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/puser.c Thu Aug 6 18:13:31 2009
@@ -97,8 +97,7 @@
cleanup:
/* 4. stage - free the temp storage */
for (i = 0; i < n; i++) {
- if (unames[i])
- free(unames[i]);
+ x_free(unames[i]);
}
free(unames);
return usrs;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/pgroup.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/pgroup.c?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/pgroup.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/pgroup.c Thu Aug 6 18:13:31 2009
@@ -97,8 +97,7 @@
cleanup:
/* 4. stage - free the temp storage */
for (i = 0; i < n; i++) {
- if (gnames[i])
- free(gnames[i]);
+ x_free(gnames[i]);
}
free(gnames);
return grps;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/puser.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/puser.c?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/puser.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/puser.c Thu Aug 6 18:13:31 2009
@@ -97,8 +97,7 @@
cleanup:
/* 4. stage - free the temp storage */
for (i = 0; i < n; i++) {
- if (unames[i])
- free(unames[i]);
+ x_free(unames[i]);
}
free(unames);
return usrs;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/pgroup.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/pgroup.c?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/pgroup.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/pgroup.c Thu Aug 6 18:13:31 2009
@@ -99,8 +99,7 @@
cleanup:
/* 4. stage - free the temp storage */
for (i = 0; i < n; i++) {
- if (gnames[i])
- free(gnames[i]);
+ x_free(gnames[i]);
}
free(gnames);
return grps;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/puser.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/puser.c?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/puser.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/puser.c Thu Aug 6 18:13:31 2009
@@ -99,8 +99,7 @@
cleanup:
/* 4. stage - free the temp storage */
for (i = 0; i < n; i++) {
- if (unames[i])
- free(unames[i]);
+ x_free(unames[i]);
}
free(unames);
return usrs;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/solaris/pgroup.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/solaris/pgroup.c?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/solaris/pgroup.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/solaris/pgroup.c Thu Aug 6 18:13:31 2009
@@ -99,8 +99,7 @@
cleanup:
/* 4. stage - free the temp storage */
for (i = 0; i < n; i++) {
- if (gnames[i])
- free(gnames[i]);
+ x_free(gnames[i]);
}
free(gnames);
return grps;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/solaris/puser.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/solaris/puser.c?rev=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/solaris/puser.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/solaris/puser.c Thu Aug 6 18:13:31 2009
@@ -99,8 +99,7 @@
cleanup:
/* 4. stage - free the temp storage */
for (i = 0; i < n; i++) {
- if (unames[i])
- free(unames[i]);
+ x_free(unames[i]);
}
free(unames);
return usrs;
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=801752&r1=801751&r2=801752&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/memory.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/memory.c Thu Aug 6 18:13:31 2009
@@ -36,7 +36,7 @@
ACR_DECLARE(void *) ACR_Malloc(JNIEnv *_E, const char *file, int line,
acr_size_t size)
{
- void *mem = malloc(size);
+ void *mem = x_malloc(size);
if (!mem) {
int err = ACR_GET_OS_ERROR();
@@ -51,7 +51,7 @@
ACR_DECLARE(void *) ACR_Calloc(JNIEnv *_E, const char *file, int line,
acr_size_t size)
{
- void *mem = calloc(1, size);
+ void *mem = x_calloc(size);
if (!mem) {
int err = ACR_GET_OS_ERROR();
@@ -228,7 +228,7 @@
if (sbh->dyn_ppos && sbh->dyn_buff) {
size_t i;
for (i = 0; i < sbh->dyn_ppos; i++) {
- free(sbh->dyn_buff[i]);
+ x_free(sbh->dyn_buff[i]);
}
}
@@ -248,8 +248,7 @@
return;
}
ACR_SbhReset(_E, file, line, sbh);
- if (sbh->dyn_buff)
- free(sbh->dyn_buff);
+ x_free(sbh->dyn_buff);
if (sbh->owns)
free(sbh);
}