updating references to header file locations for logging.h and errorL…

…og.h
ukaea · Jan 24, 2024 · 6c94a4e · 6c94a4e
1 parent 298c87d
commit 6c94a4e
Show file tree

Hide file tree

Showing 85 changed files with 135 additions and 135 deletions.
diff --git a/source/authentication/udaClientSSL.cpp b/source/authentication/udaClientSSL.cpp
@@ -9,8 +9,8 @@
 
 #  include <client/udaClientHostList.h>
 #  include <client/updateSelectParms.h>
-#  include <clientserver/errorLog.h>
-#  include <logging/logging.h>
+#  include <include/errorLog.h>
+#  include <include/logging.h>
 
 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

diff --git a/source/authentication/udaServerSSL.cpp b/source/authentication/udaServerSSL.cpp
@@ -11,8 +11,8 @@
 #  include <openssl/ssl.h>
 #  include <openssl/x509.h>
 
-#  include <clientserver/errorLog.h>
-#  include <logging/logging.h>
+#  include <include/errorLog.h>
+#  include <include/logging.h>
 #  include <server/writer.h>
 
 #  define VERIFY_DEPTH 4
@@ -582,4 +582,4 @@ int readUdaServerSSL(void* iohandle, char* buf, int count)
     return rc;
 }
 
-#endif // SERVERBUILD
+#endif // SERVERBUILD
diff --git a/source/c_api/accAPI.cpp b/source/c_api/accAPI.cpp
@@ -21,7 +21,7 @@
 #include "clientserver/stringUtils.h"
 #include "clientserver/xdrlib.h"
 #include "initStructs.h"
-#include "logging/logging.h"
+#include "include/logging.h"
 #include "struct.h"
 #include "version.h"
 

diff --git a/source/c_api/clientAPI.cpp b/source/c_api/clientAPI.cpp
@@ -7,9 +7,9 @@
 #  define strcasecmp _stricmp
 #endif
 
-#include "clientserver/errorLog.h"
+#include "include/errorLog.h"
 #include "initStructs.h"
-#include "logging/logging.h"
+#include "include/logging.h"
 
 #include "client.h"
 #include "client/makeClientRequestBlock.h"

diff --git a/source/c_api/clientMDS.cpp b/source/c_api/clientMDS.cpp
@@ -2,7 +2,7 @@
 
 #include "clientserver/protocol.h"
 #include "initStructs.h"
-#include "logging/logging.h"
+#include "include/logging.h"
 
 #include "client.h"
 #include "client/startup.h"

diff --git a/source/c_api/udaGetAPI.cpp b/source/c_api/udaGetAPI.cpp
@@ -14,10 +14,10 @@
 #  include <strings.h>
 #endif
 
-#include "clientserver/errorLog.h"
+#include "include/errorLog.h"
 #include "clientserver/printStructs.h"
 #include "initStructs.h"
-#include "logging/logging.h"
+#include "include/logging.h"
 
 #include "accAPI.h"
 #include "client.h"

diff --git a/source/c_api/udaPutAPI.cpp b/source/c_api/udaPutAPI.cpp
@@ -10,10 +10,10 @@
 #include "udaPutAPI.h"
 
 #include "clientserver/allocData.h"
-#include "clientserver/errorLog.h"
+#include "include/errorLog.h"
 #include "clientserver/printStructs.h"
 #include "initStructs.h"
-#include "logging/logging.h"
+#include "include/logging.h"
 
 #include "client/makeClientRequestBlock.h"
 #include "client/udaClient.h"

