diff options
| author | Michele Campus <fci1908@gmail.com> | 2015-12-31 10:27:54 +0100 |
|---|---|---|
| committer | Michele Campus <fci1908@gmail.com> | 2015-12-31 10:27:54 +0100 |
| commit | a2c51a586ebae66da84d658dd53df60b3ad140a0 (patch) | |
| tree | da31f02c9847e5c9f32c2f3d92466e41656ac3d3 /src | |
| parent | 3aa506eb1b6ddf629b6c7c4f74060c52da6768e0 (diff) | |
| parent | 1b2702df24ec06fa2cc244b350d96fdb3e8dd9e5 (diff) | |
Merge pull request #132 from pavel-odintsov/dev
Made ndpi memory allocator type compatible with C++ on x686 platforms
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_api.h | 6 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h index c788dcb29..86192c1fb 100644 --- a/src/include/ndpi_api.h +++ b/src/include/ndpi_api.h @@ -45,8 +45,8 @@ extern "C" { u_int32_t ndpi_detection_get_sizeof_ndpi_id_struct(void); /* Public malloc/free */ - void* ndpi_malloc(unsigned long size); - void* ndpi_calloc(unsigned long count, unsigned long size); + void* ndpi_malloc(size_t size); + void* ndpi_calloc(unsigned long count, size_t size); void ndpi_free(void *ptr); void *ndpi_realloc(void *ptr, size_t old_size, size_t new_size); char *ndpi_strdup(const char *s); @@ -75,7 +75,7 @@ extern "C" { * @return the initialized detection module */ struct ndpi_detection_module_struct *ndpi_init_detection_module(u_int32_t ticks_per_second, - void* (*__ndpi_malloc)(unsigned long size), + void* (*__ndpi_malloc)(size_t size), void (*__ndpi_free)(void *ptr), ndpi_debug_function_ptr ndpi_debug_printf); diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index afff64e98..49d8f8a9f 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -196,7 +196,7 @@ u_int8_t ndpi_ips_match(u_int32_t src, u_int32_t dst, /* ****************************************** */ -static void *(*_ndpi_malloc)(unsigned long size); +static void *(*_ndpi_malloc)(size_t size); static void (*_ndpi_free)(void *ptr); /* ****************************************** */ @@ -290,12 +290,12 @@ static int removeDefaultPort(ndpi_port_range *range, /* ****************************************** */ -void* ndpi_malloc(unsigned long size) { return(_ndpi_malloc(size)); } +void* ndpi_malloc(size_t size) { return(_ndpi_malloc(size)); } /* ****************************************** */ -void* ndpi_calloc(unsigned long count, unsigned long size) { - unsigned long len = count*size; +void* ndpi_calloc(unsigned long count, size_t size) { + size_t len = count*size; void *p = ndpi_malloc(len); if(p) @@ -1638,7 +1638,7 @@ static int ndpi_add_host_ip_subprotocol(struct ndpi_detection_module_struct *ndp /* ******************************************************************** */ struct ndpi_detection_module_struct *ndpi_init_detection_module(u_int32_t ticks_per_second, - void* (*__ndpi_malloc)(unsigned long size), + void* (*__ndpi_malloc)(size_t size), void (*__ndpi_free)(void *ptr), ndpi_debug_function_ptr ndpi_debug_printf) { |