util: rename parse_usec() to parse_sec() sinds the default unit is seconds

Internally we store all time values in usec_t, however parse_usec()
actually was used mostly to parse values in seconds (unless explicit
units were specified to define a different unit). Hence, be clear about
this and name the function about what we pass into it, not what we get
out of it.

diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index 5f675700f8ad7ff34a0b1570d4b76eaab02cc5c6..238cf12080777e86cb700cde6874302f2dc6a9dd 100644 (file)
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -102,7 +102,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_TIMEOUT:
                         break;
 
                 case ARG_TIMEOUT:

-                        if (parse_usec(optarg, &arg_timeout) < 0) {
+                        if (parse_sec(optarg, &arg_timeout) < 0) {

                                 log_error("Failed to parse --timeout parameter %s", optarg);
                                 return -EINVAL;
                         }
                                 log_error("Failed to parse --timeout parameter %s", optarg);
                                 return -EINVAL;
                         }

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 30167349f16b2110ecb27d66ce08596e4c825051..280470dbd08d8890e6cd4a65ebc97876ddc6499d 100644 (file)
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -629,7 +629,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'd':
                         break;
 
                 case 'd':

-                        r = parse_usec(optarg, &arg_delay);
+                        r = parse_sec(optarg, &arg_delay);

                         if (r < 0 || arg_delay <= 0) {
                                 log_error("Failed to parse delay parameter.");
                                 return -EINVAL;
                         if (r < 0 || arg_delay <= 0) {
                                 log_error("Failed to parse delay parameter.");
                                 return -EINVAL;

diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
index 3643bcded0c8705947c46c9e3b044179a4ba5736..d5e579fd7f5466ffd3d7dc1a82dc38da9fce0edc 100644 (file)
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -90,7 +90,7 @@ $1.ControlGroupModify,           config_parse_bool,                  0,
 $1.ControlGroupPersistent,       config_parse_tristate,              0,                             offsetof($1, exec_context.control_group_persistent)'
 )m4_dnl
 m4_define(`KILL_CONTEXT_CONFIG_ITEMS',
 $1.ControlGroupPersistent,       config_parse_tristate,              0,                             offsetof($1, exec_context.control_group_persistent)'
 )m4_dnl
 m4_define(`KILL_CONTEXT_CONFIG_ITEMS',

-`$1.SendSIGKILL,                  config_parse_bool,                  0,                             offsetof($1, kill_context.send_sigkill)
+`$1.SendSIGKILL,                 config_parse_bool,                  0,                             offsetof($1, kill_context.send_sigkill)

 $1.KillMode,                     config_parse_kill_mode,             0,                             offsetof($1, kill_context.kill_mode)
 $1.KillSignal,                   config_parse_kill_signal,           0,                             offsetof($1, kill_context.kill_signal)'
 )m4_dnl
 $1.KillMode,                     config_parse_kill_mode,             0,                             offsetof($1, kill_context.kill_mode)
 $1.KillSignal,                   config_parse_kill_signal,           0,                             offsetof($1, kill_context.kill_signal)'
 )m4_dnl


@@ -122,7 +122,7 @@ Unit.DefaultDependencies,        config_parse_bool,                  0,
 Unit.OnFailureIsolate,           config_parse_bool,                  0,                             offsetof(Unit, on_failure_isolate)
 Unit.IgnoreOnIsolate,            config_parse_bool,                  0,                             offsetof(Unit, ignore_on_isolate)
 Unit.IgnoreOnSnapshot,           config_parse_bool,                  0,                             offsetof(Unit, ignore_on_snapshot)
 Unit.OnFailureIsolate,           config_parse_bool,                  0,                             offsetof(Unit, on_failure_isolate)
 Unit.IgnoreOnIsolate,            config_parse_bool,                  0,                             offsetof(Unit, ignore_on_isolate)
 Unit.IgnoreOnSnapshot,           config_parse_bool,                  0,                             offsetof(Unit, ignore_on_snapshot)

