From 58229439447d5617913a5a2e173b78105c694842 Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Mon, 12 May 2014 22:54:01 +0200 Subject: SBUS: Return empty string if a string getter returns NULL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In line with getters never returning errors, a getter should return an empty string instead of NULL in case a string-like property in SSSD is not set. Reviewed-by: Stef Walter Reviewed-by: Pavel Březina --- src/tests/sbus_codegen_tests_generated.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/tests/sbus_codegen_tests_generated.c') diff --git a/src/tests/sbus_codegen_tests_generated.c b/src/tests/sbus_codegen_tests_generated.c index 4ace03650..211ad8967 100644 --- a/src/tests/sbus_codegen_tests_generated.c +++ b/src/tests/sbus_codegen_tests_generated.c @@ -362,6 +362,15 @@ const struct sbus_property_meta test_pilot__properties[] = { 0, /* not writable */ NULL, /* no invoker */ }, + { + "null_string", /* name */ + "s", /* type */ + SBUS_PROPERTY_READABLE, + offsetof(struct test_pilot, test_pilot_get_null_string), + invoke_get_s, + 0, /* not writable */ + NULL, /* no invoker */ + }, { "byte_array", /* name */ "ay", /* type */ @@ -764,7 +773,7 @@ static int invoke_get_s(struct sbus_request *dbus_req, void *function_ptr) (handler)(dbus_req, dbus_req->intf->instance_data, &prop_val); - out_val = prop_val; + out_val = prop_val == NULL ? "" : prop_val; return sbus_request_return_as_variant(dbus_req, DBUS_TYPE_STRING, &out_val); } -- cgit