Adding namespace to logging headers.

source/authentication/udaClientSSL.cpp

@@ -15,6 +15,7 @@
 using namespace uda::client_server;
 using namespace uda::client;
 using namespace uda::authentication;
+using namespace uda::logging;
 
 static bool g_sslDisabled = true; // Default state is not SSL authentication
 static int g_sslProtocol = 0;     // The default server host name has the SSL protocol name prefix or

source/authentication/udaServerSSL.cpp

@@ -21,6 +21,7 @@
 
 using namespace uda::client_server;
 using namespace uda::server;
+using namespace uda::logging;
 
 /*
 Note on initialisation:

source/c_api/accAPI.cpp

@@ -33,6 +33,7 @@
 
 using namespace uda::client_server;
 using namespace uda::client;
+using namespace uda::logging;
 
 USERDEFINEDTYPE* udaGetUserDefinedType(int handle);
 USERDEFINEDTYPELIST* udaGetUserDefinedTypeList(int handle);

source/c_api/clientAPI.cpp

@@ -16,6 +16,7 @@
 
 using namespace uda::client_server;
 using namespace uda::client;
+using namespace uda::logging;
 
 int udaClientAPI(const char* file, const char* signal, int pass, int exp_number)
 {

source/c_api/clientMDS.cpp

@@ -6,6 +6,7 @@
 
 using namespace uda::client_server;
 using namespace uda::client;
+using namespace uda::logging;
 
 /**
  * Reads the Requested Data

source/c_api/udaGetAPI.cpp

@@ -36,6 +36,7 @@
 
 using namespace uda::client_server;
 using namespace uda::client;
+using namespace uda::logging;
 
 typedef struct {
     int id;     // Thread identifier assigned by the application

source/c_api/udaPutAPI.cpp

@@ -32,6 +32,7 @@
 
 using namespace uda::client_server;
 using namespace uda::client;
+using namespace uda::logging;
 
 int udaPutListAPI(const char* putInstruction, PUTDATA_BLOCK_LIST* inPutDataBlockList)
 {

source/client/clientXDRStream.cpp

@@ -14,6 +14,8 @@
 using namespace uda::authentication;
 #endif
 
+using namespace uda::logging;
+
 std::pair<XDR*, XDR*> uda::client::clientCreateXDRStream()
 {
     static XDR client_input = {};

source/client/closedown.cpp

@@ -28,6 +28,7 @@ using namespace uda::authentication;
 #endif
 
 using namespace uda::client;
+using namespace uda::logging;
 
 int uda::client::closedown(ClosedownType type, uda::client_server::SOCKETLIST* socket_list, XDR* client_input,
                            XDR* client_output, bool* reopen_logs)

source/client/connection.cpp

@@ -64,6 +64,7 @@
 using namespace uda::client_server;
 using namespace uda::client;
 using namespace uda::authentication;
+using namespace uda::logging;
 
 static int client_socket = -1;
 static SOCKETLIST client_socketlist; // List of open sockets

source/client/getEnvironment.cpp

@@ -5,6 +5,8 @@
 
 #include "logging/logging.h"
 
+using namespace uda::logging;
+
 bool env_host = true; // User can change these before startup so flag to the getEnvironment function
 bool env_port = true;
 

source/client/startup.cpp

@@ -26,6 +26,7 @@
 
 using namespace uda::client_server;
 using namespace uda::client;
+using namespace uda::logging;
 
 int uda::client::udaStartup(int reset, CLIENT_FLAGS* client_flags, bool* reopen_logs)
 {

source/client/udaClient.cpp

@@ -37,6 +37,7 @@ using namespace uda::authentication;
 
 using namespace uda::client_server;
 using namespace uda::client;
+using namespace uda::logging;
 
 //------------------------------------------------ Static Globals ------------------------------------------------------
 

source/client/udaClientHostList.cpp

@@ -16,9 +16,10 @@
 #endif
 
 #include "client/udaClientHostList.h"
-#include "clientserver/stringUtils.h"
 #include "logging/logging.h"
 
+using namespace uda::logging;
+
 static std::vector<uda::client_server::HostData> g_host_list = {};
 
 void uda::client::udaClientFreeHostList()

source/client2/client.cpp

@@ -20,6 +20,7 @@
 #include "uda/client.h"
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 namespace
 {

source/client2/client_environment.cpp

@@ -3,6 +3,8 @@
 #include <cstdlib>
 #include <fmt/format.h>
 
+using namespace uda::logging;
+
 uda::client_server::Environment uda::client::load_environment(bool* env_host, bool* env_port)
 {
     char* env = nullptr;

source/client2/client_xdr_stream.cpp

@@ -14,6 +14,8 @@
 using namespace uda::authentication;
 #endif
 
+using namespace uda::logging;
+
 std::pair<XDR*, XDR*> uda::client::createXDRStream(IoData* io_data)
 {
     static XDR client_input = {};

source/client2/closedown.cpp

@@ -10,6 +10,8 @@
 using namespace uda::authentication;
 #endif
 
+using namespace uda::logging;
+
 int uda::client::closedown(ClosedownType type, Connection* connection, XDR* client_input, XDR* client_output,
                            bool* reopen_logs, bool* env_host, bool* env_port)
 {

source/client2/connection.cpp

@@ -61,6 +61,7 @@ using namespace uda::authentication;
 #define PORT_STRING 64
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 int uda::client::Connection::open()
 {

source/client2/host_list.cpp

@@ -13,9 +13,10 @@
 #endif
 
 #include "client/udaClientHostList.h"
-#include "clientserver/stringUtils.h"
 #include "logging/logging.h"
 
+using namespace uda::logging;
+
 const uda::client_server::HostData* uda::client::HostList::find_by_alias(std::string_view alias) const
 {
     for (const auto& data : hosts_) {

source/clientserver/allocData.cpp

@@ -16,6 +16,8 @@
 #include "initStructs.h"
 #include "udaErrors.h"
 
+using namespace uda::logging;
+
 /**
  * Generic function to (Re)Allocate Memory for a typed Array
  * @param data_type

source/clientserver/errorLog.cpp

@@ -7,6 +7,8 @@
 #include "logging/logging.h"
 #include "uda/client.h"
 
+using namespace uda::logging;
+
 static std::vector<uda::client_server::UDA_ERROR> udaerrorstack;
 
 int udaNumErrors(void)

source/clientserver/expand_path.cpp

@@ -59,6 +59,7 @@ void expandFilePath(char* path)
 #  define MAXPATHSUBSLENGTH 256
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 /**
  * The workstation (client host) name is obtained using the operating system command 'hostname'.

source/clientserver/makeRequestBlock.cpp

@@ -37,6 +37,7 @@
 #define MAXREQDEPTH 4  // Maximum number of Device Name to Server Protocol and Host substitution
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 static void extract_function_name(const char* str, REQUEST_DATA* request);
 

source/clientserver/make_request_block.cpp

@@ -10,6 +10,7 @@
 
 using namespace uda::client_server;
 using namespace uda::plugins;
+using namespace uda::logging;
 
 static const boost::regex SOURCE_RE(
     R"(^(?<device>(?:[a-z]+::)*)(((?<pulse>[0-9]+)(\/(?<pass>[0-9a-z]+))?)|(?<path>\/[a-z0-9\/\.]+)|((?<function>[a-z]+)\((?<args>.*)\)))$)",

source/clientserver/nameValueSubstitution.cpp

@@ -17,6 +17,7 @@
 #include <fmt/format.h>
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 static void embedded_value_substitution(NAMEVALUELIST* nameValueList);
 

source/clientserver/parseXML.cpp

@@ -22,13 +22,13 @@
 #include "logging/logging.h"
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 #ifndef NOXMLPARSER
 
 #  include "clientserver/errorLog.h"
 #  include "clientserver/parseOperation.h"
 #  include "clientserver/stringUtils.h"
-#  include <uda/types.h>
 
 static double deScale(char* scale);
 static void parse_target_value(xmlDocPtr doc, xmlNodePtr cur, const char* target, double* value);

source/clientserver/printStructs.cpp

@@ -6,9 +6,9 @@
 
 #include "clientserver/errorLog.h"
 #include "logging/logging.h"
-#include <uda/types.h>
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 void uda::client_server::printRequestData(REQUEST_DATA str)
 {

source/clientserver/protocol.cpp

@@ -25,7 +25,6 @@
 
 #include "logging/logging.h"
 #include <cstdlib>
-#include <uda/types.h>
 
 #include "allocData.h"
 #include "compressDim.h"
@@ -40,6 +39,7 @@
 #endif
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 void uda::client_server::setSelectParms(int fd, fd_set* rfds, struct timeval* tv, int* server_tot_block_time)
 {

source/clientserver/protocol2.cpp

@@ -40,6 +40,7 @@
 #include "udaErrors.h"
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 static int handle_request_block(XDR* xdrs, int direction, const void* str, int protocolVersion);
 static int handle_data_block(XDR* xdrs, int direction, const void* str, int protocolVersion);

source/clientserver/protocolXML.cpp

@@ -72,6 +72,7 @@
 #include "xdrlib.h"
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 int uda::client_server::protocolXML(XDR* xdrs, int protocol_id, int direction, int* token, LOGMALLOCLIST* logmalloclist,
                                     USERDEFINEDTYPELIST* userdefinedtypelist, void* str, int protocolVersion,

source/clientserver/protocolXML2.cpp

@@ -85,6 +85,7 @@
 #define PARTBLOCKOUTPUT 3
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 extern "C" {
 

source/clientserver/protocolXML2Put.cpp

@@ -17,6 +17,7 @@
 #endif
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 static int recursiveDepthPut = 0; // Keep count of recursive calls
 

source/clientserver/readXDRFile.cpp

@@ -13,6 +13,7 @@
 #define MAXDOLOOPLIMIT 500 // ~50MB file
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 int uda::client_server::sendXDRFile(XDR* xdrs, const char* xdrfile)
 {

source/clientserver/udaStructs.cpp

@@ -4,6 +4,8 @@
 
 #include <uda/types.h>
 
+using namespace uda::logging;
+
 void uda::client_server::freePutDataBlockList(PutDataBlockList* putDataBlockList)
 {
     if (putDataBlockList->putDataBlock != nullptr && putDataBlockList->blockListSize > 0) {

source/clientserver/xdrlib.cpp

@@ -21,6 +21,7 @@
 #include "structures/struct.h"
 
 using namespace uda::client_server;
+using namespace uda::logging;
 
 //-----------------------------------------------------------------------
 // Test version's type passing capability

source/logging/accessLog.cpp

@@ -33,7 +33,7 @@
 
 using namespace uda::client_server;
 
-unsigned int countDataBlockListSize(const DATA_BLOCK_LIST* data_block_list, CLIENT_BLOCK* client_block)
+unsigned int uda::logging::countDataBlockListSize(const DATA_BLOCK_LIST* data_block_list, CLIENT_BLOCK* client_block)
 {
     unsigned int total = 0;
     for (int i = 0; i < data_block_list->count; ++i) {
@@ -42,7 +42,7 @@ unsigned int countDataBlockListSize(const DATA_BLOCK_LIST* data_block_list, CLIE
     return total;
 }
 
-unsigned int countDataBlockSize(const DATA_BLOCK* data_block, CLIENT_BLOCK* client_block)
+unsigned int uda::logging::countDataBlockSize(const DATA_BLOCK* data_block, CLIENT_BLOCK* client_block)
 {
     int factor;
     DIMS dim;
@@ -101,8 +101,8 @@ unsigned int countDataBlockSize(const DATA_BLOCK* data_block, CLIENT_BLOCK* clie
 
 #if defined(SERVERBUILD) || defined(FATCLIENT)
 
-void udaAccessLog(int init, CLIENT_BLOCK client_block, REQUEST_BLOCK request_block, SERVER_BLOCK server_block,
-                  unsigned int total_datablock_size)
+void uda::logging::udaAccessLog(int init, CLIENT_BLOCK client_block, REQUEST_BLOCK request_block,
+                                SERVER_BLOCK server_block, unsigned int total_datablock_size)
 {
     int err = 0;
 

source/logging/accessLog.h

@@ -1,26 +1,21 @@
-#ifndef UDA_LOGGING_ACCESSLOG_H
-#define UDA_LOGGING_ACCESSLOG_H
+#pragma once
 
 #include "clientserver/udaStructs.h"
 
 #define HOSTNAMELENGTH 20
 #define DATELENGTH 27
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+namespace uda::logging
+{
 
 unsigned int countDataBlockListSize(const uda::client_server::DATA_BLOCK_LIST* data_block_list,
                                     uda::client_server::CLIENT_BLOCK* client_block);
+
 unsigned int countDataBlockSize(const uda::client_server::DATA_BLOCK* data_block,
                                 uda::client_server::CLIENT_BLOCK* client_block);
 
 void udaAccessLog(int init, uda::client_server::CLIENT_BLOCK client_block,
                   uda::client_server::REQUEST_BLOCK request_block, uda::client_server::SERVER_BLOCK server_block,
                   unsigned int total_datablock_size);
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif // UDA_LOGGING_ACCESSLOG_H
+} // namespace uda::logging