[SSSD] [PATCH] Remove duplicate declaration

Jakub Hrozek jhrozek at redhat.com
Tue Oct 22 09:43:22 UTC 2013


On Mon, Oct 21, 2013 at 04:48:16PM +0200, Lukas Slebodnik wrote:
> On (21/10/13 11:27), Jakub Hrozek wrote:
> >sss_parse_name() was declared twice for no apparent reason. This patch
> >removes the duplicate declaration.
> 
> >From 9634c03d1f755eb6de9f2c3fcd6bd5cb46f1bebe Mon Sep 17 00:00:00 2001
> >From: Jakub Hrozek <jhrozek at redhat.com>
> >Date: Wed, 2 Oct 2013 14:58:30 +0200
> >Subject: [PATCH] Remove duplicate declaration
> >
> >---
> > src/responder/common/responder.h | 4 ----
> > 1 file changed, 4 deletions(-)
> >
> >diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h
> >index fad16eb8913a673a85c187538a32937afb490f9f..c1b699de143d786eb7c2eb1c809981f9a8d1f82e 100644
> >--- a/src/responder/common/responder.h
> >+++ b/src/responder/common/responder.h
> >@@ -159,10 +159,6 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
> >                      struct sbus_interface *dp_intf,
> >                      struct resp_ctx **responder_ctx);
> > 
> >-int sss_parse_name(TALLOC_CTX *memctx,
> >-                   struct sss_names_ctx *snctx,
> >-                   const char *orig, char **domain, char **name);
> >-
> > int sss_parse_name_for_domains(TALLOC_CTX *memctx,
> >                                struct sss_domain_info *domains,
> >                                const char *default_domain,
> >-- 
> >1.8.3.1
> >
> 
> Nice catch.
> 
> sss_parse_name is defined in src/util/usertools.c
> and declarations were in header files:
>    src/responder/common/responder.h src/util/util.h:int
> sss_parse_name is used in {providers, responders and tools}
> 
> sss_parse_name_for_domains is also defined in src/util/usertools.c
>    declaration is only in header file src/responder/common/responder.h
> sss_parse_name_for_domains is used only in responders.
> 
> And now question:
> Does it make sense to move declaration into util.h ?
> 
> LS

I think you're right, the declaration should be in the same module as
definition. I think the function moved at one point.

New patches are attached.
-------------- next part --------------
>From db78033d2882c4c544b7573c045c82817a9f6210 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Wed, 2 Oct 2013 14:58:30 +0200
Subject: [PATCH 1/2] Remove duplicate declaration

---
 src/responder/common/responder.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h
index fad16eb8913a673a85c187538a32937afb490f9f..c1b699de143d786eb7c2eb1c809981f9a8d1f82e 100644
--- a/src/responder/common/responder.h
+++ b/src/responder/common/responder.h
@@ -159,10 +159,6 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
                      struct sbus_interface *dp_intf,
                      struct resp_ctx **responder_ctx);
 
-int sss_parse_name(TALLOC_CTX *memctx,
-                   struct sss_names_ctx *snctx,
-                   const char *orig, char **domain, char **name);
-
 int sss_parse_name_for_domains(TALLOC_CTX *memctx,
                                struct sss_domain_info *domains,
                                const char *default_domain,
-- 
1.8.3.1

-------------- next part --------------
>From dca80a7580482c0e7be1768c6834c317d6f5b331 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Tue, 22 Oct 2013 11:38:53 +0200
Subject: [PATCH 2/2] UTIL: Move sss_parse_name_for_domains declaration to
 util.h

---
 src/responder/common/responder.h | 5 -----
 src/util/util.h                  | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h
index c1b699de143d786eb7c2eb1c809981f9a8d1f82e..81082c675f4e2f611e655bcda5571eee9cb28d10 100644
--- a/src/responder/common/responder.h
+++ b/src/responder/common/responder.h
@@ -159,11 +159,6 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
                      struct sbus_interface *dp_intf,
                      struct resp_ctx **responder_ctx);
 
-int sss_parse_name_for_domains(TALLOC_CTX *memctx,
-                               struct sss_domain_info *domains,
-                               const char *default_domain,
-                               const char *orig, char **domain, char **name);
-
 int sss_dp_get_domain_conn(struct resp_ctx *rctx, const char *domain,
                            struct be_conn **_conn);
 struct sss_domain_info *
diff --git a/src/util/util.h b/src/util/util.h
index 3789c278c11228a11a58feb68cb6d17041de498e..e41b576d597a90e9e2b94fbdbdde1b9c723c8ca8 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -354,6 +354,11 @@ int sss_parse_name(TALLOC_CTX *memctx,
                    struct sss_names_ctx *snctx,
                    const char *orig, char **domain, char **name);
 
+int sss_parse_name_for_domains(TALLOC_CTX *memctx,
+                               struct sss_domain_info *domains,
+                               const char *default_domain,
+                               const char *orig, char **domain, char **name);
+
 char *
 sss_get_cased_name(TALLOC_CTX *mem_ctx, const char *orig_name,
                    bool case_sensitive);
-- 
1.8.3.1



More information about the sssd-devel mailing list