Revision

14556

Author

mrene

Date

2009-08-18 13:32:11 -0500 (Tue, 18 Aug 2009)

Log Message

don't expose node allocation functions outside of switch_log.c

Modified Paths

• freeswitch/trunk/src/include/switch_log.h
• freeswitch/trunk/src/switch_log.c

Diff

--- freeswitch/trunk/src/include/switch_log.h	2009-08-18 18:24:31 UTC (rev 14555)
+++ freeswitch/trunk/src/include/switch_log.h	2009-08-18 18:32:11 UTC (rev 14556)
@@ -143,9 +143,6 @@
 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

--- freeswitch/trunk/src/switch_log.c	2009-08-18 18:24:31 UTC (rev 14555)
+++ freeswitch/trunk/src/switch_log.c	2009-08-18 18:32:11 UTC (rev 14556)
@@ -78,6 +78,49 @@
 #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,48 +522,7 @@
 	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:
  * mode:c