remove util_alloc.c

diff --git a/Makefile.am b/Makefile.am
index 65826a6..4316d5e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,7 +66,6 @@ mech_eap_la_SOURCES =                         \
        store_cred.c                            \
        unwrap.c                                \
        unwrap_iov.c                            \
-       util_alloc.c                            \
        util_attr.cpp                           \
        util_buffer.c                           \
        util_context.c                          \

diff --git a/util.h b/util.h
index 7d47e98..58a4941 100644 (file)
--- a/util.h
+++ b/util.h
@@ -95,19 +95,6 @@ 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,
@@ -430,10 +417,10 @@ verifyTokenHeader(OM_uint32 *minor,
 
 /* Helper macros */
 
-#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_CALLOC                   calloc
+#define GSSEAP_MALLOC                   malloc
+#define GSSEAP_FREE                     free
+#define GSSEAP_REALLOC                  realloc
 
 #define GSSEAP_NOT_IMPLEMENTED          do {            \
         assert(0 && "not implemented");                 \

diff --git a/util_alloc.c b/util_alloc.c
deleted file mode 100644 (file)
index ad8c560..0000000
--- a/util_alloc.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 d312b3f..314c685 100644 (file)
--- a/util_radius.cpp
+++ b/util_radius.cpp
@@ -59,10 +59,10 @@ radiusAllocHandle(const char *configFile,
     if (rs_context_create(&rh, RS_DICT_FILE) != 0)
         return NULL;
 
-    ralloc.calloc = gssEapCalloc;
-    ralloc.malloc = gssEapMalloc;
-    ralloc.free = gssEapFree;
-    ralloc.realloc = gssEapRealloc;
+    ralloc.calloc = GSSEAP_CALLOC;
+    ralloc.malloc = GSSEAP_MALLOC;
+    ralloc.free = GSSEAP_FREE;
+    ralloc.realloc = GSSEAP_REALLOC;
 
     rs_context_set_alloc_scheme(rh, &ralloc);