Skip to content

Revert "sd-bus: use PRIu64 instead of casting"#4556

Merged
keszybz merged 1 commit intosystemd:masterfrom
keszybz:restore-llu-casts
Nov 3, 2016
Merged

Revert "sd-bus: use PRIu64 instead of casting"#4556
keszybz merged 1 commit intosystemd:masterfrom
keszybz:restore-llu-casts

Conversation

@keszybz
Copy link
Member

@keszybz keszybz commented Nov 3, 2016

This reverts commit 75ead2b.

Follow up for #4546:

@@ -848,8 +848,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
if (k->src_id == KDBUS_SRC_ID_KERNEL)
bus_message_set_sender_driver(bus, m);
else {

  •            xsprintf(m->sender_buffer, ":1.%llu",
    
  •                     (unsigned long long)k->src_id);
    
  •            xsprintf(m->sender_buffer, ":1.%"PRIu64, k->src_id);
    

This produces:

src/libsystemd/sd-bus/bus-kernel.c: In function ‘bus_kernel_make_message’:
src/libsystemd/sd-bus/bus-kernel.c:851:44: warning: format ‘%lu’ expects argument of type ‘long
unsigned int’, but argument 4 has type ‘__u64 {aka long long unsigned int}’ [-Wformat=]
                 xsprintf(m->sender_buffer, ":1.%"PRIu64, k->src_id);
                                            ^

@evverx

This reverts commit 75ead2b.

Follow up for systemd#4546:
> @@ -848,8 +848,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
         if (k->src_id == KDBUS_SRC_ID_KERNEL)
                 bus_message_set_sender_driver(bus, m);
         else {
-                xsprintf(m->sender_buffer, ":1.%llu",
-                         (unsigned long long)k->src_id);
+                xsprintf(m->sender_buffer, ":1.%"PRIu64, k->src_id);

This produces:
```
src/libsystemd/sd-bus/bus-kernel.c: In function ‘bus_kernel_make_message’:
src/libsystemd/sd-bus/bus-kernel.c:851:44: warning: format ‘%lu’ expects argument of type ‘long
unsigned int’, but argument 4 has type ‘__u64 {aka long long unsigned int}’ [-Wformat=]
                 xsprintf(m->sender_buffer, ":1.%"PRIu64, k->src_id);
                                            ^
@poettering poettering added sd-bus good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed labels Nov 3, 2016
@poettering poettering added this to the v232 milestone Nov 3, 2016
@keszybz keszybz merged commit a1e2ef7 into systemd:master Nov 3, 2016
@keszybz keszybz removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Nov 3, 2016
@keszybz keszybz deleted the restore-llu-casts branch November 4, 2016 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

2 participants