_dbus_user_database_get_groupname: Inline into its only caller

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
index 86ee00dd3a8a79d5496938a8d32b9d5581a06b73..7bbae0efa020d93c90b82755eb642d4439f740ac 100644 (file)
--- a/dbus/dbus-userdb-util.c
+++ b/dbus/dbus-userdb-util.c
@@ -181,8 +181,10 @@ _dbus_get_group_id (const DBusString  *groupname,
       return FALSE;
     }
 
-  if (!_dbus_user_database_get_groupname (db, groupname,
-                                          &info, NULL))
+  info = _dbus_user_database_lookup_group (db, DBUS_GID_UNSET, groupname,
+                                           NULL);
+
+  if (info == NULL)
     {
       _dbus_user_database_unlock_system ();
       return FALSE;
@@ -339,27 +341,6 @@ _dbus_user_database_lookup_group (DBusUserDatabase *db,
     }
 }
 
-
-/**
- * Gets the user information for the given group name,
- * returned group info should not be freed. 
- *
- * @param db user database
- * @param groupname the group name
- * @param info return location for const ref to group info
- * @param error error location
- * @returns #FALSE if error is set
- */
-dbus_bool_t
-_dbus_user_database_get_groupname (DBusUserDatabase     *db,
-                                   const DBusString     *groupname,
-                                   const DBusGroupInfo **info,
-                                   DBusError            *error)
-{
-  *info = _dbus_user_database_lookup_group (db, DBUS_GID_UNSET, groupname, error);
-  return *info != NULL;
-}
-
 /**
  * Gets all groups  corresponding to the given UID. Returns #FALSE
  * if no memory, or user isn't known, but always initializes

diff --git a/dbus/dbus-userdb.h b/dbus/dbus-userdb.h
index f2c2cc19c7e02b94076be1a0aba53ca26314cfa3..1eb4bd46358f8722c2e1d239debe251f56cb0532 100644 (file)
--- a/dbus/dbus-userdb.h
+++ b/dbus/dbus-userdb.h
@@ -66,11 +66,6 @@ dbus_bool_t       _dbus_user_database_get_username  (DBusUserDatabase     *db,
                                                      const DBusString     *username,
                                                      const DBusUserInfo  **info,
                                                      DBusError            *error);
-dbus_bool_t       _dbus_user_database_get_groupname (DBusUserDatabase     *db,
-                                                     const DBusString     *groupname,
-                                                     const DBusGroupInfo **info,
-                                                     DBusError            *error);
-
 DBUS_PRIVATE_EXPORT
 DBusUserInfo*  _dbus_user_database_lookup       (DBusUserDatabase *db,
                                                  dbus_uid_t        uid,