complete rename of address2 to address

src/Makefile.am

@@ -39,7 +39,7 @@ detect-metadata.c detect-metadata.h \
 detect-msg.c detect-msg.h \
 detect-flow.c detect-flow.h \
 detect-dsize.c detect-dsize.h \
-detect-address2.c detect-address2.h \
+detect-address.c detect-address.h \
 util-mpm-trie.c util-mpm-trie.h \
 util-mpm.c util-mpm.h \
 util-binsearch.c util-binsearch.h \

src/detect-address.h

@@ -1,8 +1,8 @@
-#ifndef __DETECT_ADDRESS2_H__
+#ifndef __DETECT_ADDRESS_H__
-#define __DETECT_ADDRESS2_H__
+#define __DETECT_ADDRESS_H__
 
 /* prototypes */
-void DetectAddress2Register (void);
+void DetectAddressRegister (void);
 
-#endif /* __DETECT_ADDRESS2_H__ */
+#endif /* __DETECT_ADDRESS_H__ */
 

src/detect.c

@@ -7,7 +7,7 @@
 #include "detect.h"
 #include "flow.h"
 
-#include "detect-address2.h"
+#include "detect-address.h"
 #include "detect-content.h"
 #include "detect-uricontent.h"
 #include "detect-pcre.h"
@@ -701,7 +701,7 @@ void SigTableSetup(void) {
     DetectFlowRegister();
     DetectDsizeRegister();
     DetectFlowvarRegister();
-    DetectAddress2Register();
+    DetectAddressRegister();
 
     /* register the tests */
     u_int8_t i = 0;

src/detect.h

@@ -85,7 +85,6 @@ enum {
     DETECT_DSIZE,
     DETECT_FLOWVAR,
     DETECT_ADDRESS,
-    DETECT_ADDRESS2,
 
     /* make sure this stays last */
     DETECT_TBLSIZE,