Minor code cleanup

This commit is contained in:
Luca Deri
2015-05-18 16:09:57 +02:00
parent 66394ba05e
commit 079a42c752
4 changed files with 11 additions and 11 deletions
+2 -2
View File
@@ -49,8 +49,8 @@
#endif
#include "ndpi_content_match.c.inc"
#include "third_party/include/patricia.h"
#include "third_party/src/patricia.c"
#include "third_party/include/ndpi_patricia.h"
#include "third_party/src/ndpi_patricia.c"
#ifdef WIN32
/* http://social.msdn.microsoft.com/Forums/uk/vcgeneral/thread/963aac07-da1a-4612-be4a-faac3f1d65ca */
+1 -1
View File
@@ -246,7 +246,7 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
j++, i++;
}
if(a_record != 0) {
if(a_record[0] != 0) {
char a_buf[32];
int i;
+5 -5
View File
@@ -1,5 +1,5 @@
/*
* $Id: patricia.h,v 1.6 2005/12/07 20:53:01 dplonka Exp $
* $Id: ndpi_patricia.h,v 1.6 2005/12/07 20:53:01 dplonka Exp $
* Dave Plonka <plonka@doit.wisc.edu>
*
* This product includes software developed by the University of Michigan,
@@ -7,7 +7,7 @@
*
* This file had been called "radix.h" in the MRT sources.
*
* I renamed it to "patricia.h" since it's not an implementation of a general
* I renamed it to "ndpi_patricia.h" since it's not an implementation of a general
* radix trie. Also, pulled in various requirements from "mrt.h" and added
* some other things it could be used as a standalone API.
@@ -38,8 +38,8 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _PATRICIA_H
#define _PATRICIA_H
#ifndef _NDPI_PATRICIA_H
#define _NDPI_PATRICIA_H
#ifndef WIN32
#define PATRICIA_IPV6 HAVE_IPV6
@@ -189,7 +189,7 @@ void ndpi_patricia_process (patricia_tree_t *patricia, void_fn2_t func);
} \
} while (0)
#endif /* _PATRICIA_H */
#endif /* _NDPI_PATRICIA_H */
/*************************
+3 -3
View File
@@ -58,7 +58,7 @@
#define assert(a) ;
#endif /* __KERNEL__ */
#include "patricia.h"
#include "ndpi_patricia.h"
#ifdef __KERNEL__
@@ -196,7 +196,7 @@ ndpi_my_inet_pton (int af, const char *src, void *dst)
* thread safe and (almost) re-entrant implementation
*/
char *
ndpi_ndpi_prefix_toa2x (prefix_t *prefix, char *buff, int with_len)
ndpi_prefix_toa2x (prefix_t *prefix, char *buff, int with_len)
{
if(prefix == NULL)
return ((char*)"(Null)");
@@ -257,7 +257,7 @@ ndpi_ndpi_prefix_toa2x (prefix_t *prefix, char *buff, int with_len)
char *
ndpi_prefix_toa2 (prefix_t *prefix, char *buff)
{
return (ndpi_ndpi_prefix_toa2x (prefix, buff, 0));
return (ndpi_prefix_toa2x (prefix, buff, 0));
}
/* ndpi_prefix_toa