From 483522ec1f66d5ea54944e2d68d9122d26b97be2 Mon Sep 17 00:00:00 2001
From: uvman <uvman>
Date: Wed, 1 Nov 2006 12:31:11 +0000
Subject: [PATCH] Introduce misc.c - Proud home of functions with no other
 home, starting with ntfs_[mc]alloc. (Szaka)

---
 ChangeLog              |  1 +
 include/ntfs/support.h | 25 -----------------
 libntfs/Makefile.am    |  1 +
 libntfs/misc.c         | 63 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 25 deletions(-)
 create mode 100644 libntfs/misc.c

diff --git a/ChangeLog b/ChangeLog
index ff4743e4..ba70d549 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,7 @@ xx/xx/2006 - x.xx.x - .
 	- Move ntfs_is_collation_rule_supported() from collate.h to collate.c
 	  and rewrite it to be clearer.  (Yuval)
 	- Move ntfs_index_entry_mark_dirty() to index.c.  (Szaka)
+	- Introduce misc.c. Move ntfs_[mc]alloc there.  (Szaka)
 
 21/06/2006 - 1.13.1 - Various fixes.
 
diff --git a/include/ntfs/support.h b/include/ntfs/support.h
index 10eab345..20644747 100644
--- a/include/ntfs/support.h
+++ b/include/ntfs/support.h
@@ -96,29 +96,4 @@
 	old_state;					\
 })
 
-/**
- * ntfs_calloc, ntfs_malloc
- *
- * Return a pointer to the allocated memory or NULL if the request fails.
- */
-static inline void *ntfs_calloc(size_t size)
-{
-	void *p;
-
-	p = calloc(1, size);
-	if (!p)
-		ntfs_log_perror("Failed to calloc %lld bytes", (long long)size);
-	return p;
-}
-
-static inline void *ntfs_malloc(size_t size)
-{
-	void *p;
-
-	p = malloc(size);
-	if (!p)
-		ntfs_log_perror("Failed to malloc %lld bytes", (long long)size);
-	return p;
-}
-
 #endif /* defined _NTFS_SUPPORT_H */
diff --git a/libntfs/Makefile.am b/libntfs/Makefile.am
index a4e25dbd..072719b8 100644
--- a/libntfs/Makefile.am
+++ b/libntfs/Makefile.am
@@ -52,6 +52,7 @@ libntfs_la_SOURCES =	\
 	lcnalloc.c	\
 	logfile.c	\
 	logging.c	\
+	misc.c		\
 	mft.c		\
 	mst.c		\
 	runlist.c	\
diff --git a/libntfs/misc.c b/libntfs/misc.c
new file mode 100644
index 00000000..b709d305
--- /dev/null
+++ b/libntfs/misc.c
@@ -0,0 +1,63 @@
+/**
+ * mft.c - Miscellaneous functions. Part of the Linux-NTFS project.
+ *
+ * Copyright (c) 2006 Szabolcs Szakacsits
+ *
+ * This program/include file 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program/include file 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 (in the main directory of the Linux-NTFS
+ * distribution in the file COPYING); if not, write to the Free Software
+ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include "support.h"
+#include "logging.h"
+
+/**
+ * ntfs_calloc - A logging supported calloc(3)
+ * 
+ * Return a pointer to the allocated memory or NULL if the request fails.
+ * Memory is initialized with zeros.
+ */
+void *ntfs_calloc(size_t size)
+{
+	void *p;
+	
+	p = calloc(1, size);
+	if (!p)
+		ntfs_log_perror("Failed to calloc %lld bytes", (long long)size);
+	return p;
+}
+
+/**
+ * ntfs_malloc - A logging supported malloc(3)
+ * 
+ * Return a pointer to the allocated memory or NULL if the request fails.
+ * Memory is uninitialized.
+ */
+void *ntfs_malloc(size_t size)
+{
+	void *p;
+	
+	p = malloc(size);
+	if (!p)
+		ntfs_log_perror("Failed to malloc %lld bytes", (long long)size);
+	return p;
+}