[SSSD] [PATCH] Fix parameter name.

[Michal Židek]

I forgot to send this patch before. So here it is now. See patch 
description for details.

Michal
>From 7611dce872213d2910c1aa9e23db2cd1545ec77e Mon Sep 17 00:00:00 2001
From: Michal Zidek <mzi...@redhat.com>
Date: Thu, 7 Nov 2013 14:37:19 +0100
Subject: [PATCH] Fix parameter name.
We use '_' as prefix for output parameters. In function
sysdb_get_rdn we wrongly used this prefix for input
parameter, which caused some confusion when reading
the code.
---
 src/db/sysdb.c | 16 ++++++++--------
 src/db/sysdb.h |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/db/sysdb.c b/src/db/sysdb.c
index 66836a6..283dabd 100644
--- a/src/db/sysdb.c
+++ b/src/db/sysdb.c
@@ -218,10 +218,10 @@ struct ldb_dn *sysdb_netgroup_base_dn(TALLOC_CTX *mem_ctx,
 }
 
 errno_t sysdb_get_rdn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
-                      const char *_dn, char **_name, char **_val)
+                      const char *dn, char **_name, char **_val)
 {
     errno_t ret;
-    struct ldb_dn *dn;
+    struct ldb_dn *ldb_dn;
     const char *attr_name = NULL;
     const struct ldb_val *val;
     TALLOC_CTX *tmp_ctx;
@@ -234,14 +234,14 @@ errno_t sysdb_get_rdn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
         return ENOMEM;
     }
 
-    dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, "%s", _dn);
-    if (dn == NULL) {
+    ldb_dn = ldb_dn_new_fmt(tmp_ctx, sysdb->ldb, "%s", dn);
+    if (ldb_dn == NULL) {
         ret = ENOMEM;
         goto done;
     }
 
     if (_name) {
-        attr_name = ldb_dn_get_rdn_name(dn);
+        attr_name = ldb_dn_get_rdn_name(ldb_dn);
         if (attr_name == NULL) {
             ret = EINVAL;
             goto done;
@@ -254,7 +254,7 @@ errno_t sysdb_get_rdn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
         }
     }
 
-    val = ldb_dn_get_rdn_val(dn);
+    val = ldb_dn_get_rdn_val(ldb_dn);
     if (val == NULL) {
         ret = EINVAL;
         if (_name) talloc_free(*_name);
@@ -276,9 +276,9 @@ done:
 }
 
 errno_t sysdb_group_dn_name(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
-                            const char *_dn, char **_name)
+                            const char *dn, char **_name)
 {
-    return sysdb_get_rdn(sysdb, mem_ctx, _dn, NULL, _name);
+    return sysdb_get_rdn(sysdb, mem_ctx, dn, NULL, _name);
 }
 
 struct ldb_dn *sysdb_domain_dn(TALLOC_CTX *mem_ctx,
diff --git a/src/db/sysdb.h b/src/db/sysdb.h
index 1b9bdb0..eb24f27 100644
--- a/src/db/sysdb.h
+++ b/src/db/sysdb.h
@@ -330,7 +330,7 @@ int sysdb_error_to_errno(int ldberr);
 
 /* DNs related helper functions */
 errno_t sysdb_get_rdn(struct sysdb_ctx *sysdb, TALLOC_CTX *mem_ctx,
-                      const char *_dn, char **_name, char **_val);
+                      const char *dn, char **_name, char **_val);
 struct ldb_dn *sysdb_user_dn(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom,
                              const char *name);
 struct ldb_dn *sysdb_group_dn(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom,
-- 
1.7.11.2

_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel