squash w/ [7229] Run clang-format.

korydraughn · Dec 5, 2024 · 826fa5e · 826fa5e
1 parent f9795e6
commit 826fa5e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 28 deletions.
diff --git a/plugins/network/src/ssl.cpp b/plugins/network/src/ssl.cpp
@@ -376,9 +376,9 @@ irods::error ssl_socket_read(
     }
 
     fd_set set;
-    struct timeval timeout
-    {
-    };
+    // clang-format off
+    struct timeval timeout{};
+    // clang-format on
     int len_to_read = _length;
     char* read_ptr = static_cast<char*>(_buffer);
     _bytes_read = 0;

diff --git a/plugins/network/src/tcp.cpp b/plugins/network/src/tcp.cpp
@@ -22,9 +22,9 @@
 irods::error tcp_socket_read(int _socket, void* _buffer, int _length, int& _bytes_read, struct timeval* _time_value)
 {
     fd_set set;
-    struct timeval timeout
-    {
-    };
+    // clang-format off
+    struct timeval timeout{};
+    // clang-format on
     int len_to_read = _length;
     char* read_ptr = static_cast<char*>(_buffer);
     _bytes_read = 0;

diff --git a/server/main_server/src/agent_main.cpp b/server/main_server/src/agent_main.cpp
@@ -434,11 +434,11 @@ namespace
     {
         namespace logger = irods::experimental::log;
 
+        // clang-format off
         logger::agent::set_level(logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_AGENT));
         logger::agent_factory::set_level(logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_AGENT_FACTORY));
         logger::api::set_level(logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_API));
-        logger::authentication::set_level(
-            logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_AUTHENTICATION));
+        logger::authentication::set_level( logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_AUTHENTICATION));
         logger::database::set_level(logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_DATABASE));
         logger::genquery2::set_level(logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_GENQUERY2));
         logger::legacy::set_level(logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_LEGACY));
@@ -447,6 +447,7 @@ namespace
         logger::resource::set_level(logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_RESOURCE));
         logger::rule_engine::set_level(logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_RULE_ENGINE));
         logger::sql::set_level(logger::get_level_from_config(irods::KW_CFG_LOG_LEVEL_CATEGORY_SQL));
+        // clang-format on
     } // load_log_levels_for_loggers
 
     auto setup_signal_handlers() -> int
@@ -822,8 +823,7 @@ namespace
         rsComm.thread_ctx = static_cast<thread_context*>(std::malloc(sizeof(thread_context)));
 
         bool require_cs_neg = false;
-        int status =
-            initRsCommWithStartupPack(&rsComm, startupPack, require_cs_neg); // This version just uses the startupPack.
+        int status = initRsCommWithStartupPack(&rsComm, startupPack, require_cs_neg);
 
         // manufacture a network object for comms
         ret = irods::network_factory(&rsComm, net_obj);

diff --git a/server/main_server/src/main.cpp b/server/main_server/src/main.cpp
@@ -497,12 +497,11 @@ Environment Variables:
     {
         // Become a background process.
         switch (fork()) {
-            case -1:
-                _exit(1);
-            case 0:
-                break;
-            default:
-                _exit(0);
+            // clang-format off
+            case -1: _exit(1);
+            case  0: break;
+            default: _exit(0);
+            // clang-format on
         }
 
         // Become session leader.
@@ -512,12 +511,11 @@ Environment Variables:
 
         // Make sure we aren't the session leader.
         switch (fork()) {
-            case -1:
-                _exit(1);
-            case 0:
-                break;
-            default:
-                _exit(0);
+            // clang-format off
+            case -1: _exit(1);
+            case  0: break;
+            default: _exit(0);
+            // clang-format on
         }
 
         umask(0);
@@ -1378,12 +1376,15 @@ Environment Variables:
                 file.close();
 
                 // 3. Write the contents of the stacktrace file to syslog.
-                irods::experimental::log::server::critical(
-                    {{"log_message", boost::stacktrace::to_string(stacktrace)},
-                     {"stacktrace_agent_pid", pid},
-                     {"stacktrace_timestamp_utc", fmt::format("{}.{}Z", utc_ss.str(), remaining_millis)},
-                     {"stacktrace_timestamp_epoch_seconds", epoch_seconds},
-                     {"stacktrace_timestamp_epoch_milliseconds", remaining_millis}});
+                // clang-format off
+                irods::experimental::log::server::critical({
+                    {"log_message", boost::stacktrace::to_string(stacktrace)},
+                    {"stacktrace_agent_pid", pid},
+                    {"stacktrace_timestamp_utc", fmt::format("{}.{}Z", utc_ss.str(), remaining_millis)},
+                    {"stacktrace_timestamp_epoch_seconds", epoch_seconds},
+                    {"stacktrace_timestamp_epoch_milliseconds", remaining_millis}
+                });
+                // clang-format on
 
                 // 4. Delete the stacktrace file.
                 //