Move memory allocation wrappers to misc.C.

diff --git a/src/main.C b/src/main.C
index 8521ea3..6449861 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -640,42 +640,6 @@ rxvt_init ()
   XrmInitialize ();
 }
 
-/* ------------------------------------------------------------------------- *
- *                         MEMORY ALLOCATION WRAPPERS                        *
- * ------------------------------------------------------------------------- */
-void *
-rxvt_malloc (size_t size)
-{
-  void *p = malloc (size);
-
-  if (!p)
-    rxvt_fatal ("memory allocation failure. aborting.\n");
-
-  return p;
-}
-
-void *
-rxvt_calloc (size_t number, size_t size)
-{
-  void *p = calloc (number, size);
-
-  if (!p)
-    rxvt_fatal ("memory allocation failure. aborting.\n");
-
-  return p;
-}
-
-void *
-rxvt_realloc (void *ptr, size_t size)
-{
-  void *p = realloc (ptr, size);
-
-  if (!p)
-    rxvt_fatal ("memory allocation failure. aborting.\n");
-
-  return p;
-}
-
 /*----------------------------------------------------------------------*/
 /*
  * window size/position calculations for XSizeHint and other storage.

diff --git a/src/misc.C b/src/misc.C
index 1d4dd0f..8e5a0f6 100644 (file)
--- a/src/misc.C
+++ b/src/misc.C
@@ -305,5 +305,35 @@ rxvt_freecommastring (char **cs) NOTHROW
   free (cs);
 }
 
+void *
+rxvt_malloc (size_t size)
+{
+  void *p = malloc (size);
+
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+
+  return p;
+}
+
+void *
+rxvt_calloc (size_t number, size_t size)
+{
+  void *p = calloc (number, size);
 
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
 
+  return p;
+}
+
+void *
+rxvt_realloc (void *ptr, size_t size)
+{
+  void *p = realloc (ptr, size);
+
+  if (!p)
+    rxvt_fatal ("memory allocation failure. aborting.\n");
+
+  return p;
+}