-Unit.JobTimeoutSec,              config_parse_usec,                  0,                             offsetof(Unit, job_timeout)
+Unit.JobTimeoutSec,              config_parse_sec,                   0,                             offsetof(Unit, job_timeout)

 Unit.ConditionPathExists,        config_parse_unit_condition_path,   CONDITION_PATH_EXISTS,         0
 Unit.ConditionPathExistsGlob,    config_parse_unit_condition_path,   CONDITION_PATH_EXISTS_GLOB,    0
 Unit.ConditionPathIsDirectory,   config_parse_unit_condition_path,   CONDITION_PATH_IS_DIRECTORY,   0
 Unit.ConditionPathExists,        config_parse_unit_condition_path,   CONDITION_PATH_EXISTS,         0
 Unit.ConditionPathExistsGlob,    config_parse_unit_condition_path,   CONDITION_PATH_EXISTS_GLOB,    0
 Unit.ConditionPathIsDirectory,   config_parse_unit_condition_path,   CONDITION_PATH_IS_DIRECTORY,   0


@@ -147,12 +147,12 @@ Service.ExecStartPost,           config_parse_exec,                  SERVICE_EXE
 Service.ExecReload,              config_parse_exec,                  SERVICE_EXEC_RELOAD,           offsetof(Service, exec_command)
 Service.ExecStop,                config_parse_exec,                  SERVICE_EXEC_STOP,             offsetof(Service, exec_command)
 Service.ExecStopPost,            config_parse_exec,                  SERVICE_EXEC_STOP_POST,        offsetof(Service, exec_command)
 Service.ExecReload,              config_parse_exec,                  SERVICE_EXEC_RELOAD,           offsetof(Service, exec_command)
 Service.ExecStop,                config_parse_exec,                  SERVICE_EXEC_STOP,             offsetof(Service, exec_command)
 Service.ExecStopPost,            config_parse_exec,                  SERVICE_EXEC_STOP_POST,        offsetof(Service, exec_command)

-Service.RestartSec,              config_parse_usec,                  0,                             offsetof(Service, restart_usec)
+Service.RestartSec,              config_parse_sec,                   0,                             offsetof(Service, restart_usec)

 Service.TimeoutSec,              config_parse_service_timeout,       0,                             offsetof(Service, timeout_start_usec)
 Service.TimeoutStartSec,         config_parse_service_timeout,       0,                             offsetof(Service, timeout_start_usec)
 Service.TimeoutStopSec,          config_parse_service_timeout,       0,                             offsetof(Service, timeout_stop_usec)
 Service.TimeoutSec,              config_parse_service_timeout,       0,                             offsetof(Service, timeout_start_usec)
 Service.TimeoutStartSec,         config_parse_service_timeout,       0,                             offsetof(Service, timeout_start_usec)
 Service.TimeoutStopSec,          config_parse_service_timeout,       0,                             offsetof(Service, timeout_stop_usec)

-Service.WatchdogSec,             config_parse_usec,                  0,                             offsetof(Service, watchdog_usec)
-Service.StartLimitInterval,      config_parse_usec,                  0,                             offsetof(Service, start_limit.interval)
+Service.WatchdogSec,             config_parse_sec,                   0,                             offsetof(Service, watchdog_usec)
+Service.StartLimitInterval,      config_parse_sec,                   0,                             offsetof(Service, start_limit.interval)

 Service.StartLimitBurst,         config_parse_unsigned,              0,                             offsetof(Service, start_limit.burst)
 Service.StartLimitAction,        config_parse_start_limit_action,    0,                             offsetof(Service, start_limit_action)
 Service.Type,                    config_parse_service_type,          0,                             offsetof(Service, type)
 Service.StartLimitBurst,         config_parse_unsigned,              0,                             offsetof(Service, start_limit.burst)
 Service.StartLimitAction,        config_parse_start_limit_action,    0,                             offsetof(Service, start_limit_action)
 Service.Type,                    config_parse_service_type,          0,                             offsetof(Service, type)


