From 37a393b99e1e0de80ea309db4c71a976f8e15893 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 4 Jan 2025 13:20:50 +0900 Subject: [PATCH] sd-json,sd-varlink: trivial coding style fixlets --- src/libsystemd/sd-json/sd-json.c | 8 ++++---- src/libsystemd/sd-varlink/sd-varlink-idl.c | 4 ++-- src/libsystemd/sd-varlink/sd-varlink.c | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libsystemd/sd-json/sd-json.c b/src/libsystemd/sd-json/sd-json.c index 52343b8719a..b8633548c80 100644 --- a/src/libsystemd/sd-json/sd-json.c +++ b/src/libsystemd/sd-json/sd-json.c @@ -216,7 +216,7 @@ static bool json_variant_is_regular(const sd_json_variant *v) { return (((uintptr_t) v) & 1) == 0; } -static sd_json_variant *json_variant_dereference(sd_json_variant *v) { +static sd_json_variant* json_variant_dereference(sd_json_variant *v) { /* Recursively dereference variants that are references to other variants */ @@ -244,7 +244,7 @@ static uint16_t json_variant_depth(sd_json_variant *v) { return v->depth; } -static sd_json_variant *json_variant_formalize(sd_json_variant *v) { +static sd_json_variant* json_variant_formalize(sd_json_variant *v) { /* Converts json variant pointers to their normalized form, i.e. fully dereferenced and wherever * possible converted to the "magic" version if there is one */ @@ -285,7 +285,7 @@ static sd_json_variant *json_variant_formalize(sd_json_variant *v) { } } -static sd_json_variant *json_variant_conservative_formalize(sd_json_variant *v) { +static sd_json_variant* json_variant_conservative_formalize(sd_json_variant *v) { /* Much like json_variant_formalize(), but won't simplify if the variant has a source/line location * attached to it, in order not to lose context */ @@ -5067,7 +5067,7 @@ int json_log_internal( NULL); } -static void *dispatch_userdata(const sd_json_dispatch_field *p, void *userdata) { +static void* dispatch_userdata(const sd_json_dispatch_field *p, void *userdata) { /* When the userdata pointer is passed in as NULL, then we'll just use the offset as a literal * address, and convert it to a pointer. Note that might as well just add the offset to the NULL diff --git a/src/libsystemd/sd-varlink/sd-varlink-idl.c b/src/libsystemd/sd-varlink/sd-varlink-idl.c index 19bd10f126b..1349fd36ab5 100644 --- a/src/libsystemd/sd-varlink/sd-varlink-idl.c +++ b/src/libsystemd/sd-varlink/sd-varlink-idl.c @@ -101,7 +101,7 @@ static int varlink_idl_format_comment_fields( return 0; } -static const sd_varlink_field *varlink_idl_symbol_find_start_comment( +static const sd_varlink_field* varlink_idl_symbol_find_start_comment( const sd_varlink_symbol *symbol, const sd_varlink_field *field) { @@ -562,7 +562,7 @@ _public_ int sd_varlink_idl_format(const sd_varlink_interface *interface, char * return sd_varlink_idl_format_full(interface, 0, SIZE_MAX, ret); } -static sd_varlink_symbol *varlink_symbol_free(sd_varlink_symbol *symbol) { +static sd_varlink_symbol* varlink_symbol_free(sd_varlink_symbol *symbol) { if (!symbol) return NULL; diff --git a/src/libsystemd/sd-varlink/sd-varlink.c b/src/libsystemd/sd-varlink/sd-varlink.c index 59228cc08b8..5e26f0f97e6 100644 --- a/src/libsystemd/sd-varlink/sd-varlink.c +++ b/src/libsystemd/sd-varlink/sd-varlink.c @@ -1779,6 +1779,7 @@ _public_ int sd_varlink_flush(sd_varlink *v) { static void varlink_detach_server(sd_varlink *v) { sd_varlink_server *saved_server; + assert(v); if (!v->server) -- 2.47.3