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/responder/ifp/ifp_iface.c | 38 ++++++++++++++++----------------- src/responder/ifp/ifp_iface_generated.c | 38 ++++++++++++++++----------------- src/responder/ifp/ifp_iface_generated.h | 38 ++++++++++++++++----------------- 3 files changed, 57 insertions(+), 57 deletions(-) (limited to 'src/responder/ifp') diff --git a/src/responder/ifp/ifp_iface.c b/src/responder/ifp/ifp_iface.c index d0f0260d0..ffa3c46b7 100644 --- a/src/responder/ifp/ifp_iface.c +++ b/src/responder/ifp/ifp_iface.c @@ -49,31 +49,31 @@ struct iface_ifp_components iface_ifp_components = { .Disable = ifp_component_disable, .ChangeDebugLevel = ifp_component_change_debug_level, .ChangeDebugLevelTemporarily = ifp_component_change_debug_level_tmp, - .iface_ifp_components_get_name = ifp_component_get_name, - .iface_ifp_components_get_debug_level = ifp_component_get_debug_level, - .iface_ifp_components_get_enabled = ifp_component_get_enabled, - .iface_ifp_components_get_type = ifp_component_get_type, + .get_name = ifp_component_get_name, + .get_debug_level = ifp_component_get_debug_level, + .get_enabled = ifp_component_get_enabled, + .get_type = ifp_component_get_type, /* FIXME: This should be part of Components.Backends interface, onece * SSSD supports multiple interfaces per object path. */ - .iface_ifp_components_get_providers = ifp_backend_get_providers + .get_providers = ifp_backend_get_providers }; struct iface_ifp_domains iface_ifp_domains = { { &iface_ifp_domains_meta, 0 }, - .iface_ifp_domains_get_name = ifp_dom_get_name, - .iface_ifp_domains_get_provider = ifp_dom_get_provider, - .iface_ifp_domains_get_primary_servers = ifp_dom_get_primary_servers, - .iface_ifp_domains_get_backup_servers = ifp_dom_get_backup_servers, - .iface_ifp_domains_get_min_id = ifp_dom_get_min_id, - .iface_ifp_domains_get_max_id = ifp_dom_get_max_id, - .iface_ifp_domains_get_realm = ifp_dom_get_realm, - .iface_ifp_domains_get_forest = ifp_dom_get_forest, - .iface_ifp_domains_get_login_format = ifp_dom_get_login_format, - .iface_ifp_domains_get_fully_qualified_name_format = ifp_dom_get_fqdn_format, - .iface_ifp_domains_get_enumerable = ifp_dom_get_enumerable, - .iface_ifp_domains_get_use_fully_qualified_names = ifp_dom_get_use_fqdn, - .iface_ifp_domains_get_subdomain = ifp_dom_get_subdomain, - .iface_ifp_domains_get_parent_domain = ifp_dom_get_parent_domain + .get_name = ifp_dom_get_name, + .get_provider = ifp_dom_get_provider, + .get_primary_servers = ifp_dom_get_primary_servers, + .get_backup_servers = ifp_dom_get_backup_servers, + .get_min_id = ifp_dom_get_min_id, + .get_max_id = ifp_dom_get_max_id, + .get_realm = ifp_dom_get_realm, + .get_forest = ifp_dom_get_forest, + .get_login_format = ifp_dom_get_login_format, + .get_fully_qualified_name_format = ifp_dom_get_fqdn_format, + .get_enumerable = ifp_dom_get_enumerable, + .get_use_fully_qualified_names = ifp_dom_get_use_fqdn, + .get_subdomain = ifp_dom_get_subdomain, + .get_parent_domain = ifp_dom_get_parent_domain }; struct iface_map { diff --git a/src/responder/ifp/ifp_iface_generated.c b/src/responder/ifp/ifp_iface_generated.c index 2cdfa3012..9c00a8c59 100644 --- a/src/responder/ifp/ifp_iface_generated.c +++ b/src/responder/ifp/ifp_iface_generated.c @@ -332,7 +332,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = { "name", /* name */ "s", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_components, iface_ifp_components_get_name), + offsetof(struct iface_ifp_components, get_name), sbus_invoke_get_s, 0, /* not writable */ NULL, /* no invoker */ @@ -341,7 +341,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = { "debug_level", /* name */ "u", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_components, iface_ifp_components_get_debug_level), + offsetof(struct iface_ifp_components, get_debug_level), sbus_invoke_get_u, 0, /* not writable */ NULL, /* no invoker */ @@ -350,7 +350,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = { "enabled", /* name */ "b", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_components, iface_ifp_components_get_enabled), + offsetof(struct iface_ifp_components, get_enabled), sbus_invoke_get_b, 0, /* not writable */ NULL, /* no invoker */ @@ -359,7 +359,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = { "type", /* name */ "s", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_components, iface_ifp_components_get_type), + offsetof(struct iface_ifp_components, get_type), sbus_invoke_get_s, 0, /* not writable */ NULL, /* no invoker */ @@ -368,7 +368,7 @@ const struct sbus_property_meta iface_ifp_components__properties[] = { "providers", /* name */ "as", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_components, iface_ifp_components_get_providers), + offsetof(struct iface_ifp_components, get_providers), sbus_invoke_get_as, 0, /* not writable */ NULL, /* no invoker */ @@ -391,7 +391,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "name", /* name */ "s", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_name), + offsetof(struct iface_ifp_domains, get_name), sbus_invoke_get_s, 0, /* not writable */ NULL, /* no invoker */ @@ -400,7 +400,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "provider", /* name */ "s", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_provider), + offsetof(struct iface_ifp_domains, get_provider), sbus_invoke_get_s, 0, /* not writable */ NULL, /* no invoker */ @@ -409,7 +409,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "primary_servers", /* name */ "as", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_primary_servers), + offsetof(struct iface_ifp_domains, get_primary_servers), sbus_invoke_get_as, 0, /* not writable */ NULL, /* no invoker */ @@ -418,7 +418,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "backup_servers", /* name */ "as", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_backup_servers), + offsetof(struct iface_ifp_domains, get_backup_servers), sbus_invoke_get_as, 0, /* not writable */ NULL, /* no invoker */ @@ -427,7 +427,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "min_id", /* name */ "u", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_min_id), + offsetof(struct iface_ifp_domains, get_min_id), sbus_invoke_get_u, 0, /* not writable */ NULL, /* no invoker */ @@ -436,7 +436,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "max_id", /* name */ "u", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_max_id), + offsetof(struct iface_ifp_domains, get_max_id), sbus_invoke_get_u, 0, /* not writable */ NULL, /* no invoker */ @@ -445,7 +445,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "realm", /* name */ "s", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_realm), + offsetof(struct iface_ifp_domains, get_realm), sbus_invoke_get_s, 0, /* not writable */ NULL, /* no invoker */ @@ -454,7 +454,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "forest", /* name */ "s", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_forest), + offsetof(struct iface_ifp_domains, get_forest), sbus_invoke_get_s, 0, /* not writable */ NULL, /* no invoker */ @@ -463,7 +463,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "login_format", /* name */ "s", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_login_format), + offsetof(struct iface_ifp_domains, get_login_format), sbus_invoke_get_s, 0, /* not writable */ NULL, /* no invoker */ @@ -472,7 +472,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "fully_qualified_name_format", /* name */ "s", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_fully_qualified_name_format), + offsetof(struct iface_ifp_domains, get_fully_qualified_name_format), sbus_invoke_get_s, 0, /* not writable */ NULL, /* no invoker */ @@ -481,7 +481,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "enumerable", /* name */ "b", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_enumerable), + offsetof(struct iface_ifp_domains, get_enumerable), sbus_invoke_get_b, 0, /* not writable */ NULL, /* no invoker */ @@ -490,7 +490,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "use_fully_qualified_names", /* name */ "b", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_use_fully_qualified_names), + offsetof(struct iface_ifp_domains, get_use_fully_qualified_names), sbus_invoke_get_b, 0, /* not writable */ NULL, /* no invoker */ @@ -499,7 +499,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "subdomain", /* name */ "b", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_subdomain), + offsetof(struct iface_ifp_domains, get_subdomain), sbus_invoke_get_b, 0, /* not writable */ NULL, /* no invoker */ @@ -508,7 +508,7 @@ const struct sbus_property_meta iface_ifp_domains__properties[] = { "parent_domain", /* name */ "o", /* type */ SBUS_PROPERTY_READABLE, - offsetof(struct iface_ifp_domains, iface_ifp_domains_get_parent_domain), + offsetof(struct iface_ifp_domains, get_parent_domain), sbus_invoke_get_o, 0, /* not writable */ NULL, /* no invoker */ diff --git a/src/responder/ifp/ifp_iface_generated.h b/src/responder/ifp/ifp_iface_generated.h index 7dfe8c05f..e2f5a7eaf 100644 --- a/src/responder/ifp/ifp_iface_generated.h +++ b/src/responder/ifp/ifp_iface_generated.h @@ -122,11 +122,11 @@ struct iface_ifp_components { int (*Disable)(struct sbus_request *req, void *data); int (*ChangeDebugLevel)(struct sbus_request *req, void *data, uint32_t arg_new_level); int (*ChangeDebugLevelTemporarily)(struct sbus_request *req, void *data, uint32_t arg_new_level); - void (*iface_ifp_components_get_name)(struct sbus_request *, void *data, const char * *); - void (*iface_ifp_components_get_debug_level)(struct sbus_request *, void *data, uint32_t *); - void (*iface_ifp_components_get_enabled)(struct sbus_request *, void *data, bool *); - void (*iface_ifp_components_get_type)(struct sbus_request *, void *data, const char * *); - void (*iface_ifp_components_get_providers)(struct sbus_request *, void *data, const char * * *, int *); + void (*get_name)(struct sbus_request *, void *data, const char * *); + void (*get_debug_level)(struct sbus_request *, void *data, uint32_t *); + void (*get_enabled)(struct sbus_request *, void *data, bool *); + void (*get_type)(struct sbus_request *, void *data, const char * *); + void (*get_providers)(struct sbus_request *, void *data, const char * * *, int *); }; /* finish function for Enable */ @@ -144,20 +144,20 @@ int iface_ifp_components_ChangeDebugLevelTemporarily_finish(struct sbus_request /* vtable for org.freedesktop.sssd.infopipe.Domains */ struct iface_ifp_domains { struct sbus_vtable vtable; /* derive from sbus_vtable */ - void (*iface_ifp_domains_get_name)(struct sbus_request *, void *data, const char * *); - void (*iface_ifp_domains_get_provider)(struct sbus_request *, void *data, const char * *); - void (*iface_ifp_domains_get_primary_servers)(struct sbus_request *, void *data, const char * * *, int *); - void (*iface_ifp_domains_get_backup_servers)(struct sbus_request *, void *data, const char * * *, int *); - void (*iface_ifp_domains_get_min_id)(struct sbus_request *, void *data, uint32_t *); - void (*iface_ifp_domains_get_max_id)(struct sbus_request *, void *data, uint32_t *); - void (*iface_ifp_domains_get_realm)(struct sbus_request *, void *data, const char * *); - void (*iface_ifp_domains_get_forest)(struct sbus_request *, void *data, const char * *); - void (*iface_ifp_domains_get_login_format)(struct sbus_request *, void *data, const char * *); - void (*iface_ifp_domains_get_fully_qualified_name_format)(struct sbus_request *, void *data, const char * *); - void (*iface_ifp_domains_get_enumerable)(struct sbus_request *, void *data, bool *); - void (*iface_ifp_domains_get_use_fully_qualified_names)(struct sbus_request *, void *data, bool *); - void (*iface_ifp_domains_get_subdomain)(struct sbus_request *, void *data, bool *); - void (*iface_ifp_domains_get_parent_domain)(struct sbus_request *, void *data, const char * *); + void (*get_name)(struct sbus_request *, void *data, const char * *); + void (*get_provider)(struct sbus_request *, void *data, const char * *); + void (*get_primary_servers)(struct sbus_request *, void *data, const char * * *, int *); + void (*get_backup_servers)(struct sbus_request *, void *data, const char * * *, int *); + void (*get_min_id)(struct sbus_request *, void *data, uint32_t *); + void (*get_max_id)(struct sbus_request *, void *data, uint32_t *); + void (*get_realm)(struct sbus_request *, void *data, const char * *); + void (*get_forest)(struct sbus_request *, void *data, const char * *); + void (*get_login_format)(struct sbus_request *, void *data, const char * *); + void (*get_fully_qualified_name_format)(struct sbus_request *, void *data, const char * *); + void (*get_enumerable)(struct sbus_request *, void *data, bool *); + void (*get_use_fully_qualified_names)(struct sbus_request *, void *data, bool *); + void (*get_subdomain)(struct sbus_request *, void *data, bool *); + void (*get_parent_domain)(struct sbus_request *, void *data, const char * *); }; /* ------------------------------------------------------------------------ -- cgit