From 6dc6d6280ab8c374eb79cc852963f234cec3b916 Mon Sep 17 00:00:00 2001
From: Esa Korhonen <esa.korhonen@mariadb.com>
Date: Fri, 20 Jan 2017 10:21:54 +0200
Subject: [PATCH] Rename some .c-files, removing gw-prefix

May require reconfiguring the build. Some "gw":s are still
remaining, at least in test files.
---
 include/maxscale/bitmask.h             | 2 +-
 include/maxscale/ssl.h                 | 2 +-
 server/core/CMakeLists.txt             | 2 +-
 server/core/{gwbitmask.c => bitmask.c} | 2 +-
 server/core/{gwdirs.c => paths.c}      | 0
 server/core/{gw_ssl.c => ssl.c}        | 4 ++--
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename server/core/{gwbitmask.c => bitmask.c} (99%)
 rename server/core/{gwdirs.c => paths.c} (100%)
 rename server/core/{gw_ssl.c => ssl.c} (99%)

diff --git a/include/maxscale/bitmask.h b/include/maxscale/bitmask.h
index 1a47c26fd..5db0d4e56 100644
--- a/include/maxscale/bitmask.h
+++ b/include/maxscale/bitmask.h
@@ -13,7 +13,7 @@
  */
 
 /**
- * @file gwbitmask.h An implementation of an arbitrarily long bitmask
+ * @file bitmask.h An implementation of an arbitrarily long bitmask
  *
  * @verbatim
  * Revision History
diff --git a/include/maxscale/ssl.h b/include/maxscale/ssl.h
index 4ce1acc84..2f5b3e59d 100644
--- a/include/maxscale/ssl.h
+++ b/include/maxscale/ssl.h
@@ -13,7 +13,7 @@
  */
 
 /**
- * @file gw_ssl.h
+ * @file ssl.h
  *
  * The SSL definitions for MaxScale
  *
diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index dadaeb5d9..98172e769 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(maxscale-common SHARED adminusers.c alloc.c authenticator.c atomic.c buffer.c config.c config_runtime.c dcb.c filter.c filter.cc externcmd.c gwbitmask.c gwdirs.c hashtable.c hint.c housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c memlog.c misc.c mlist.c modutil.c monitor.c queuemanager.c query_classifier.c poll.c random_jkiss.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c gw_ssl.c mysql_utils.c mysql_binlog.c modulecmd.c )
+add_library(maxscale-common SHARED adminusers.c alloc.c authenticator.c atomic.c buffer.c config.c config_runtime.c dcb.c filter.c filter.cc externcmd.c bitmask.c paths.c hashtable.c hint.c housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c memlog.c misc.c mlist.c modutil.c monitor.c queuemanager.c query_classifier.c poll.c random_jkiss.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c )
 
 target_link_libraries(maxscale-common ${MARIADB_CONNECTOR_LIBRARIES} ${LZMA_LINK_FLAGS} ${PCRE2_LIBRARIES} ${CURL_LIBRARIES} ssl pthread crypt dl crypto inih z rt m stdc++)
 
diff --git a/server/core/gwbitmask.c b/server/core/bitmask.c
similarity index 99%
rename from server/core/gwbitmask.c
rename to server/core/bitmask.c
index 0daf26e9b..e4e4f7118 100644
--- a/server/core/gwbitmask.c
+++ b/server/core/bitmask.c
@@ -17,7 +17,7 @@
 #include <maxscale/alloc.h>
 
 /**
- * @file gwbitmask.c  Implementation of bitmask operations for the gateway
+ * @file bitmask.c  Implementation of bitmask operations for the gateway
  *
  * GWBITMASK is a fixed size bitmask with space for 256 bits.
  *
diff --git a/server/core/gwdirs.c b/server/core/paths.c
similarity index 100%
rename from server/core/gwdirs.c
rename to server/core/paths.c
diff --git a/server/core/gw_ssl.c b/server/core/ssl.c
similarity index 99%
rename from server/core/gw_ssl.c
rename to server/core/ssl.c
index 1951fcd7b..744b71e14 100644
--- a/server/core/gw_ssl.c
+++ b/server/core/ssl.c
@@ -12,7 +12,7 @@
  */
 
 /**
- * @file gw_ssl.c  -  SSL generic functions
+ * @file ssl.c  -  SSL generic functions
  *
  * SSL is intended to be available in conjunction with a variety of protocols
  * on either the client or server side.
@@ -45,7 +45,7 @@
  *
  * @param dcb Request handler DCB connected to the client
  * @param is_capable Indicates if the client can handle SSL
- * @return 0 if ok, >0 if a problem - see return codes defined in gw_ssl.h
+ * @return 0 if ok, >0 if a problem - see return codes defined in ssl.h
  */
 int ssl_authenticate_client(DCB *dcb, bool is_capable)
 {