Rename FILTER_OBJECT to MXS_FILTER_OBJECT

Other clarifications to follow.

include/maxscale/filter.h

@@ -61,7 +61,7 @@ typedef void *FILTER;
  *
  * @see load_module
  */
-typedef struct filter_object
+typedef struct mxs_filter_object
 {
     FILTER  *(*createInstance)(const char *name,
                               char **options,
@@ -76,10 +76,10 @@ typedef struct filter_object
     void     (*diagnostics)(FILTER *instance, void *fsession, DCB *dcb);
     uint64_t (*getCapabilities)(void);
     void     (*destroyInstance)(FILTER *instance);
-} FILTER_OBJECT;
+} MXS_FILTER_OBJECT;
 
 /**
- * The filter API version. If the FILTER_OBJECT structure or the filter API
+ * The filter API version. If the MXS_FILTER_OBJECT structure or the filter API
  * is changed these values must be updated in line with the rules in the
  * file modinfo.h.
  */
@@ -96,7 +96,7 @@ typedef struct filter_def
     char **options;                /**< The options set for this filter */
     CONFIG_PARAMETER *parameters; /**< The filter parameters */
     FILTER filter;                 /**< The runtime filter */
-    FILTER_OBJECT *obj;            /**< The "MODULE_OBJECT" for the filter */
+    MXS_FILTER_OBJECT *obj;            /**< The "MODULE_OBJECT" for the filter */
     SPINLOCK spin;                 /**< Spinlock to protect the filter definition */
     struct filter_def *next;       /**< Next filter in the chain of all filters */
 } FILTER_DEF;

include/maxscale/filter.hh

@@ -306,12 +306,12 @@ public:
         MXS_EXCEPTION_GUARD(delete pFilter);
     }
 
-    static FILTER_OBJECT s_object;
+    static MXS_FILTER_OBJECT s_object;
 };
 
 
 template<class FilterType, class FilterSessionType>
-FILTER_OBJECT Filter<FilterType, FilterSessionType>::s_object =
+MXS_FILTER_OBJECT Filter<FilterType, FilterSessionType>::s_object =
 {
     &Filter<FilterType, FilterSessionType>::createInstance,
     &Filter<FilterType, FilterSessionType>::newSession,

include/maxscale/modinfo.h

@@ -184,7 +184,7 @@ typedef struct mxs_module
  * MXS_MODULE* MXS_CREATE_MODULE()
  * {
  *     // Module specific API implementation
- *    static FILTER_OBJECT my_object = { ... };
+ *    static MXS_FILTER_OBJECT my_object = { ... };
  *
  *     // An implementation of the MXS_MODULE structure
  *    static MXS_MODULE info = { ... };

server/modules/filter/ccrfilter/ccrfilter.c

@@ -101,7 +101,7 @@ typedef struct
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/dbfwfilter/dbfwfilter.c

@@ -805,7 +805,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
 
     modulecmd_register_command("dbfwfilter", "rules", dbfw_show_rules, 2, args_rules_show);
 
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/hintfilter/hintfilter.c

@@ -42,7 +42,7 @@ static uint64_t getCapabilities(void);
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/luafilter/luafilter.c

@@ -74,7 +74,7 @@ static uint64_t getCapabilities(void);
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/maxrows/maxrows.c

@@ -66,7 +66,7 @@ static uint64_t getCapabilities(void);
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT object =
+    static MXS_FILTER_OBJECT object =
     {
         createInstance,
         newSession,

server/modules/filter/mqfilter/mqfilter.c

@@ -256,7 +256,7 @@ static const MXS_ENUM_VALUE trigger_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/namedserverfilter/namedserverfilter.c

@@ -90,7 +90,7 @@ static const MXS_ENUM_VALUE option_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/qlafilter/qlafilter.c

@@ -169,7 +169,7 @@ static const MXS_ENUM_VALUE log_data_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/regexfilter/regexfilter.c

@@ -99,7 +99,7 @@ static const MXS_ENUM_VALUE option_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/tee/tee.c

@@ -304,7 +304,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
     spinlock_init(&debug_lock);
 #endif
 
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/testfilter/testfilter.c

@@ -71,7 +71,7 @@ typedef struct
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/topfilter/topfilter.c

@@ -133,7 +133,7 @@ static const MXS_ENUM_VALUE option_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,

server/modules/filter/tpmfilter/tpmfilter.c

@@ -143,7 +143,7 @@ typedef struct
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,