@@ -188,7 +188,7 @@ Socket.ExecStartPre,             config_parse_exec,                  SOCKET_EXEC
 Socket.ExecStartPost,            config_parse_exec,                  SOCKET_EXEC_START_POST,        offsetof(Socket, exec_command)
 Socket.ExecStopPre,              config_parse_exec,                  SOCKET_EXEC_STOP_PRE,          offsetof(Socket, exec_command)
 Socket.ExecStopPost,             config_parse_exec,                  SOCKET_EXEC_STOP_POST,         offsetof(Socket, exec_command)
 Socket.ExecStartPost,            config_parse_exec,                  SOCKET_EXEC_START_POST,        offsetof(Socket, exec_command)
 Socket.ExecStopPre,              config_parse_exec,                  SOCKET_EXEC_STOP_PRE,          offsetof(Socket, exec_command)
 Socket.ExecStopPost,             config_parse_exec,                  SOCKET_EXEC_STOP_POST,         offsetof(Socket, exec_command)

-Socket.TimeoutSec,               config_parse_usec,                  0,                             offsetof(Socket, timeout_usec)
+Socket.TimeoutSec,               config_parse_sec,                   0,                             offsetof(Socket, timeout_usec)

 Socket.DirectoryMode,            config_parse_mode,                  0,                             offsetof(Socket, directory_mode)
 Socket.SocketMode,               config_parse_mode,                  0,                             offsetof(Socket, socket_mode)
 Socket.Accept,                   config_parse_bool,                  0,                             offsetof(Socket, accept)
 Socket.DirectoryMode,            config_parse_mode,                  0,                             offsetof(Socket, directory_mode)
 Socket.SocketMode,               config_parse_mode,                  0,                             offsetof(Socket, socket_mode)
 Socket.Accept,                   config_parse_bool,                  0,                             offsetof(Socket, accept)


@@ -221,7 +221,7 @@ Mount.Where,                     config_parse_path,                  0,
 Mount.Options,                   config_parse_string,                0,                             offsetof(Mount, parameters_fragment.options)
 Mount.Type,                      config_parse_string,                0,                             offsetof(Mount, parameters_fragment.fstype)
 Mount.FsckPassNo,                config_parse_fsck_passno,           0,                             offsetof(Mount, parameters_fragment.passno)
 Mount.Options,                   config_parse_string,                0,                             offsetof(Mount, parameters_fragment.options)
 Mount.Type,                      config_parse_string,                0,                             offsetof(Mount, parameters_fragment.fstype)
 Mount.FsckPassNo,                config_parse_fsck_passno,           0,                             offsetof(Mount, parameters_fragment.passno)

-Mount.TimeoutSec,                config_parse_usec,                  0,                             offsetof(Mount, timeout_usec)
+Mount.TimeoutSec,                config_parse_sec,                   0,                             offsetof(Mount, timeout_usec)

 Mount.DirectoryMode,             config_parse_mode,                  0,                             offsetof(Mount, directory_mode)
 EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
 KILL_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
 Mount.DirectoryMode,             config_parse_mode,                  0,                             offsetof(Mount, directory_mode)
 EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
 KILL_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl


@@ -231,7 +231,7 @@ Automount.DirectoryMode,         config_parse_mode,                  0,
 m4_dnl
 Swap.What,                       config_parse_path,                  0,                             offsetof(Swap, parameters_fragment.what)
 Swap.Priority,                   config_parse_int,                   0,                             offsetof(Swap, parameters_fragment.priority)
 m4_dnl
 Swap.What,                       config_parse_path,                  0,                             offsetof(Swap, parameters_fragment.what)
 Swap.Priority,                   config_parse_int,                   0,                             offsetof(Swap, parameters_fragment.priority)

