krb5_enomem to separate source file
authorJeffrey Altman <jaltman@secure-endpoints.com>
Mon, 2 Jul 2012 15:33:18 +0000 (11:33 -0400)
committerJeffrey Altman <jaltman@secure-endpoints.com>
Mon, 2 Jul 2012 15:33:18 +0000 (11:33 -0400)
krb5_enomem() is a wrapper around krb5_set_error_message() which
is used throughout the lib/krb5 sources.  Some of the lib/krb5
sources are imported into third party projects and those projects
must be able to pull in krb5_enomem() without other baggage.
Create a new source file lib/krb5/enomem.c.

Change-Id: Id109386d48e3e2988b705b82525adf4f1fa5ea98

lib/krb5/Makefile.am
lib/krb5/NTMakefile
lib/krb5/enomem.c [new file with mode: 0644]
lib/krb5/misc.c

index 795e4db9c835635e374f9f0250346806afe07bf6..4a9a4dc231a166e19be5f40172be79fe99a220fe 100644 (file)
@@ -147,6 +147,7 @@ dist_libkrb5_la_SOURCES =                   \
        deprecated.c                            \
        digest.c                                \
        eai_to_heim_errno.c                     \
+        enomem.c                                \
        error_string.c                          \
        expand_hostname.c                       \
        expand_path.c                           \
index 6f1904baacaa415ac920d801eb8d433b580b3bfe..77273ff8750f89e3770d8d901f18d5118372ae3d 100644 (file)
@@ -72,6 +72,7 @@ libkrb5_OBJS =                        \
        $(OBJ)\digest.obj                   \
        $(OBJ)\dll.obj                      \
        $(OBJ)\eai_to_heim_errno.obj        \
+        $(OBJ)\enomem.obj                   \
        $(OBJ)\error_string.obj             \
        $(OBJ)\expand_hostname.obj          \
        $(OBJ)\expand_path.obj              \
@@ -216,6 +217,7 @@ dist_libkrb5_la_SOURCES =                   \
        deprecated.c                            \
        digest.c                                \
        eai_to_heim_errno.c                     \
+        enomem.c                                \
        error_string.c                          \
        expand_hostname.c                       \
        expand_path.c                           \
diff --git a/lib/krb5/enomem.c b/lib/krb5/enomem.c
new file mode 100644 (file)
index 0000000..0e67fa8
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * 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 the Institute 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 INSTITUTE 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 INSTITUTE 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 "krb5_locl.h"
+
+krb5_error_code
+krb5_enomem(krb5_context context)
+{
+    krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
+    return ENOMEM;
+}
+
index ac6720c4e992155025ced914d8c00f069e5f1cca..7814761d01e676e9c6c30331e6c86fe7923559b2 100644 (file)
@@ -86,13 +86,6 @@ out:
     return ret;
 }
 
-krb5_error_code
-krb5_enomem(krb5_context context)
-{
-    krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
-    return ENOMEM;
-}
-
 void
 _krb5_debug_backtrace(krb5_context context)
 {