From 4e5d19f659d8c545c4ed3c307c95cfe4f2ca33cb Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Thu, 15 Jan 2015 14:49:25 +0100 Subject: sbus codegen: do not prefix getters with iface name Prefixing getters with C name of the interface is just redundant since it is the same as the name of the structure that contains those fields. The following structure: struct test_pilot { $type test_pilot_get_name; } changes to: struct test_pilot { $type get_name; } Reviewed-by: Jakub Hrozek --- src/tests/sbus_codegen_tests_generated.h | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'src/tests/sbus_codegen_tests_generated.h') diff --git a/src/tests/sbus_codegen_tests_generated.h b/src/tests/sbus_codegen_tests_generated.h index e6fb10c5e..d573615ec 100644 --- a/src/tests/sbus_codegen_tests_generated.h +++ b/src/tests/sbus_codegen_tests_generated.h @@ -72,7 +72,7 @@ struct com_planetexpress_Ship { int (*MoveUniverse)(struct sbus_request *req, void *data, bool arg_smoothly, uint32_t arg_speed_factor); int (*crash_now)(struct sbus_request *req, void *data, const char *arg_where); sbus_msg_handler_fn Land; - void (*com_planetexpress_Ship_get_Color)(struct sbus_request *, void *data, const char * *); + void (*get_Color)(struct sbus_request *, void *data, const char * *); }; /* finish function for MoveUniverse */ @@ -86,30 +86,30 @@ struct test_pilot { struct sbus_vtable vtable; /* derive from sbus_vtable */ int (*Blink)(struct sbus_request *req, void *data, uint32_t arg_duration); int (*Eject)(struct sbus_request *req, void *data, uint8_t arg_byte, bool arg_boolean, int16_t arg_int16, uint16_t arg_uint16, int32_t arg_int32, uint32_t arg_uint32, int64_t arg_int64, uint64_t arg_uint64, double arg_double, const char *arg_string, const char *arg_object_path, uint8_t arg_byte_array[], int len_byte_array, int16_t arg_int16_array[], int len_int16_array, uint16_t arg_uint16_array[], int len_uint16_array, int32_t arg_int32_array[], int len_int32_array, uint32_t arg_uint32_array[], int len_uint32_array, int64_t arg_int64_array[], int len_int64_array, uint64_t arg_uint64_array[], int len_uint64_array, double arg_double_array[], int len_double_array, const char *arg_string_array[], int len_string_array, const char *arg_object_path_array[], int len_object_path_array); - void (*test_pilot_get_FullName)(struct sbus_request *, void *data, const char * *); - void (*test_pilot_get_byte)(struct sbus_request *, void *data, uint8_t *); - void (*test_pilot_get_boolean)(struct sbus_request *, void *data, bool *); - void (*test_pilot_get_int16)(struct sbus_request *, void *data, int16_t *); - void (*test_pilot_get_uint16)(struct sbus_request *, void *data, uint16_t *); - void (*test_pilot_get_int32)(struct sbus_request *, void *data, int32_t *); - void (*test_pilot_get_uint32)(struct sbus_request *, void *data, uint32_t *); - void (*test_pilot_get_int64)(struct sbus_request *, void *data, int64_t *); - void (*test_pilot_get_uint64)(struct sbus_request *, void *data, uint64_t *); - void (*test_pilot_get_double)(struct sbus_request *, void *data, double *); - void (*test_pilot_get_string)(struct sbus_request *, void *data, const char * *); - void (*test_pilot_get_object_path)(struct sbus_request *, void *data, const char * *); - void (*test_pilot_get_null_string)(struct sbus_request *, void *data, const char * *); - void (*test_pilot_get_null_path)(struct sbus_request *, void *data, const char * *); - void (*test_pilot_get_byte_array)(struct sbus_request *, void *data, uint8_t * *, int *); - void (*test_pilot_get_int16_array)(struct sbus_request *, void *data, int16_t * *, int *); - void (*test_pilot_get_uint16_array)(struct sbus_request *, void *data, uint16_t * *, int *); - void (*test_pilot_get_int32_array)(struct sbus_request *, void *data, int32_t * *, int *); - void (*test_pilot_get_uint32_array)(struct sbus_request *, void *data, uint32_t * *, int *); - void (*test_pilot_get_int64_array)(struct sbus_request *, void *data, int64_t * *, int *); - void (*test_pilot_get_uint64_array)(struct sbus_request *, void *data, uint64_t * *, int *); - void (*test_pilot_get_double_array)(struct sbus_request *, void *data, double * *, int *); - void (*test_pilot_get_string_array)(struct sbus_request *, void *data, const char * * *, int *); - void (*test_pilot_get_object_path_array)(struct sbus_request *, void *data, const char * * *, int *); + void (*get_FullName)(struct sbus_request *, void *data, const char * *); + void (*get_byte)(struct sbus_request *, void *data, uint8_t *); + void (*get_boolean)(struct sbus_request *, void *data, bool *); + void (*get_int16)(struct sbus_request *, void *data, int16_t *); + void (*get_uint16)(struct sbus_request *, void *data, uint16_t *); + void (*get_int32)(struct sbus_request *, void *data, int32_t *); + void (*get_uint32)(struct sbus_request *, void *data, uint32_t *); + void (*get_int64)(struct sbus_request *, void *data, int64_t *); + void (*get_uint64)(struct sbus_request *, void *data, uint64_t *); + void (*get_double)(struct sbus_request *, void *data, double *); + void (*get_string)(struct sbus_request *, void *data, const char * *); + void (*get_object_path)(struct sbus_request *, void *data, const char * *); + void (*get_null_string)(struct sbus_request *, void *data, const char * *); + void (*get_null_path)(struct sbus_request *, void *data, const char * *); + void (*get_byte_array)(struct sbus_request *, void *data, uint8_t * *, int *); + void (*get_int16_array)(struct sbus_request *, void *data, int16_t * *, int *); + void (*get_uint16_array)(struct sbus_request *, void *data, uint16_t * *, int *); + void (*get_int32_array)(struct sbus_request *, void *data, int32_t * *, int *); + void (*get_uint32_array)(struct sbus_request *, void *data, uint32_t * *, int *); + void (*get_int64_array)(struct sbus_request *, void *data, int64_t * *, int *); + void (*get_uint64_array)(struct sbus_request *, void *data, uint64_t * *, int *); + void (*get_double_array)(struct sbus_request *, void *data, double * *, int *); + void (*get_string_array)(struct sbus_request *, void *data, const char * * *, int *); + void (*get_object_path_array)(struct sbus_request *, void *data, const char * * *, int *); }; /* finish function for Blink */ -- cgit