[SCM] Samba Shared Repository - branch master updated - fcce58cc61e4ed66de7d81064f40ff5a4e5b6346

Jelmer Vernooij jelmer at samba.org
Sat Oct 18 12:13:31 GMT 2008


The branch, master has been updated
       via  fcce58cc61e4ed66de7d81064f40ff5a4e5b6346 (commit)
       via  3189d141522d7d710fa8c7f58e92bffd854088ce (commit)
       via  dc5dc3b469decd00609013da578b4a2c83bfe5fc (commit)
      from  7c94c874c41f367cd9660ee4610d322b837cbcd5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fcce58cc61e4ed66de7d81064f40ff5a4e5b6346
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 18 14:12:56 2008 +0200

    Add extra argument free_on_fail to realloc_array() in Samba 4, as used by Samba 3.

commit 3189d141522d7d710fa8c7f58e92bffd854088ce
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 18 14:07:51 2008 +0200

    Use the new memory macro file from Samba 3.

commit dc5dc3b469decd00609013da578b4a2c83bfe5fc
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 18 13:59:21 2008 +0200

    Move some of the memory utility macros to a separate header (for now).

-----------------------------------------------------------------------

Summary of changes:
 lib/util/memory.h          |   93 ++++++++++++++++++++++++++++++++++++++++++++
 lib/util/util.c            |    6 ++-
 lib/util/util.h            |   72 +---------------------------------
 lib/util/util_file.c       |    1 -
 lib/util/xfile.c           |    1 -
 source3/include/includes.h |    1 +
 6 files changed, 100 insertions(+), 74 deletions(-)
 create mode 100644 lib/util/memory.h


Changeset truncated at 500 lines:

diff --git a/lib/util/memory.h b/lib/util/memory.h
new file mode 100644
index 0000000..de01492
--- /dev/null
+++ b/lib/util/memory.h
@@ -0,0 +1,93 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Andrew Tridgell 1992-1999
+   Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2008
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _SAMBA_MEMORY_H_
+#define _SAMBA_MEMORY_H_
+
+#ifndef SAFE_FREE /* Oh no this is also defined in tdb.h */
+/**
+ * Free memory if the pointer and zero the pointer.
+ *
+ * @note You are explicitly allowed to pass NULL pointers -- they will
+ * always be ignored.
+ **/
+#define SAFE_FREE(x) do { if ((x) != NULL) {free(discard_const_p(void *, (x))); (x)=NULL;} } while(0)
+#endif
+
+/** 
+ * Type-safe version of malloc. Allocated one copy of the 
+ * specified data type.
+ */
+#define malloc_p(type) (type *)malloc(sizeof(type))
+
+/**
+ * Allocate an array of elements of one data type. Does type-checking.
+ */
+#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count, false)
+
+/** 
+ * Resize an array of elements of one data type. Does type-checking.
+ */
+#define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count, false)
+
+/** 
+ * zero a structure 
+ */
+#ifndef ZERO_STRUCT
+#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
+#endif
+
+/** 
+ * zero a structure given a pointer to the structure 
+ */
+#ifndef ZERO_STRUCTP
+#define ZERO_STRUCTP(x) do { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } while(0)
+#endif
+
+/** 
+ * zero a structure given a pointer to the structure - no zero check 
+ */
+#ifndef ZERO_STRUCTPN
+#define ZERO_STRUCTPN(x) memset((char *)(x), 0, sizeof(*(x)))
+#endif
+
+/* zero an array - note that sizeof(array) must work - ie. it must not be a
+   pointer */
+#ifndef ZERO_ARRAY
+#define ZERO_ARRAY(x) memset((char *)(x), 0, sizeof(x))
+#endif
+
+/**
+ * work out how many elements there are in a static array 
+ */
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
+#endif
+
+/** 
+ * pointer difference macro 
+ */
+#ifndef PTR_DIFF
+#define PTR_DIFF(p1,p2) ((ptrdiff_t)(((const char *)(p1)) - (const char *)(p2)))
+#endif
+
+
+
+#endif /* _SAMBA_MEMORY_H_ */
diff --git a/lib/util/util.c b/lib/util/util.c
index 5fc785d..4c5ae97 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -569,11 +569,13 @@ _PUBLIC_ bool all_zero(const uint8_t *ptr, size_t size)
 /**
   realloc an array, checking for integer overflow in the array size
 */
