1 files changed, 44 insertions, 42 deletions

diff --git a/src/server_lds.c b/src/server_lds.c
index 8d34acc..34672ea 100644
--- a/src/server_lds.c
+++ b/src/server_lds.c
@@ -19,19 +19,19 @@
 #include <signal.h>
 #include <stdlib.h>
 
-volatile UA_Boolean running = true;
+volatile UA_Boolean g_running = true;
 
 static void
-stopHandler (int sig)
+_s_stop_handler (int sig)
 {
-  running = false;
+  g_running = false;
 }
 
 int
 main (int argc, char *argv[])
 {
-  signal (SIGINT, stopHandler);
-  signal (SIGTERM, stopHandler);
+  signal (SIGINT, _s_stop_handler);
+  signal (SIGTERM, _s_stop_handler);
 
   if (argc < 2 || argc > 3)
     {
@@ -40,97 +40,99 @@ main (int argc, char *argv[])
       return EXIT_FAILURE;
     }
 
-  const char *logLevelStr = (argc == 3) ? argv[2] : "info";
-  int logLevel = parseLogLevel (logLevelStr);
-  if (logLevel < 0)
+  const char *log_level_str = (argc == 3) ? argv[2] : "info";
+  int log_level = parse_log_level (log_level_str);
+  if (log_level < 0)
     {
       UA_LOG_FATAL (UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                     "Unknown log level: %s "
                     "(expected trace, debug, info, warning, error, fatal)",
-                    logLevelStr);
+                    log_level_str);
       return EXIT_FAILURE;
     }
 
-  Config cfg;
-  if (configLoad (argv[1], &cfg) != 0)
+  config cfg;
+  if (config_load (argv[1], &cfg) != 0)
     return EXIT_FAILURE;
 
-  int port = configRequireInt (&cfg, "port", "ServerLDS");
-  const char *applicationUri
-      = configRequire (&cfg, "applicationUri", "ServerLDS");
-  int cleanupTimeout = configRequireInt (&cfg, "cleanupTimeout", "ServerLDS");
+  int port = config_require_int (&cfg, "port", "ServerLDS");
+  const char *application_uri
+      = config_require (&cfg, "applicationUri", "ServerLDS");
+  int cleanup_timeout
+      = config_require_int (&cfg, "cleanupTimeout", "ServerLDS");
 
-  if (!applicationUri || port < 0 || cleanupTimeout < 0)
+  if (!application_uri || port < 0 || cleanup_timeout < 0)
     {
-      configFree (&cfg);
+      config_free (&cfg);
       return EXIT_FAILURE;
     }
 
   /* The OPC UA specification requires the cleanup timeout to exceed the
      register-server interval.  open62541 enforces a floor of 10 seconds. */
-  if (cleanupTimeout <= 10)
+  if (cleanup_timeout <= 10)
     {
       UA_LOG_FATAL (UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                     "Cleanup timeout must be > 10 seconds (got %d)",
-                    cleanupTimeout);
-      configFree (&cfg);
+                    cleanup_timeout);
+      config_free (&cfg);
       return EXIT_FAILURE;
     }
 
-  SecurityConfig sec;
-  if (parseSecurityConfig (&cfg, "ServerLDS", false, &sec) != 0)
+  security_config sec;
+  if (parse_security_config (&cfg, "ServerLDS", false, &sec) != 0)
     {
-      configFree (&cfg);
+      config_free (&cfg);
       return EXIT_FAILURE;
     }
 
-  AuthConfig auth;
-  if (parseAuthConfig (&cfg, "ServerLDS", &auth) != 0)
+  auth_config auth;
+  if (parse_auth_config (&cfg, "ServerLDS", &auth) != 0)
     {
-      freeTrustStore (sec.trustPaths, sec.trustSize);
-      configFree (&cfg);
+      free_trust_store (sec.trust_paths, sec.trust_size);
+      config_free (&cfg);
       return EXIT_FAILURE;
     }
 
   UA_StatusCode retval;
-  UA_Server *server = createServer ((UA_UInt16)port, applicationUri,
-                                    sec.certPath ? &sec : NULL, true, &retval);
+  UA_Server *server
+      = create_server ((UA_UInt16)port, application_uri,
+                       sec.cert_path ? &sec : NULL, true, &retval);
   if (!server)
     {
-      freeTrustStore (sec.trustPaths, sec.trustSize);
-      configFree (&cfg);
+      free_trust_store (sec.trust_paths, sec.trust_size);
+      config_free (&cfg);
       return EXIT_FAILURE;
     }
 
-  UA_ServerConfig *serverConfig = UA_Server_getConfig (server);
-  serverConfig->logging->context = (void *)(uintptr_t)logLevel;
+  UA_ServerConfig *server_config = UA_Server_getConfig (server);
+  server_config->logging->context = (void *)(uintptr_t)log_level;
 
   /* Some OPC UA stacks omit the timestamp in the request header.  The
      default behaviour rejects these requests with BadInvalidTimestamp.
      Downgrade to a warning so third-party servers can still register. */
-  serverConfig->verifyRequestTimestamp = UA_RULEHANDLING_WARN;
+  server_config->verifyRequestTimestamp = UA_RULEHANDLING_WARN;
 
-  retval = configureAccessControl (serverConfig, &auth);
+  retval = configure_access_control (server_config, &auth);
   if (retval != UA_STATUSCODE_GOOD)
     {
       UA_Server_delete (server);
-      freeTrustStore (sec.trustPaths, sec.trustSize);
-      configFree (&cfg);
+      free_trust_store (sec.trust_paths, sec.trust_size);
+      config_free (&cfg);
       return EXIT_FAILURE;
     }
 
   /* Mark this server as a Discovery Server so clients can identify it. */
-  serverConfig->applicationDescription.applicationType
+  server_config->applicationDescription.applicationType
       = UA_APPLICATIONTYPE_DISCOVERYSERVER;
 
   /* Time (seconds) after which stale registrations are removed.  Must
      exceed the registering server's re-register interval. */
-  serverConfig->discoveryCleanupTimeout = cleanupTimeout;
+  server_config->discoveryCleanupTimeout = cleanup_timeout;
 
-  retval = UA_Server_run (server, &running);
+  retval = UA_Server_run (server, &g_running);
 
   UA_Server_delete (server);
-  freeTrustStore (sec.trustPaths, sec.trustSize);
-  configFree (&cfg);
+  free_trust_store (sec.trust_paths, sec.trust_size);
+  config_free (&cfg);
   return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }