From 8e0dcb4f21cb1b47638c3106959c43256c179e03 Mon Sep 17 00:00:00 2001
From: Mathieu Rene <mrene@avgs.ca>
Date: Tue, 18 Aug 2009 18:32:11 +0000
Subject: [PATCH] don't expose node allocation functions outside of
 switch_log.c

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14556 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/include/switch_log.h |  3 --
 src/switch_log.c         | 84 ++++++++++++++++++++--------------------
 2 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/src/include/switch_log.h b/src/include/switch_log.h
index 711c16a787..7f3793e9f8 100644
--- a/src/include/switch_log.h
+++ b/src/include/switch_log.h
@@ -143,9 +143,6 @@ SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(_In_z_ const char *str);
 SWITCH_DECLARE(uint32_t) switch_log_str2mask(_In_z_ const char *str);
 #define switch_log_check_mask(_mask, _level) (_mask & (1 << _level))
 
-SWITCH_DECLARE(switch_log_node_t*) switch_log_node_alloc();
-SWITCH_DECLARE(void) switch_log_node_free(switch_log_node_t **node);
-
 ///\}
 SWITCH_END_EXTERN_C
 #endif
diff --git a/src/switch_log.c b/src/switch_log.c
index cc8f3ca351..cd00d24f56 100644
--- a/src/switch_log.c
+++ b/src/switch_log.c
@@ -78,6 +78,49 @@ static const char*
 #endif
 COLORS[] = { SWITCH_SEQ_DEFAULT_COLOR, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW };
 
+
+static switch_log_node_t* switch_log_node_alloc()
+{
+	switch_log_node_t *node = NULL;
+#ifdef SWITCH_LOG_RECYCLE
+	void *pop = NULL;
+
+	if (switch_queue_trypop(LOG_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) {
+		node = (switch_log_node_t *) pop;
+	} else {
+#endif
+		node = malloc(sizeof(*node));
+		switch_assert(node);
+#ifdef SWITCH_LOG_RECYCLE
+	}
+#endif
+	return node;
+}
+
+static void switch_log_node_free(switch_log_node_t **pnode)
+{
+	switch_log_node_t *node;
+	
+	if (!pnode) {
+		return;
+	}
+
+	node = *pnode;
+
+	if (node) {		
+		switch_safe_free(node->userdata);		
+		switch_safe_free(node->data);
+#ifdef SWITCH_LOG_RECYCLE
+		if (switch_queue_trypush(LOG_RECYCLE_QUEUE, node) != SWITCH_STATUS_SUCCESS) {
+			free(node);
+		}
+#else
+		free(node);
+#endif
+	}
+	*pnode = NULL;	
+}
+
 SWITCH_DECLARE(const char *) switch_log_level2str(switch_log_level_t level)
 {
 	if (level > SWITCH_LOG_DEBUG) {
@@ -479,47 +522,6 @@ SWITCH_DECLARE(switch_status_t) switch_log_shutdown(void)
 	return SWITCH_STATUS_SUCCESS;
 }
 
-SWITCH_DECLARE(switch_log_node_t*) switch_log_node_alloc()
-{
-	switch_log_node_t *node = NULL;
-#ifdef SWITCH_LOG_RECYCLE
-	void *pop = NULL;
-
-	if (switch_queue_trypop(LOG_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) {
-		node = (switch_log_node_t *) pop;
-	} else {
-#endif
-		node = malloc(sizeof(*node));
-		switch_assert(node);
-#ifdef SWITCH_LOG_RECYCLE
-	}
-#endif
-	return node;
-}
-
-SWITCH_DECLARE(void) switch_log_node_free(switch_log_node_t **pnode)
-{
-	switch_log_node_t *node;
-	
-	if (!pnode) {
-		return;
-	}
-
-	node = *pnode;
-
-	if (node) {		
-		switch_safe_free(node->userdata);		
-		switch_safe_free(node->data);
-#ifdef SWITCH_LOG_RECYCLE
-		if (switch_queue_trypush(LOG_RECYCLE_QUEUE, node) != SWITCH_STATUS_SUCCESS) {
-			free(node);
-		}
-#else
-		free(node);
-#endif
-	}
-	*pnode = NULL;	
-}
 
 /* For Emacs:
  * Local Variables: