removed mapi_errors.h from mapi.h (for internal use only - the user doesn't need it)

git-svn-id: file:///home/svn/mapi/trunk@558 8d5bb341-7cf1-0310-8cf6-ba355fef3186

agent/agent.c

@@ -12,6 +12,7 @@
 #include "mapi.h"
 #include "mapiipc.h"
 #include "parseconf.h"
+#include "mapi_errors.h"
 #include "mapilibhandler.h"
 
 #define MAXPENDING 500    /* Maximum outstanding connection requests */

fhelp.c

@@ -13,8 +13,9 @@
 #include "mapidevices.h"
 #include "debug.h"
 #include "mapidflib.h"
+#include "mapi_errors.h"
 
-#define TIME_M 257698037760ULL
+#define TIME_M 25769803760ULL
 #define TIME_S 4294967296ULL
 #define TIME_MS 4294967
 #define TIME_US 4294

mapi.h

@@ -6,8 +6,6 @@
 #include <syslog.h>
 #define PAPI 10
 
-#include "mapi_errors.h"
-
 #ifndef TRUE
 #define TRUE 1
 #endif

mapidlib.c

@@ -14,6 +14,7 @@
 #include "mapidevices.h"
 #include "debug.h"
 #include "printfstring.h"
+#include "mapi_errors.h"
 
 //Stores information about flows in mapidlib
 typedef struct mapidlibflow {

mapilibhandler.c

@@ -6,6 +6,7 @@
 
 #include "mapilibhandler.h"
 #include "debug.h"
+#include "mapi_errors.h"
 
 typedef struct libinfo {
   mapidflib_functionlist_t* functions;

mapinicdrv.c

@@ -16,6 +16,7 @@
 #include "mapidrv.h"
 #include "mapidlib.h"
 
+#include "mapi_errors.h"
 #include "mapidevices.h"
 #include "flist.h"
 #include "debug.h"

mapipktdecoder.c

@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mapi_errors.h"
 #include "mapi.h"
 #include "mapipktdecoder.h"
 

stdlib/binop.c

@@ -6,6 +6,7 @@
 #include "mapidflib.h"
 #include "mapidlib.h"
 #include "mapidevices.h"
+#include "mapi_errors.h"
 #include "mapid.h"
 #include "fhelp.h"
 #include "binop.h"

stdlib/bpffilter.c

@@ -11,6 +11,7 @@
 #include "mapidevices.h"
 #include "mapid.h"
 #include "fhelp.h"
+#include "mapi_errors.h"
 
 #define BPF_FILTER "BPF_FILTER"
 

stdlib/bucket.c

@@ -7,6 +7,7 @@
 #include "mapidflib.h"
 #include "mapidlib.h"
 #include "mapidevices.h"
+#include "mapi_errors.h"
 #include "mapid.h"
 #include "fhelp.h"
 #include "bucket.h"

stdlib/dist.c

@@ -11,6 +11,7 @@
 #include "fhelp.h"
 #include "debug.h"
 #include "dist.h"
+#include "mapi_errors.h"
 
 int dist_old = 1;
 

stdlib/hash.c

@@ -11,6 +11,7 @@
 #include <netinet/ip_icmp.h>	/* struct icmp */
 #include <assert.h>
 #include <pcap.h>               /* DLT_EN10MB */
+#include "mapi_errors.h"
 
 #include "mapidflib.h"
 #include "mapidlib.h"

stdlib/hashsamp.c

@@ -8,6 +8,7 @@
 #include "mapidflib.h"
 #include "mapidlib.h"
 #include "mapidevices.h"
+#include "mapi_errors.h"
 #include "mapid.h"
 #include "fhelp.h"
 #include "hashsamp.h"

stdlib/pktinfo.c

@@ -6,6 +6,7 @@
 #include "mapidflib.h"
 #include "mapidlib.h"
 #include "mapidevices.h"
+#include "mapi_errors.h"
 #include "mapid.h"
 #include "fhelp.h"
 #include "pktinfo.h"

stdlib/regexp.c

@@ -7,6 +7,7 @@
 #include "mapidevices.h"
 #include "mapid.h"
 #include "fhelp.h"
+#include "mapi_errors.h"
 #include <pcre.h>
 
 struct mapid_regexp {

stdlib/res2file.c

@@ -9,6 +9,7 @@
 #include "mapidflib.h"
 #include "mapidlib.h"
 #include "mapidevices.h"
+#include "mapi_errors.h"
 #include "mapid.h"
 #include "fhelp.h"
 #include "res2file.h"

stdlib/startstop.c

@@ -6,6 +6,7 @@
 #include "mapidflib.h"
 #include "mapidlib.h"
 #include "mapidevices.h"
+#include "mapi_errors.h"
 #include "mapid.h"
 #include "fhelp.h"
 

stdlib/stats.c

@@ -6,6 +6,7 @@
 #include "mapidflib.h"
 #include "mapidlib.h"
 #include "mapidevices.h"
+#include "mapi_errors.h"
 #include "mapid.h"
 #include "fhelp.h"
 #include "stats.h"

stdlib/strsearch.c

@@ -11,6 +11,7 @@
 #include "debug.h"
 #include "mapiipc.h"
 #include "mstring.h"
+#include "mapi_errors.h"
 
 struct mapid_strsearch {
   unsigned char *str;   /* string to search for in payload (without '\0')*/

stdlib/threshold.c

@@ -14,6 +14,7 @@
 #include "mapidflib.h"
 #include "mapidlib.h"
 #include "mapidevices.h"
+#include "mapi_errors.h"
 #include "mapid.h"
 #include "fhelp.h"