-Swap.TimeoutSec,                 config_parse_usec,                  0,                             offsetof(Swap, timeout_usec)
+Swap.TimeoutSec,                 config_parse_sec,                   0,                             offsetof(Swap, timeout_usec)

 EXEC_CONTEXT_CONFIG_ITEMS(Swap)m4_dnl
 KILL_CONTEXT_CONFIG_ITEMS(Swap)m4_dnl
 m4_dnl
 EXEC_CONTEXT_CONFIG_ITEMS(Swap)m4_dnl
 KILL_CONTEXT_CONFIG_ITEMS(Swap)m4_dnl
 m4_dnl

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 65a2a39248ba3e0fa979b569e07fa41522402e00..42c181de4da6efbef91ad6f3463af6752a0f43e6 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1186,7 +1186,7 @@ int config_parse_timer(
 
                 id = CLOCK_REALTIME;
         } else {
 
                 id = CLOCK_REALTIME;
         } else {

-                if (parse_usec(rvalue, &u) < 0) {
+                if (parse_sec(rvalue, &u) < 0) {

                         log_error("[%s:%u] Failed to parse timer value, ignoring: %s", filename, line, rvalue);
                         return 0;
                 }
                         log_error("[%s:%u] Failed to parse timer value, ignoring: %s", filename, line, rvalue);
                         return 0;
                 }


@@ -1471,7 +1471,7 @@ int config_parse_service_timeout(
         assert(rvalue);
         assert(s);
 
         assert(rvalue);
         assert(s);
 

-        r = config_parse_usec(filename, line, section, lvalue, ltype, rvalue, data, userdata);
+        r = config_parse_sec(filename, line, section, lvalue, ltype, rvalue, data, userdata);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 


@@ -2395,7 +2395,7 @@ void unit_dump_config_items(FILE *f) {
                 { config_parse_socket_listen,         "SOCKET [...]" },
                 { config_parse_socket_bind,           "SOCKETBIND" },
                 { config_parse_socket_bindtodevice,   "NETWORKINTERFACE" },
                 { config_parse_socket_listen,         "SOCKET [...]" },
                 { config_parse_socket_bind,           "SOCKETBIND" },
                 { config_parse_socket_bindtodevice,   "NETWORKINTERFACE" },

-                { config_parse_usec,                  "SECONDS" },
+                { config_parse_sec,                   "SECONDS" },

                 { config_parse_nsec,                  "NANOSECONDS" },
                 { config_parse_path_strv,             "PATH [...]" },
                 { config_parse_unit_requires_mounts_for, "PATH [...]" },
                 { config_parse_nsec,                  "NANOSECONDS" },
                 { config_parse_path_strv,             "PATH [...]" },
                 { config_parse_unit_requires_mounts_for, "PATH [...]" },

diff --git a/src/core/main.c b/src/core/main.c
index 35cd7724c30d926276538aebea07a4b079e1f515..aa28cc66517d8a9d59580991d9c85323423a0aec 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -684,8 +684,8 @@ static int parse_config_file(void) {
                 { "Manager", "DefaultStandardOutput", config_parse_output,       0, &arg_default_std_output  },
                 { "Manager", "DefaultStandardError",  config_parse_output,       0, &arg_default_std_error   },
                 { "Manager", "JoinControllers",       config_parse_join_controllers, 0, &arg_join_controllers },
                 { "Manager", "DefaultStandardOutput", config_parse_output,       0, &arg_default_std_output  },
                 { "Manager", "DefaultStandardError",  config_parse_output,       0, &arg_default_std_error   },
                 { "Manager", "JoinControllers",       config_parse_join_controllers, 0, &arg_join_controllers },

-                { "Manager", "RuntimeWatchdogSec",    config_parse_usec,         0, &arg_runtime_watchdog    },
-                { "Manager", "ShutdownWatchdogSec",   config_parse_usec,         0, &arg_shutdown_watchdog   },
+                { "Manager", "RuntimeWatchdogSec",    config_parse_sec,          0, &arg_runtime_watchdog    },
+                { "Manager", "ShutdownWatchdogSec",   config_parse_sec,          0, &arg_shutdown_watchdog   },

                 { "Manager", "CapabilityBoundingSet", config_parse_bounding_set, 0, &arg_capability_bounding_set_drop },
                 { "Manager", "TimerSlackNSec",        config_parse_nsec,         0, &arg_timer_slack_nsec    },
                 { "Manager", "DefaultLimitCPU",       config_parse_limit,        0, &arg_default_rlimit[RLIMIT_CPU]},
                 { "Manager", "CapabilityBoundingSet", config_parse_bounding_set, 0, &arg_capability_bounding_set_drop },
                 { "Manager", "TimerSlackNSec",        config_parse_nsec,         0, &arg_timer_slack_nsec    },
                 { "Manager", "DefaultLimitCPU",       config_parse_limit,        0, &arg_default_rlimit[RLIMIT_CPU]},

diff --git a/src/core/mount.c b/src/core/mount.c
index 130dc39795a89288f1964b4ca6238a84ea14e2c3..51a81a948870529d520e761f55456794800436c2 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -520,7 +520,7 @@ static int mount_fix_timeouts(Mount *m) {
         if (!t)
                 return -ENOMEM;
 
         if (!t)
                 return -ENOMEM;
 

-        r = parse_usec(t, &u);
+        r = parse_sec(t, &u);

         free(t);
 
         if (r < 0) {
         free(t);
 
         if (r < 0) {

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index d5dc2335c8994e8d9b62c7fc5c5cd6f18691923e..51d4f99edc0bd513683051bb801cdaa3fcdc67c8 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -127,7 +127,7 @@ static int parse_one_option(const char *option) {
                 opt_type = CRYPT_PLAIN;
         else if (startswith(option, "timeout=")) {
 
                 opt_type = CRYPT_PLAIN;
         else if (startswith(option, "timeout=")) {
 

-                if (parse_usec(option+8, &opt_timeout) < 0) {
+                if (parse_sec(option+8, &opt_timeout) < 0) {

                         log_error("timeout= parse failure, ignoring.");
                         return 0;
                 }
                         log_error("timeout= parse failure, ignoring.");
                         return 0;
                 }

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 8661e5e33af1b7aabe7e579d20baaa6d68c64726..642e20d43fbbb0d705977ae4b96356e595d3ac41 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -355,7 +355,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_INTERVAL:
                         break;
 
                 case ARG_INTERVAL:

-                        r = parse_usec(optarg, &arg_interval);
+                        r = parse_sec(optarg, &arg_interval);

                         if (r < 0 || arg_interval <= 0) {
                                 log_error("Failed to parse sealing key change interval: %s", optarg);
                                 return -EINVAL;
                         if (r < 0 || arg_interval <= 0) {
                                 log_error("Failed to parse sealing key change interval: %s", optarg);
                                 return -EINVAL;

diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
index 57b45f9232c54802f9236bade90ba6773688aff7..2ecba3bd0e90e955a51663b62928dd5a52759f85 100644 (file)
--- a/src/journal/journald-gperf.gperf
+++ b/src/journal/journald-gperf.gperf
@@ -18,8 +18,8 @@ struct ConfigPerfItem;
 Journal.Storage,            config_parse_storage,   0, offsetof(Server, storage)
 Journal.Compress,           config_parse_bool,      0, offsetof(Server, compress)
 Journal.Seal,               config_parse_bool,      0, offsetof(Server, seal)
 Journal.Storage,            config_parse_storage,   0, offsetof(Server, storage)
 Journal.Compress,           config_parse_bool,      0, offsetof(Server, compress)
 Journal.Seal,               config_parse_bool,      0, offsetof(Server, seal)

-Journal.SyncIntervalSec,    config_parse_usec,      0, offsetof(Server, sync_interval_usec)
-Journal.RateLimitInterval,  config_parse_usec,      0, offsetof(Server, rate_limit_interval)
+Journal.SyncIntervalSec,    config_parse_sec,       0, offsetof(Server, sync_interval_usec)
+Journal.RateLimitInterval,  config_parse_sec,       0, offsetof(Server, rate_limit_interval)

 Journal.RateLimitBurst,     config_parse_unsigned,  0, offsetof(Server, rate_limit_burst)
 Journal.SystemMaxUse,       config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_use)
 Journal.SystemMaxFileSize,  config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_size)
 Journal.RateLimitBurst,     config_parse_unsigned,  0, offsetof(Server, rate_limit_burst)
 Journal.SystemMaxUse,       config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_use)
 Journal.SystemMaxFileSize,  config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_size)


@@ -27,8 +27,8 @@ Journal.SystemKeepFree,     config_parse_bytes_off, 0, offsetof(Server, system_m
 Journal.RuntimeMaxUse,      config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_use)
 Journal.RuntimeMaxFileSize, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_size)
 Journal.RuntimeKeepFree,    config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.keep_free)
 Journal.RuntimeMaxUse,      config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_use)
 Journal.RuntimeMaxFileSize, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_size)
 Journal.RuntimeKeepFree,    config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.keep_free)

-Journal.MaxRetentionSec,    config_parse_usec,      0, offsetof(Server, max_retention_usec)
-Journal.MaxFileSec,         config_parse_usec,      0, offsetof(Server, max_file_usec)
+Journal.MaxRetentionSec,    config_parse_sec,       0, offsetof(Server, max_retention_usec)
+Journal.MaxFileSec,         config_parse_sec,       0, offsetof(Server, max_file_usec)

 Journal.ForwardToSyslog,    config_parse_bool,      0, offsetof(Server, forward_to_syslog)
 Journal.ForwardToKMsg,      config_parse_bool,      0, offsetof(Server, forward_to_kmsg)
 Journal.ForwardToConsole,   config_parse_bool,      0, offsetof(Server, forward_to_console)
 Journal.ForwardToSyslog,    config_parse_bool,      0, offsetof(Server, forward_to_syslog)
 Journal.ForwardToKMsg,      config_parse_bool,      0, offsetof(Server, forward_to_kmsg)
 Journal.ForwardToConsole,   config_parse_bool,      0, offsetof(Server, forward_to_console)

diff --git a/src/login/logind-gperf.gperf b/src/login/logind-gperf.gperf
index 076d116161a8476a75884e26c6a31acba832f50f..735d2dbc9cdfd9ac5c5b75d3146aac9617480ae6 100644 (file)
--- a/src/login/logind-gperf.gperf
+++ b/src/login/logind-gperf.gperf
@@ -21,7 +21,7 @@ Login.KillOnlyUsers,               config_parse_strv,          0, offsetof(Manag
 Login.KillExcludeUsers,            config_parse_strv,          0, offsetof(Manager, kill_exclude_users)
 Login.Controllers,                 config_parse_strv,          0, offsetof(Manager, controllers)
 Login.ResetControllers,            config_parse_strv,          0, offsetof(Manager, reset_controllers)
 Login.KillExcludeUsers,            config_parse_strv,          0, offsetof(Manager, kill_exclude_users)
 Login.Controllers,                 config_parse_strv,          0, offsetof(Manager, controllers)
 Login.ResetControllers,            config_parse_strv,          0, offsetof(Manager, reset_controllers)

-Login.InhibitDelayMaxSec,          config_parse_usec,          0, offsetof(Manager, inhibit_delay_max)
+Login.InhibitDelayMaxSec,          config_parse_sec,           0, offsetof(Manager, inhibit_delay_max)

 Login.HandlePowerKey,              config_parse_handle_action, 0, offsetof(Manager, handle_power_key)
 Login.HandleSuspendKey,            config_parse_handle_action, 0, offsetof(Manager, handle_suspend_key)
 Login.HandleHibernateKey,          config_parse_handle_action, 0, offsetof(Manager, handle_hibernate_key)
 Login.HandlePowerKey,              config_parse_handle_action, 0, offsetof(Manager, handle_power_key)
 Login.HandleSuspendKey,            config_parse_handle_action, 0, offsetof(Manager, handle_suspend_key)
 Login.HandleHibernateKey,          config_parse_handle_action, 0, offsetof(Manager, handle_hibernate_key)


@@ -31,4 +31,4 @@ Login.SuspendKeyIgnoreInhibited,   config_parse_bool,          0, offsetof(Manag
 Login.HibernateKeyIgnoreInhibited, config_parse_bool,          0, offsetof(Manager, hibernate_key_ignore_inhibited)
 Login.LidSwitchIgnoreInhibited,    config_parse_bool,          0, offsetof(Manager, lid_switch_ignore_inhibited)
 Login.IdleAction,                  config_parse_handle_action, 0, offsetof(Manager, idle_action)
 Login.HibernateKeyIgnoreInhibited, config_parse_bool,          0, offsetof(Manager, hibernate_key_ignore_inhibited)
 Login.LidSwitchIgnoreInhibited,    config_parse_bool,          0, offsetof(Manager, lid_switch_ignore_inhibited)
 Login.IdleAction,                  config_parse_handle_action, 0, offsetof(Manager, idle_action)

-Login.IdleActionSec,               config_parse_usec,          0, offsetof(Manager, idle_action_usec)
+Login.IdleActionSec,               config_parse_sec,           0, offsetof(Manager, idle_action_usec)

diff --git a/src/readahead/readahead.c b/src/readahead/readahead.c
index abeecc763497a704391de6fa56d2ed63118d3d05..29255c9f0726cddfea2cdeda836ec99ba69e23ed 100644 (file)
--- a/src/readahead/readahead.c
+++ b/src/readahead/readahead.c
@@ -108,7 +108,7 @@ static int parse_argv(int argc, char *argv[]) {
                 }
 
                 case ARG_TIMEOUT:
                 }
 
                 case ARG_TIMEOUT:

-                        if (parse_usec(optarg, &arg_timeout) < 0 || arg_timeout <= 0) {
+                        if (parse_sec(optarg, &arg_timeout) < 0 || arg_timeout <= 0) {

                                 log_error("Failed to parse timeout %s.", optarg);
                                 return -EINVAL;
                         }
                                 log_error("Failed to parse timeout %s.", optarg);
                                 return -EINVAL;
                         }

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index c2cf5a6a196d08e4f070770c070ac9a651a418d6..a87df382ea26cf6ac69bd5a0b2805b2bd15c66a2 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -792,7 +792,7 @@ int config_parse_path_strv(
         return 0;
 }
 
         return 0;
 }
 

-int config_parse_usec(
+int config_parse_sec(

                 const char *filename,
                 unsigned line,
                 const char *section,
                 const char *filename,
                 unsigned line,
                 const char *section,


@@ -809,7 +809,7 @@ int config_parse_usec(
         assert(rvalue);
         assert(data);
 
         assert(rvalue);
         assert(data);
 

-        if (parse_usec(rvalue, usec) < 0) {
+        if (parse_sec(rvalue, usec) < 0) {

                 log_error("[%s:%u] Failed to parse time value, ignoring: %s", filename, line, rvalue);
                 return 0;
         }
                 log_error("[%s:%u] Failed to parse time value, ignoring: %s", filename, line, rvalue);
                 return 0;
         }

diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index 9096c605e223e4a934acba7907efea82c1e1ac68..88194f677164579b828f570e90f29b46916e0d81 100644 (file)
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -101,7 +101,7 @@ int config_parse_string(const char *filename, unsigned line, const char *section
 int config_parse_path(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_strv(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_path_strv(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_path(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_strv(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_path_strv(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);

-int config_parse_usec(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+int config_parse_sec(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);

 int config_parse_nsec(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_mode(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_facility(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_nsec(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_mode(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_facility(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);

diff --git a/src/shared/time-util.c b/src/shared/time-util.c
index 0c6deb66f4242367192a8da54a9894be7c4e4b0c..e27aaf6c6a3afdb1c707e6d82f0ff298657240e9 100644 (file)
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -256,7 +256,7 @@ char *format_timespan(char *buf, size_t l, usec_t t) {
                 return p;
         }
 
                 return p;
         }
 

-        /* The result of this function can be parsed with parse_usec */
+        /* The result of this function can be parsed with parse_sec */

 
         for (i = 0; i < ELEMENTSOF(table); i++) {
                 int k;
 
         for (i = 0; i < ELEMENTSOF(table); i++) {
                 int k;


@@ -382,14 +382,14 @@ int parse_timestamp(const char *t, usec_t *usec) {
 
         } else if (t[0] == '+') {
 
 
         } else if (t[0] == '+') {
 

-                r = parse_usec(t+1, &plus);
+                r = parse_sec(t+1, &plus);

                 if (r < 0)
                         return r;
 
                 goto finish;
         } else if (t[0] == '-') {
 
                 if (r < 0)
                         return r;
 
                 goto finish;
         } else if (t[0] == '-') {
 

-                r = parse_usec(t+1, &minus);
+                r = parse_sec(t+1, &minus);

                 if (r < 0)
                         return r;
 
                 if (r < 0)
                         return r;
 


@@ -402,7 +402,7 @@ int parse_timestamp(const char *t, usec_t *usec) {
                 if (!z)
                         return -ENOMEM;
 
                 if (!z)
                         return -ENOMEM;
 

-                r = parse_usec(z, &minus);
+                r = parse_sec(z, &minus);

                 if (r < 0)
                         return r;
 
                 if (r < 0)
                         return r;
 


@@ -497,7 +497,7 @@ finish:
         return 0;
 }
 
         return 0;
 }
 

-int parse_usec(const char *t, usec_t *usec) {
+int parse_sec(const char *t, usec_t *usec) {

         static const struct {
                 const char *suffix;
                 usec_t usec;
         static const struct {
                 const char *suffix;
                 usec_t usec;

diff --git a/src/shared/time-util.h b/src/shared/time-util.h
index ec263c1a19b5772afdcea8c48149610641836d3c..2e3b0f57446e122a8368907f286363dfc1d4edca 100644 (file)
--- a/src/shared/time-util.h
+++ b/src/shared/time-util.h
@@ -80,5 +80,5 @@ void dual_timestamp_deserialize(const char *value, dual_timestamp *t);
 
 int parse_timestamp(const char *t, usec_t *usec);
 
 
 int parse_timestamp(const char *t, usec_t *usec);
 

-int parse_usec(const char *t, usec_t *usec);
+int parse_sec(const char *t, usec_t *usec);

 int parse_nsec(const char *t, nsec_t *nsec);
 int parse_nsec(const char *t, nsec_t *nsec);

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 0b168f079f6b21e72d640940f51fc880bbccaecc..84f4986503b206efc3054386e839a1014d713066 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1171,7 +1171,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                         a++;
                 }
 
                         a++;
                 }
 

-                if (parse_usec(a, &i->age) < 0) {
+                if (parse_sec(a, &i->age) < 0) {

                         log_error("[%s:%u] Invalid age '%s'.", fname, line, age);
                         return -EBADMSG;
                 }
                         log_error("[%s:%u] Invalid age '%s'.", fname, line, age);
                         return -EBADMSG;
                 }