From 067bfcaad9baae2d962528839fde30ebd1a5ba2b Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Thu, 19 Jul 2012 19:00:27 -0400
Subject: Use a more tractable name for subdomain request

I am all for readable names, but there is a tradeof between expressing purpose
and compactness.
---
 src/providers/data_provider_be.c   |  4 ++--
 src/providers/dp_backend.h         |  2 +-
 src/providers/ipa/ipa_subdomains.c | 12 +++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
index 9571d0956..ba43d7d49 100644
--- a/src/providers/data_provider_be.c
+++ b/src/providers/data_provider_be.c
@@ -344,7 +344,7 @@ static void get_subdomains_callback(struct be_req *req,
 
 static int be_get_subdomains(DBusMessage *message, struct sbus_connection *conn)
 {
-    struct be_get_subdomains_req *req;
+    struct be_subdom_req *req;
     struct be_req *be_req = NULL;
     struct be_client *becli;
     DBusMessage *reply;
@@ -405,7 +405,7 @@ static int be_get_subdomains(DBusMessage *message, struct sbus_connection *conn)
     be_req->fn = get_subdomains_callback;
     be_req->pvt = reply;
 
-    req = talloc(be_req, struct be_get_subdomains_req);
+    req = talloc(be_req, struct be_subdom_req);
     if (!req) {
         err_maj = DP_ERR_FATAL;
         err_min = ENOMEM;
diff --git a/src/providers/dp_backend.h b/src/providers/dp_backend.h
index 131cd6ea3..6c9b0c0eb 100644
--- a/src/providers/dp_backend.h
+++ b/src/providers/dp_backend.h
@@ -171,7 +171,7 @@ struct be_autofs_req {
     char *mapname;
 };
 
-struct be_get_subdomains_req {
+struct be_subdom_req {
     bool force;
     char *domain_hint;
     struct sysdb_subdom **domain_list;
diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c
index 11fba6b9a..e842e24bf 100644
--- a/src/providers/ipa/ipa_subdomains.c
+++ b/src/providers/ipa/ipa_subdomains.c
@@ -151,10 +151,9 @@ done:
     return ret;
 }
 
-static errno_t ipa_subdomains_parse_results(
-                                        struct be_get_subdomains_req *sd_data,
-                                        size_t count,
-                                        struct sysdb_attrs **reply)
+static errno_t ipa_subdomains_parse_results(struct be_subdom_req *sd_data,
+                                            size_t count,
+                                            struct sysdb_attrs **reply)
 {
     struct sysdb_subdom **new_domain_list = NULL;
     const char *value;
@@ -234,7 +233,7 @@ struct ipa_subdomains_req_ctx {
     struct be_req *be_req;
     struct ipa_subdomains_ctx *sd_ctx;
     struct sdap_id_op *sdap_op;
-    struct be_get_subdomains_req *sd_data;
+    struct be_subdom_req *sd_data;
 
     char *current_filter;
 
@@ -287,8 +286,7 @@ void ipa_subdomains_handler(struct be_req *be_req)
     ctx->sd_ctx = talloc_get_type(
                         be_req->be_ctx->bet_info[BET_SUBDOMAINS].pvt_bet_data,
                         struct ipa_subdomains_ctx);
-    ctx->sd_data = talloc_get_type(be_req->req_data,
-                                     struct be_get_subdomains_req);
+    ctx->sd_data = talloc_get_type(be_req->req_data, struct be_subdom_req);
 
     ctx->search_base_iter = 0;
     ctx->search_bases = ctx->sd_ctx->search_bases;
-- 
cgit