SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: avoid 'bool' storage when retrieving 'b' from the message

Browse Source 
Just use an unsigned int as a bool type to avoid issues in the public
message reading API; sizeof(bool) == 1, but the code copies 4 bytes at
the pointers destination.
This commit is contained in:
Kay Sievers
2013-10-22 03:35:45 +02:00
parent 40976028c6
commit 9bcbce4201
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/timedate/timedated.c
+6 -6
View File
@@ -45,8 +45,8 @@
typedef struct Context {
char *zone;
bool local_rtc;
int can_ntp;
int use_ntp;
unsigned can_ntp;
unsigned use_ntp;
Hashmap *polkit_registry;
} Context;
@@ -521,7 +521,7 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
Context *c = userdata;
const char *z;
bool interactive;
unsigned interactive;
char *t;
int r;
@@ -585,7 +585,7 @@ static int method_set_timezone(sd_bus *bus, sd_bus_message *m, void *userdata) {
static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
bool lrtc, fix_system, interactive;
unsigned lrtc, fix_system, interactive;
Context *c = userdata;
struct timespec ts;
int r;
@@ -669,7 +669,7 @@ static int method_set_local_rtc(sd_bus *bus, sd_bus_message *m, void *userdata)
static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
bool relative, interactive;
unsigned relative, interactive;
Context *c = userdata;
int64_t utc;
struct timespec ts;
@@ -735,7 +735,7 @@ static int method_set_time(sd_bus *bus, sd_bus_message *m, void *userdata) {
static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
bool ntp, interactive;
unsigned ntp, interactive;
Context *c = userdata;
int r;