-_PUBLIC_ void *realloc_array(void *ptr, size_t el_size, unsigned count)
+_PUBLIC_ void *realloc_array(void *ptr, size_t el_size, unsigned count, bool free_on_fail)
 {
 #define MAX_MALLOC_SIZE 0x7fffffff
 	if (count == 0 ||
 	    count >= MAX_MALLOC_SIZE/el_size) {
+		if (free_on_fail)
+			SAFE_FREE(ptr);
 		return NULL;
 	}
 	if (!ptr) {
@@ -588,7 +590,7 @@ _PUBLIC_ void *realloc_array(void *ptr, size_t el_size, unsigned count)
 
 void *malloc_array(size_t el_size, unsigned int count)
 {
-	return realloc_array(NULL, el_size, count);
+	return realloc_array(NULL, el_size, count, false);
 }
 
 _PUBLIC_ void *talloc_check_name_abort(const void *ptr, const char *name)
diff --git a/lib/util/util.h b/lib/util/util.h
index 61c93f3..e4a5a0c 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -79,79 +79,11 @@ extern const char *panic_action;
 	DEBUG(0,("PANIC: assert failed at %s(%d)\n", __FILE__, __LINE__)); \
 	smb_panic("assert failed"); }} while (0)
 
-#ifndef SAFE_FREE /* Oh no this is also defined in tdb.h */
-/**
- * Free memory if the pointer and zero the pointer.
- *
- * @note You are explicitly allowed to pass NULL pointers -- they will
- * always be ignored.
- **/
-#define SAFE_FREE(x) do { if ((x) != NULL) {free(discard_const_p(void *, (x))); (x)=NULL;} } while(0)
-#endif
-
-/** 
- * Type-safe version of malloc. Allocated one copy of the 
- * specified data type.
- */
-#define malloc_p(type) (type *)malloc(sizeof(type))
-
-/**
- * Allocate an array of elements of one data type. Does type-checking.
- */
-#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
-
-/** 
- * Resize an array of elements of one data type. Does type-checking.
- */
-#define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count)
-
 #if defined(VALGRIND)
 #define strlen(x) valgrind_strlen(x)
 #endif
 
-/** 
- * zero a structure 
- */
-#ifndef ZERO_STRUCT
-#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
-#endif
-
-/** 
- * zero a structure given a pointer to the structure 
- */
-#ifndef ZERO_STRUCTP
-#define ZERO_STRUCTP(x) do { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } while(0)
-#endif
-
-/** 
- * zero a structure given a pointer to the structure - no zero check 
- */
-#ifndef ZERO_STRUCTPN
-#define ZERO_STRUCTPN(x) memset((char *)(x), 0, sizeof(*(x)))
-#endif
-
-/* zero an array - note that sizeof(array) must work - ie. it must not be a
-   pointer */
-#ifndef ZERO_ARRAY
-#define ZERO_ARRAY(x) memset((char *)(x), 0, sizeof(x))
-#endif
-
-/**
- * work out how many elements there are in a static array 
- */
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
-#endif
-
-/** 
- * pointer difference macro 
- */
-#ifndef PTR_DIFF
-#define PTR_DIFF(p1,p2) ((ptrdiff_t)(((const char *)(p1)) - (const char *)(p2)))
-#endif
-
-/* The following definitions come from lib/util/fault.c  */
-
+#include "../lib/util/memory.h"
 
 /**
  * Write backtrace to debug log
@@ -702,7 +634,7 @@ _PUBLIC_ bool all_zero(const uint8_t *ptr, size_t size);
 /**
   realloc an array, checking for integer overflow in the array size
 */
-_PUBLIC_ void *realloc_array(void *ptr, size_t el_size, unsigned count);
+_PUBLIC_ void *realloc_array(void *ptr, size_t el_size, unsigned count, bool free_on_fail);
 
 /* The following definitions come from lib/util/fsusage.c  */
 
diff --git a/lib/util/util_file.c b/lib/util/util_file.c
index 176ff75..0275e78 100644
--- a/lib/util/util_file.c
+++ b/lib/util/util_file.c
@@ -25,7 +25,6 @@
 #if _SAMBA_BUILD_ == 3
 #undef malloc
 #undef realloc
-#define realloc_p(p, type, count) (type *)realloc_array(p, sizeof(type), count, false)
 #endif
 
 /**
diff --git a/lib/util/xfile.c b/lib/util/xfile.c
index e8bb811..94b0ee9 100644
--- a/lib/util/xfile.c
+++ b/lib/util/xfile.c
@@ -38,7 +38,6 @@
 
 #if _SAMBA_BUILD_ == 3
 #undef malloc
-#define malloc_p(type) malloc(sizeof(type))
 #endif
 
 #define XBUFSIZE BUFSIZ
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7178fb4..4926f3a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -592,6 +592,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 
 /* Lists, trees, caching, database... */
 #include "../lib/util/xfile.h"
+#include "../lib/util/memory.h"
 #include "intl.h"
 #include "../lib/util/dlinklist.h"
 #include "tdb.h"


-- 
Samba Shared Repository


More information about the samba-cvs mailing list