diff options
| author | John Dennis <jdennis@redhat.com> | 2013-04-11 11:15:10 -0400 |
|---|---|---|
| committer | John Dennis <jdennis@redhat.com> | 2013-04-11 11:15:10 -0400 |
| commit | fdf3440941bb8e2d13165f11513790bf846129ee (patch) | |
| tree | 726cb04731e9b806ee71066f4c8507443e02a38e /LMI_RealmdServiceProvider.c | |
| parent | fd54ccb3c66a0ee970cbfdf7b3fe3c4297cf24c3 (diff) | |
| download | realmd-cim-fdf3440941bb8e2d13165f11513790bf846129ee.tar.gz realmd-cim-fdf3440941bb8e2d13165f11513790bf846129ee.tar.xz realmd-cim-fdf3440941bb8e2d13165f11513790bf846129ee.zip | |
Rename GetDBusProperies to GET_DBUS_PROPERIES_OR_EXIT to make
it clear it's a macro that will branch to the exit label.
Diffstat (limited to 'LMI_RealmdServiceProvider.c')
| -rw-r--r-- | LMI_RealmdServiceProvider.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/LMI_RealmdServiceProvider.c b/LMI_RealmdServiceProvider.c index 2d0dc09..6d23427 100644 --- a/LMI_RealmdServiceProvider.c +++ b/LMI_RealmdServiceProvider.c @@ -33,12 +33,13 @@ get_joined_domain(GVariant *provider_props) g_variant_lookup(provider_props, "Realms", "ao", &iter); while (g_variant_iter_next(iter, "&o", &realm_obj_path)) { - GetDBusProperies(realm_props, realm_obj_path, REALM_DBUS_REALM_INTERFACE, &status); + GET_DBUS_PROPERIES_OR_EXIT(realm_props, realm_obj_path, + REALM_DBUS_REALM_INTERFACE, &status); if (g_variant_lookup(realm_props, "Configured", "&s", &configured_interface)) { if (strlen(configured_interface)) { if (strcmp(configured_interface, REALM_DBUS_KERBEROS_MEMBERSHIP_INTERFACE) == 0) { - GetDBusProperies(kerberos_props, realm_obj_path, - REALM_DBUS_KERBEROS_INTERFACE, &status); + GET_DBUS_PROPERIES_OR_EXIT(kerberos_props, realm_obj_path, + REALM_DBUS_KERBEROS_INTERFACE, &status); if (g_variant_lookup(kerberos_props, "DomainName", "&s", &domain_name)) { goto exit; } @@ -110,7 +111,8 @@ static CMPIStatus LMI_RealmdServiceEnumInstances( LMI_InitRealmdServiceKeys(LMI_RealmdService, &lmi_realmd_service, name_space, host_name); - GetDBusProperies(provider_props, REALM_DBUS_SERVICE_PATH, REALM_DBUS_PROVIDER_INTERFACE, &status); + GET_DBUS_PROPERIES_OR_EXIT(provider_props, REALM_DBUS_SERVICE_PATH, + REALM_DBUS_PROVIDER_INTERFACE, &status); g_variant_lookup(provider_props, "Realms", "ao", &iter); n_items = g_variant_iter_n_children(iter); @@ -467,7 +469,8 @@ KUint32 LMI_RealmdService_Join_Leave_Domain( dbus_path = paths[0]; /* Lookup the realm properties so we can determine the supported DBus interfaces */ - GetDBusProperies(realm_props, dbus_path, REALM_DBUS_REALM_INTERFACE, status); + GET_DBUS_PROPERIES_OR_EXIT(realm_props, dbus_path, + REALM_DBUS_REALM_INTERFACE, status); if (!SupportsDBusInterface(realm_props, REALM_DBUS_KERBEROS_MEMBERSHIP_INTERFACE)) { SetCMPIStatus(cb, status, CMPI_RC_ERR_FAILED, "Domain (%s) does not support joining or leaving", Domain->chars); @@ -475,8 +478,8 @@ KUint32 LMI_RealmdService_Join_Leave_Domain( goto exit; } - GetDBusProperies(kerberos_membership_props, dbus_path, - REALM_DBUS_KERBEROS_MEMBERSHIP_INTERFACE, status); + GET_DBUS_PROPERIES_OR_EXIT(kerberos_membership_props, dbus_path, + REALM_DBUS_KERBEROS_MEMBERSHIP_INTERFACE, status); if (!g_variant_lookup(kerberos_membership_props, supported_credentials_property, "@a(ss)", &supported_creds)) { |