move alloc stuff into a separate file

diff --git a/Makefile.am b/Makefile.am
index 498390b..214ffe5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,6 +66,7 @@ mech_eap_la_SOURCES =                         \
        store_cred.c                            \
        unwrap.c                                \
        unwrap_iov.c                            \
+       util_alloc.c                            \
        util_attr.cpp                           \
        util_buffer.c                           \
        util_context.c                          \
@@ -99,5 +100,5 @@ radius_ad_la_CFLAGS  = -g -Wall -fno-strict-aliasing \
 radius_ad_la_LDFLAGS = -avoid-version -module \
                       -export-symbols radius_ad.exports -no-undefined
 radius_ad_la_LIBADD  = @KRB5_LIBS@
-radius_ad_la_SOURCES = util_adshim.c
+radius_ad_la_SOURCES = util_adshim.c util_alloc.c
 endif

diff --git a/util.h b/util.h
index 40229f1..7d47e98 100644 (file)
--- a/util.h
+++ b/util.h
@@ -95,6 +95,19 @@ enum gss_eap_token_type {
 
 #define EAP_EXPORT_CONTEXT_V1           1
 
+/* util_alloc.c */
+void *
+gssEapCalloc(size_t nmemb, size_t size);
+
+void *
+gssEapMalloc(size_t size);
+
+void
+gssEapFree(void *ptr);
+
+void *
+gssEapRealloc(void *ptr, size_t size);
+
 /* util_buffer.c */
 OM_uint32
 makeStringBuffer(OM_uint32 *minor,
@@ -416,10 +429,11 @@ verifyTokenHeader(OM_uint32 *minor,
                   enum gss_eap_token_type *ret_tok_type);
 
 /* Helper macros */
-#define GSSEAP_CALLOC(count, size)      (calloc((count), (size)))
-#define GSSEAP_FREE(ptr)                (free((ptr)))
-#define GSSEAP_MALLOC(size)             (malloc((size)))
-#define GSSEAP_REALLOC(ptr, size)       (realloc((ptr), (size)))
+
+#define GSSEAP_CALLOC(count, size)      (gssEapCalloc((count), (size)))
+#define GSSEAP_MALLOC(size)             (gssEapMalloc((size)))
+#define GSSEAP_FREE(ptr)                (gssEapFree((ptr)))
+#define GSSEAP_REALLOC(ptr, size)       (gssEapRealloc((ptr), (size)))
 
 #define GSSEAP_NOT_IMPLEMENTED          do {            \
         assert(0 && "not implemented");                 \

diff --git a/util_alloc.c b/util_alloc.c
new file mode 100644 (file)
index 0000000..ad8c560
--- /dev/null
+++ b/util_alloc.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, JANET(UK)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of JANET(UK) nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "gssapiP_eap.h"
+
+void *
+gssEapCalloc(size_t nmemb, size_t size)
+{
+    return calloc(nmemb, size);
+}
+
+void *
+gssEapMalloc(size_t size)
+{
+    return malloc(size);
+}
+
+void
+gssEapFree(void *ptr)
+{
+    free(ptr);
+}
+
+void *
+gssEapRealloc(void *ptr, size_t size)
+{
+    return realloc(ptr, size);
+}

diff --git a/util_radius.cpp b/util_radius.cpp
index 15f1217..d1ff877 100644 (file)
--- a/util_radius.cpp
+++ b/util_radius.cpp
@@ -43,30 +43,6 @@ static gss_buffer_desc radiusUrnPrefix = {
     (void *)"urn:x-radius:"
 };
 
-static void *
-gssEapCalloc(size_t nmemb, size_t size)
-{
-    return GSSEAP_CALLOC(nmemb, size);
-}
-
-static void *
-gssEapMalloc(size_t size)
-{
-    return GSSEAP_MALLOC(size);
-}
-
-static void
-gssEapFree(void *ptr)
-{
-    GSSEAP_FREE(ptr);
-}
-
-static void *
-gssEapRealloc(void *ptr, size_t size)
-{
-    return GSSEAP_REALLOC(ptr, size);
-}
-
 static struct rs_error *
 radiusAllocHandle(const char *configFile,
                   rs_handle **pHandle)