From 746cfca975fc3729e6eb409155df7dcb9946e601 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 May 2018 22:33:13 -0400 Subject: [PATCH] logind: let's change the type of the runtime directory size to uint64_t Externally it's an uint64_t anyway, and internally we most just initialize it to physical_memory() which returns uint64_t, hence there's exactly zero value in using it as size_t internally. Hence, let's fix that, and use uint64_t everywhere. --- src/login/logind-dbus.c | 2 +- src/login/logind-user.c | 2 +- src/login/logind.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 63d1313bd..776caed8c 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2820,7 +2820,7 @@ const sd_bus_vtable manager_vtable[] = { SD_BUS_PROPERTY("ScheduledShutdown", "(st)", property_get_scheduled_shutdown, 0, 0), SD_BUS_PROPERTY("Docked", "b", property_get_docked, 0, 0), SD_BUS_PROPERTY("RemoveIPC", "b", bus_property_get_bool, offsetof(Manager, remove_ipc), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("RuntimeDirectorySize", "t", bus_property_get_size, offsetof(Manager, runtime_dir_size), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("RuntimeDirectorySize", "t", NULL, offsetof(Manager, runtime_dir_size), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("InhibitorsMax", "t", NULL, offsetof(Manager, inhibitors_max), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("NCurrentInhibitors", "t", property_get_hashmap_size, offsetof(Manager, inhibitors), 0), SD_BUS_PROPERTY("SessionsMax", "t", NULL, offsetof(Manager, sessions_max), SD_BUS_VTABLE_PROPERTY_CONST), diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 8c8f1e2a8..b7bac297c 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -754,7 +754,7 @@ int config_parse_tmpfs_size( void *data, void *userdata) { - size_t *sz = data; + uint64_t *sz = data; int r; assert(filename); diff --git a/src/login/logind.h b/src/login/logind.h index be276170c..93760095e 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -164,7 +164,7 @@ struct Manager { usec_t holdoff_timeout_usec; sd_event_source *lid_switch_ignore_event_source; - size_t runtime_dir_size; + uint64_t runtime_dir_size; uint64_t user_tasks_max; uint64_t sessions_max; uint64_t inhibitors_max; -- 2.30.2