diff --git a/source/cache/fileCache.cpp b/source/cache/fileCache.cpp
@@ -52,7 +52,7 @@ int udaFileCacheWrite(const DATA_BLOCK* data_block, const REQUEST_BLOCK* request
 #  include <string>
 #  include <vector>
 
-#  include <clientserver/errorLog.h>
+#  include <include/errorLog.h>
 #  include <clientserver/stringUtils.h>
 #  include <sstream>
 

diff --git a/source/cache/memcache.cpp b/source/cache/memcache.cpp
@@ -52,11 +52,11 @@ DATA_BLOCK* uda::cache::cache_read(uda::cache::UdaCache* cache, const REQUEST_DA
 // needed for GCC 12.0 - do not delete
 #  include <algorithm>
 
-#  include <clientserver/errorLog.h>
+#  include <include/errorLog.h>
 #  include <clientserver/initStructs.h>
 #  include <clientserver/memstream.h>
 #  include <clientserver/xdrlib.h>
-#  include <logging/logging.h>
+#  include <include/logging.h>
 
 #  define UDA_CACHE_HOST "localhost" // Override these with environment variables with the same name
 #  define UDA_CACHE_PORT 11211

diff --git a/source/client/clientXDRStream.cpp b/source/client/clientXDRStream.cpp
@@ -4,7 +4,7 @@
 #include <rpc/rpc.h>
 
 #include "udaDefines.h"
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "connection.h"
 

diff --git a/source/client/closedown.cpp b/source/client/closedown.cpp
@@ -11,7 +11,7 @@
 
 #include "client.h"
 #include <client/udaClientHostList.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #ifdef FATCLIENT
 #  include <server/closeServerSockets.h>

diff --git a/source/client/connection.cpp b/source/client/connection.cpp
@@ -42,9 +42,9 @@
 
 #include "client.h"
 #include <client/udaClientHostList.h>
-#include <clientserver/errorLog.h>
+#include <include/errorLog.h>
 #include <clientserver/manageSockets.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "getEnvironment.h"
 #include "updateSelectParms.h"

diff --git a/source/client/generateErrors.cpp b/source/client/generateErrors.cpp
@@ -17,7 +17,7 @@
 
 #include "udaTypes.h"
 #include <clientserver/allocData.h>
-#include <clientserver/errorLog.h>
+#include <include/errorLog.h>
 
 #include "accAPI.h"
 

diff --git a/source/client/getEnvironment.cpp b/source/client/getEnvironment.cpp
@@ -3,7 +3,7 @@
 #include <cstdlib>
 #include <fmt/format.h>
 
-#include <logging/logging.h>
+#include <include/logging.h>
 
 bool env_host = true; // User can change these before startup so flag to the getEnvironment function
 bool env_port = true;

diff --git a/source/client/makeClientRequestBlock.cpp b/source/client/makeClientRequestBlock.cpp
@@ -24,12 +24,12 @@ Interprets the API arguments and assembles a Request data structure.
 
 #include "initStructs.h"
 #include "udaErrors.h"
-#include <clientserver/errorLog.h>
+#include <include/errorLog.h>
 #include <clientserver/expand_path.h>
 #include <clientserver/makeRequestBlock.h>
 #include <clientserver/stringUtils.h>
 #include <fmt/format.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 int makeRequestData(const char* data_object, const char* data_source, REQUEST_DATA* request)
 {

diff --git a/source/client/startup.cpp b/source/client/startup.cpp
@@ -18,8 +18,8 @@
 #include <cerrno>
 
 #include "udaErrors.h"
-#include <clientserver/errorLog.h>
-#include <logging/logging.h>
+#include <include/errorLog.h>
+#include <include/logging.h>
 
 #include "getEnvironment.h"
 #include "udaClient.h"

diff --git a/source/client/udaClient.cpp b/source/client/udaClient.cpp
@@ -13,11 +13,11 @@
 #include <cache/memcache.hpp>
 #include <client/connection.h>
 #include <client/getEnvironment.h>
-#include <clientserver/errorLog.h>
+#include <include/errorLog.h>
 #include <clientserver/printStructs.h>
 #include <clientserver/protocol.h>
 #include <clientserver/userid.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "accAPI.h"
 #include "closedown.h"

diff --git a/source/client/udaClientHostList.cpp b/source/client/udaClientHostList.cpp
@@ -17,7 +17,7 @@
 
 #include <client/udaClientHostList.h>
 #include <clientserver/stringUtils.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 static std::vector<HostData> g_host_list = {};
 

diff --git a/source/client2/client.cpp b/source/client2/client.cpp
@@ -13,13 +13,13 @@
 #include "udaTypes.h"
 #include <cache/fileCache.h>
 #include <clientserver/allocData.h>
-#include <clientserver/errorLog.h>
+#include <include/errorLog.h>
 #include <clientserver/printStructs.h>
 #include <clientserver/protocol.h>
 #include <clientserver/stringUtils.h>
 #include <clientserver/userid.h>
 #include <clientserver/xdrlib.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 namespace
 {

diff --git a/source/client2/client_environment.cpp b/source/client2/client_environment.cpp
@@ -1,7 +1,7 @@
 #include "client_environment.hpp"
 #include <cstdlib>
 #include <fmt/format.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 Environment uda::client::load_environment(bool* env_host, bool* env_port)
 {

diff --git a/source/client2/client_xdr_stream.cpp b/source/client2/client_xdr_stream.cpp
@@ -4,7 +4,7 @@
 #include <rpc/rpc.h>
 
 #include "udaDefines.h"
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "connection.hpp"
 

diff --git a/source/client2/closedown.cpp b/source/client2/closedown.cpp
@@ -1,6 +1,6 @@
 #include "closedown.hpp"
 
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "connection.hpp"
 

diff --git a/source/client2/connection.cpp b/source/client2/connection.cpp
@@ -40,9 +40,9 @@
 #  endif
 #endif
 
-#include <clientserver/errorLog.h>
+#include <include/errorLog.h>
 #include <clientserver/manageSockets.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "error_codes.h"
 #include "host_list.hpp"

diff --git a/source/client2/generate_errors.cpp b/source/client2/generate_errors.cpp
@@ -5,7 +5,7 @@
 
 #include "udaTypes.h"
 #include <clientserver/allocData.h>
-#include <clientserver/errorLog.h>
+#include <include/errorLog.h>
 
 #include "accAPI.h"
 #include "thread_client.hpp"

diff --git a/source/client2/host_list.cpp b/source/client2/host_list.cpp
@@ -14,7 +14,7 @@
 
 #include <client/udaClientHostList.h>
 #include <clientserver/stringUtils.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 const HostData* uda::client::HostList::find_by_alias(std::string_view alias) const
 {

diff --git a/source/client2/make_request_block.cpp b/source/client2/make_request_block.cpp
@@ -6,9 +6,9 @@
 
 #include "initStructs.h"
 #include "udaErrors.h"
-#include <clientserver/errorLog.h>
+#include <include/errorLog.h>
 #include <clientserver/expand_path.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 namespace
 {

diff --git a/source/clientserver/allocData.cpp b/source/clientserver/allocData.cpp
@@ -11,7 +11,7 @@
 #include "allocData.h"
 
 #include "udaTypes.h"
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "initStructs.h"
 #include "udaErrors.h"

diff --git a/source/clientserver/errorLog.cpp b/source/clientserver/errorLog.cpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include <clientserver/stringUtils.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 static std::vector<UDA_ERROR> udaerrorstack;
 

diff --git a/source/clientserver/expand_path.cpp b/source/clientserver/expand_path.cpp
@@ -27,7 +27,7 @@
 #include <vector>
 
 #include "udaErrors.h"
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "errorLog.h"
 #include "stringUtils.h"

diff --git a/source/clientserver/makeRequestBlock.cpp b/source/clientserver/makeRequestBlock.cpp
@@ -13,7 +13,7 @@
 #endif
 
 #include <fmt/format.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "errorLog.h"
 #include "parseXML.h"

diff --git a/source/clientserver/nameValueSubstitution.cpp b/source/clientserver/nameValueSubstitution.cpp
@@ -10,11 +10,11 @@
 
 #include "initStructs.h"
 #include "udaErrors.h"
-#include <clientserver/errorLog.h>
+#include <include/errorLog.h>
 #include <clientserver/makeRequestBlock.h>
 #include <clientserver/stringUtils.h>
 #include <fmt/format.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 static void embedded_value_substitution(NAMEVALUELIST* nameValueList);
 

diff --git a/source/clientserver/parseXML.cpp b/source/clientserver/parseXML.cpp
@@ -19,11 +19,11 @@
 #include <cstdlib>
 #include <sstream>
 
-#include <logging/logging.h>
+#include <include/logging.h>
 #ifndef NOXMLPARSER
 
 #  include "udaTypes.h"
-#  include <clientserver/errorLog.h>
+#  include <include/errorLog.h>
 #  include <clientserver/parseOperation.h>
 #  include <clientserver/stringUtils.h>
 

diff --git a/source/clientserver/printStructs.cpp b/source/clientserver/printStructs.cpp
@@ -5,8 +5,8 @@
 #include "printStructs.h"
 
 #include "udaTypes.h"
-#include <clientserver/errorLog.h>
-#include <logging/logging.h>
+#include <include/errorLog.h>
+#include <include/logging.h>
 
 void printRequestData(REQUEST_DATA str)
 {

diff --git a/source/clientserver/protocol.cpp b/source/clientserver/protocol.cpp
@@ -25,7 +25,7 @@
 
 #include "udaTypes.h"
 #include <cstdlib>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "allocData.h"
 #include "compressDim.h"

diff --git a/source/clientserver/protocol2.cpp b/source/clientserver/protocol2.cpp
@@ -26,7 +26,7 @@
 #include <cstdlib>
 
 #include "udaTypes.h"
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "allocData.h"
 #include "compressDim.h"

diff --git a/source/clientserver/protocolXML.cpp b/source/clientserver/protocolXML.cpp
@@ -60,7 +60,7 @@
 
 #include "struct.h"
 #include <fmt/format.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "errorLog.h"
 #include "protocol.h"

diff --git a/source/clientserver/protocolXML2.cpp b/source/clientserver/protocolXML2.cpp
@@ -58,7 +58,7 @@
 
 #include "struct.h"
 #include <clientserver/memstream.h>
-#include <logging/logging.h>
+#include <include/logging.h>
 
 #include "errorLog.h"
 #include "protocol.h"