Clean up logging plugin and network layer

plugins/ua_log_stdout.c

@@ -12,14 +12,9 @@
 static pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
-const char *LogLevelNames[6] = {"trace", "debug", "info", "warning", "error", "fatal"};
-const char *LogCategoryNames[7] = {"network", "channel", "session", "server", "client", "userland", "securitypolicy"};
-
-#if (defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6) || \
-    defined(__clang__)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif
+const char *logLevelNames[6] = {"trace", "debug", "info", "warn", "error", "fatal"};
+const char *logCategoryNames[7] = {"network", "channel", "session", "server",
+                                   "client", "userland", "securitypolicy"};
 
 #ifdef __clang__
 __attribute__((__format__(__printf__, 3 , 0)))
@@ -31,7 +26,7 @@ UA_Log_Stdout(UA_LogLevel level, UA_LogCategory category,
 #ifdef UA_ENABLE_MULTITHREADING
     pthread_mutex_lock(&printf_mutex);
 #endif
-    printf("[%.23s] %s/%s\t", t.data, LogLevelNames[level], LogCategoryNames[category]);
+    printf("[%.23s] %s/%s\t", t.data, logLevelNames[level], logCategoryNames[category]);
     vprintf(msg, args);
     printf("\n");
     fflush(stdout);
@@ -40,8 +35,3 @@ UA_Log_Stdout(UA_LogLevel level, UA_LogCategory category,
 #endif
     UA_ByteString_deleteMembers(&t);
 }
-
-#if (defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6) || \
-    defined(__clang__)
-# pragma GCC diagnostic pop
-#endif

plugins/ua_network_tcp.c

@@ -262,9 +262,11 @@ ServerNetworkLayerTCP_add(ServerNetworkLayerTCP *layer,
 
     /* Do not merge packets on the socket (disable Nagle's algorithm) */
     int dummy = 1;
-    if (setsockopt(newsockfd, IPPROTO_TCP, TCP_NODELAY,
+    if(setsockopt(newsockfd, IPPROTO_TCP, TCP_NODELAY,
                (const char *)&dummy, sizeof(dummy)) < 0) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK, "Cannot set socket option TCP_NODELAY. Error: %s", strerror(errno));
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                     "Cannot set socket option TCP_NODELAY. Error: %s",
+                     strerror(errno));
         return UA_STATUSCODE_BADUNEXPECTEDERROR;
     }
 
@@ -450,8 +452,7 @@ setFDSet(ServerNetworkLayerTCP *layer, fd_set *fdset) {
 }
 
 static UA_StatusCode
-ServerNetworkLayerTCP_listen(UA_ServerNetworkLayer *nl,
-                             UA_Server *server,
+ServerNetworkLayerTCP_listen(UA_ServerNetworkLayer *nl, UA_Server *server,
                              UA_UInt16 timeout) {
     /* Every open socket can generate two jobs */
     ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP *)nl->handle;
@@ -462,7 +463,8 @@ ServerNetworkLayerTCP_listen(UA_ServerNetworkLayer *nl,
     setFDSet(layer, &errset);
     struct timeval tmptv = {0, timeout * 1000};
     if (select(highestfd+1, &fdset, NULL, &errset, &tmptv) < 0) {
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK, "Socket select failed with %s", strerror(errno));
+        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                       "Socket select failed with %s", strerror(errno));
     }
 
     /* Accept new connections via the server sockets */