[sr-dev] git:master:5530fe31: lib: dtrie - removed duplicate check for same value

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 5530fe31fe89a4dfe9e17cbe56c0cd83cb8f45ab
URL: https://github.com/kamailio/kamailio/commit/5530fe31fe89a4dfe9e17cbe56c0cd83cb8f45ab

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2017-07-08T09:48:35+02:00

lib: dtrie - removed duplicate check for same value

---

Modified: src/lib/trie/dtrie.c

---

Diff:  https://github.com/kamailio/kamailio/commit/5530fe31fe89a4dfe9e17cbe56c0cd83cb8f45ab.diff
Patch: https://github.com/kamailio/kamailio/commit/5530fe31fe89a4dfe9e17cbe56c0cd83cb8f45ab.patch

---

diff --git a/src/lib/trie/dtrie.c b/src/lib/trie/dtrie.c
index 3ec65074af..ab3682e2a1 100644
--- a/src/lib/trie/dtrie.c
+++ b/src/lib/trie/dtrie.c
@@ -100,7 +100,8 @@ void dtrie_delete(struct dtrie_node_t *root, struct dtrie_node_t *node,
 }
 
 
-void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload, const unsigned int branches)
+void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload,
+		const unsigned int branches)
 {
 	if ((root!=NULL) && (*root!=NULL)) {
 		dtrie_delete(*root, *root, delete_payload, branches);
@@ -119,13 +120,13 @@ void dtrie_clear(struct dtrie_node_t *root, dt_delete_func_t delete_payload,
 }
 
 
-int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned int numberlen,
+int dtrie_insert(struct dtrie_node_t *root, const char *number,
+		const unsigned int numberlen,
 		void *data, const unsigned int branches)
 {
 	struct dtrie_node_t *node = root;
 	unsigned char digit, i=0;
 
-	if (node == NULL) return -1;
 	if (root == NULL) return -1;
 	if (number == NULL) return -1;
 
@@ -151,7 +152,9 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i
 				return -1;
 			}
 
-			LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]);
+			LM_DBG("allocate %lu bytes for node at %p\n",
+					(long unsigned)sizeof(struct dtrie_node_t),
+					node->child[digit]);
 			memset(node->child[digit], 0, sizeof(struct dtrie_node_t));
 
 			node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches);
@@ -174,7 +177,8 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i
 }
 
 
-unsigned int dtrie_size(const struct dtrie_node_t *root, const unsigned int branches)
+unsigned int dtrie_size(const struct dtrie_node_t *root,
+		const unsigned int branches)
 {
 	unsigned int i, sum = 0;
 
@@ -188,7 +192,8 @@ unsigned int dtrie_size(const struct dtrie_node_t *root, const unsigned int bran
 }
 
 
-unsigned int dtrie_loaded_nodes(const struct dtrie_node_t *root, const unsigned int branches)
+unsigned int dtrie_loaded_nodes(const struct dtrie_node_t *root,
+		const unsigned int branches)
 {
 	unsigned int i, sum = 0;
 
@@ -204,7 +209,8 @@ unsigned int dtrie_loaded_nodes(const struct dtrie_node_t *root, const unsigned
 }
 
 
-unsigned int dtrie_leaves(const struct dtrie_node_t *root, const unsigned int branches)
+unsigned int dtrie_leaves(const struct dtrie_node_t *root,
+		const unsigned int branches)
 {
 	unsigned int i, sum = 0, leaf = 1;
 
@@ -222,13 +228,13 @@ unsigned int dtrie_leaves(const struct dtrie_node_t *root, const unsigned int br
 
 
 void **dtrie_longest_match(struct dtrie_node_t *root, const char *number,
-		const unsigned int numberlen, int *nmatchptr, const unsigned int branches)
+		const unsigned int numberlen, int *nmatchptr,
+		const unsigned int branches)
 {
 	struct dtrie_node_t *node = root;
 	unsigned char digit, i = 0;
 	void **ret = NULL;
 
-	if (node == NULL) return NULL;
 	if (root == NULL) return NULL;
 	if (number == NULL) return NULL;