From eb884aeb6e234d24c00061d205422db8ff7d22b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Fri, 1 Sep 2017 12:28:35 +0300
Subject: [PATCH] MXS-1346: Rename users.cc to user.cc

user.cc better describes the contents of the file as it defines the User
class.
---
 server/modules/filter/dbfwfilter/CMakeLists.txt        | 2 +-
 server/modules/filter/dbfwfilter/dbfwfilter.cc         | 2 +-
 server/modules/filter/dbfwfilter/{users.cc => user.cc} | 2 +-
 server/modules/filter/dbfwfilter/{users.hh => user.hh} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename server/modules/filter/dbfwfilter/{users.cc => user.cc} (99%)
 rename server/modules/filter/dbfwfilter/{users.hh => user.hh} (100%)

diff --git a/server/modules/filter/dbfwfilter/CMakeLists.txt b/server/modules/filter/dbfwfilter/CMakeLists.txt
index 55aac5c87..13458091d 100644
--- a/server/modules/filter/dbfwfilter/CMakeLists.txt
+++ b/server/modules/filter/dbfwfilter/CMakeLists.txt
@@ -6,7 +6,7 @@ if(BISON_FOUND AND FLEX_FOUND)
   add_flex_bison_dependency(token ruleparser)
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
   include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-  add_library(dbfwfilter-core STATIC ${BISON_ruleparser_OUTPUTS} ${FLEX_token_OUTPUTS} rules.cc users.cc)
+  add_library(dbfwfilter-core STATIC ${BISON_ruleparser_OUTPUTS} ${FLEX_token_OUTPUTS} rules.cc user.cc)
   add_library(dbfwfilter SHARED dbfwfilter.cc)
   target_link_libraries(dbfwfilter maxscale-common MySQLCommon dbfwfilter-core)
   set_target_properties(dbfwfilter PROPERTIES VERSION "1.0.0")
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc
index 477375160..59077ec7d 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc
@@ -77,7 +77,7 @@
 #include <maxscale/alloc.h>
 
 #include "rules.hh"
-#include "users.hh"
+#include "user.hh"
 
 MXS_BEGIN_DECLS
 #include "ruleparser.yy.h"
diff --git a/server/modules/filter/dbfwfilter/users.cc b/server/modules/filter/dbfwfilter/user.cc
similarity index 99%
rename from server/modules/filter/dbfwfilter/users.cc
rename to server/modules/filter/dbfwfilter/user.cc
index 0248de761..552591e3c 100644
--- a/server/modules/filter/dbfwfilter/users.cc
+++ b/server/modules/filter/dbfwfilter/user.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "users.hh"
+#include "user.hh"
 
 #include <maxscale/alloc.h>
 #include <maxscale/modutil.h>
diff --git a/server/modules/filter/dbfwfilter/users.hh b/server/modules/filter/dbfwfilter/user.hh
similarity index 100%
rename from server/modules/filter/dbfwfilter/users.hh
rename to server/modules/filter/dbfwfilter/user.hh