Code cleanup. (#1246)

ndpi_utils.c: use ndpi_malloc,ndpi_calloc,ndpi_free
genshin_impact.c, git.c, hpvirtgrp.c, http.c, z3950.c: removed "#include stdlib.h"

6 files changed, 10 insertions, 15 deletions

diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c
index 3a3c18aff..64e60800f 100644
--- a/src/lib/ndpi_utils.c
+++ b/src/lib/ndpi_utils.c
@@ -1891,17 +1891,17 @@ u_int32_t ndpi_quick_16_byte_hash(u_int8_t *in_16_bytes_long) {
 /* ******************************************************************** */
 
 ndpi_str_hash* ndpi_hash_alloc(u_int32_t max_num_entries) {
-  ndpi_str_hash *h = (ndpi_str_hash*)malloc(sizeof(ndpi_str_hash));
+  ndpi_str_hash *h = (ndpi_str_hash*)ndpi_malloc(sizeof(ndpi_str_hash));
 
   if(!h) return(NULL);
   if(max_num_entries < 1024) max_num_entries = 1024;
   if(max_num_entries > 10000000) max_num_entries = 10000000;
 
   h->max_num_entries = max_num_entries, h->num_buckets = max_num_entries/2;
-  h->buckets = (struct ndpi_str_hash_info**)calloc(sizeof(struct ndpi_str_hash_info*), h->num_buckets);
+  h->buckets = (struct ndpi_str_hash_info**)ndpi_calloc(sizeof(struct ndpi_str_hash_info*), h->num_buckets);
 
   if(h->buckets == NULL) {
-    free(h);
+    ndpi_free(h);
     return(NULL);
   } else
     return(h);
@@ -1918,14 +1918,14 @@ void ndpi_hash_free(ndpi_str_hash *h) {
     while(head != NULL) {
       struct ndpi_str_hash_info *next = head->next;
 
-      free(head->key);
-      free(head);
+      ndpi_free(head->key);
+      ndpi_free(head);
       head = next;
     }
   }
 
-  free(h->buckets);
-  free(h);
+  ndpi_free(h->buckets);
+  ndpi_free(h);
 }
 
 /* ******************************************************************** */
@@ -1974,12 +1974,12 @@ int ndpi_hash_add_entry(ndpi_str_hash *h, char *key, u_int8_t key_len, u_int8_t
 
   if(rc == -1) {
     /* Not found */
-    struct ndpi_str_hash_info *e = (struct ndpi_str_hash_info*)malloc(sizeof(struct ndpi_str_hash_info));
+    struct ndpi_str_hash_info *e = (struct ndpi_str_hash_info*)ndpi_malloc(sizeof(struct ndpi_str_hash_info));
 
     if(e == NULL)
       return(-2);
-
-    if((e->key = (char*)malloc(key_len)) == NULL)
+    
+    if((e->key = (char*)ndpi_malloc(key_len)) == NULL)
       return(-3);
 
     memcpy(e->key, key, key_len);
diff --git a/src/lib/protocols/genshin_impact.c b/src/lib/protocols/genshin_impact.c
index 9c4b59e55..4144cecef 100644
--- a/src/lib/protocols/genshin_impact.c
+++ b/src/lib/protocols/genshin_impact.c
@@ -22,7 +22,6 @@
 
 #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_GENSHIN_IMPACT
 
-#include <stdlib.h>
 #include "ndpi_api.h"
 
 
diff --git a/src/lib/protocols/git.c b/src/lib/protocols/git.c
index 8e321e731..05f22ff18 100644
--- a/src/lib/protocols/git.c
+++ b/src/lib/protocols/git.c
@@ -22,7 +22,6 @@
 
 #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_GIT
 
-#include <stdlib.h>
 #include "ndpi_api.h"
 
 
diff --git a/src/lib/protocols/hpvirtgrp.c b/src/lib/protocols/hpvirtgrp.c
index a4c5dee0a..a2b977a48 100644
--- a/src/lib/protocols/hpvirtgrp.c
+++ b/src/lib/protocols/hpvirtgrp.c
@@ -22,7 +22,6 @@
 
 #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HPVIRTGRP
 
-#include <stdlib.h>
 #include "ndpi_api.h"
 
 
diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c
index 79110a531..15cef3184 100644
--- a/src/lib/protocols/http.c
+++ b/src/lib/protocols/http.c
@@ -26,7 +26,6 @@
 #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HTTP
 
 #include "ndpi_api.h"
-#include <stdlib.h>
 
 static const char* binary_file_mimes_e[] = { "exe", NULL };
 static const char* binary_file_mimes_v[] = { "vnd.ms-cab-compressed", "vnd.microsoft.portable-executable", NULL };
diff --git a/src/lib/protocols/z3950.c b/src/lib/protocols/z3950.c
index ff672a113..0c95e5d85 100644
--- a/src/lib/protocols/z3950.c
+++ b/src/lib/protocols/z3950.c
@@ -22,7 +22,6 @@
 
 #define NDPI_CURRENT_PROTO NDPI_PROTOCOL_Z3950
 
-#include <stdlib.h>
 #include "ndpi_api.h"
 
 /* https://github.com/wireshark/wireshark/blob/master/epan/dissectors/asn1/z3950/z3950.asn */