|
 |
1c5238 |
From 7e23e6394b518dd013c6b03a1a63715899180935 Mon Sep 17 00:00:00 2001
|
|
|
1c5238 |
From: Alexey Tikhonov <atikhono@redhat.com>
|
|
|
1c5238 |
Date: Sun, 6 Nov 2022 11:22:22 +0100
|
|
|
1c5238 |
Subject: [PATCH 14/16] TOOLS: don't export internal helpers
|
|
|
1c5238 |
MIME-Version: 1.0
|
|
|
1c5238 |
Content-Type: text/plain; charset=UTF-8
|
|
|
1c5238 |
Content-Transfer-Encoding: 8bit
|
|
|
1c5238 |
|
|
|
1c5238 |
Reviewed-by: Iker Pedrosa <ipedrosa@redhat.com>
|
|
|
1c5238 |
Reviewed-by: Justin Stephenson <jstephen@redhat.com>
|
|
|
1c5238 |
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
|
1c5238 |
(cherry picked from commit 6ef3aade0394e32540242f902c9f21bb8d6c41f2)
|
|
|
1c5238 |
|
|
|
1c5238 |
Reviewed-by: Iker Pedrosa <ipedrosa@redhat.com>
|
|
|
1c5238 |
Reviewed-by: Justin Stephenson <jstephen@redhat.com>
|
|
|
1c5238 |
---
|
|
|
1c5238 |
src/tools/common/sss_tools.c | 16 ++++++++--------
|
|
|
1c5238 |
src/tools/common/sss_tools.h | 12 ------------
|
|
|
1c5238 |
2 files changed, 8 insertions(+), 20 deletions(-)
|
|
|
1c5238 |
|
|
|
1c5238 |
diff --git a/src/tools/common/sss_tools.c b/src/tools/common/sss_tools.c
|
|
|
1c5238 |
index c066ddc5c..47b85bdd2 100644
|
|
|
1c5238 |
--- a/src/tools/common/sss_tools.c
|
|
|
1c5238 |
+++ b/src/tools/common/sss_tools.c
|
|
|
1c5238 |
@@ -178,9 +178,9 @@ static errno_t sss_tool_domains_init(TALLOC_CTX *mem_ctx,
|
|
|
1c5238 |
return ret;
|
|
|
1c5238 |
}
|
|
|
1c5238 |
|
|
|
1c5238 |
-errno_t sss_tool_init(TALLOC_CTX *mem_ctx,
|
|
|
1c5238 |
- int *argc, const char **argv,
|
|
|
1c5238 |
- struct sss_tool_ctx **_tool_ctx)
|
|
|
1c5238 |
+static errno_t sss_tool_init(TALLOC_CTX *mem_ctx,
|
|
|
1c5238 |
+ int *argc, const char **argv,
|
|
|
1c5238 |
+ struct sss_tool_ctx **_tool_ctx)
|
|
|
1c5238 |
{
|
|
|
1c5238 |
struct sss_tool_ctx *tool_ctx;
|
|
|
1c5238 |
|
|
|
1c5238 |
@@ -235,7 +235,7 @@ static size_t sss_tool_max_length(struct sss_route_cmd *commands)
|
|
|
1c5238 |
return max;
|
|
|
1c5238 |
}
|
|
|
1c5238 |
|
|
|
1c5238 |
-void sss_tool_usage(const char *tool_name, struct sss_route_cmd *commands)
|
|
|
1c5238 |
+static void sss_tool_usage(const char *tool_name, struct sss_route_cmd *commands)
|
|
|
1c5238 |
{
|
|
|
1c5238 |
int min_len;
|
|
|
1c5238 |
int i;
|
|
|
1c5238 |
@@ -304,10 +304,10 @@ done:
|
|
|
1c5238 |
return ret;
|
|
|
1c5238 |
}
|
|
|
1c5238 |
|
|
|
1c5238 |
-errno_t sss_tool_route(int argc, const char **argv,
|
|
|
1c5238 |
- struct sss_tool_ctx *tool_ctx,
|
|
|
1c5238 |
- struct sss_route_cmd *commands,
|
|
|
1c5238 |
- void *pvt)
|
|
|
1c5238 |
+static errno_t sss_tool_route(int argc, const char **argv,
|
|
|
1c5238 |
+ struct sss_tool_ctx *tool_ctx,
|
|
|
1c5238 |
+ struct sss_route_cmd *commands,
|
|
|
1c5238 |
+ void *pvt)
|
|
|
1c5238 |
{
|
|
|
1c5238 |
struct sss_cmdline cmdline;
|
|
|
1c5238 |
const char *cmd;
|
|
|
1c5238 |
diff --git a/src/tools/common/sss_tools.h b/src/tools/common/sss_tools.h
|
|
|
1c5238 |
index 0e4308ee6..578186633 100644
|
|
|
1c5238 |
--- a/src/tools/common/sss_tools.h
|
|
|
1c5238 |
+++ b/src/tools/common/sss_tools.h
|
|
|
1c5238 |
@@ -35,10 +35,6 @@ struct sss_tool_ctx {
|
|
|
1c5238 |
struct sss_domain_info *domains;
|
|
|
1c5238 |
};
|
|
|
1c5238 |
|
|
|
1c5238 |
-errno_t sss_tool_init(TALLOC_CTX *mem_ctx,
|
|
|
1c5238 |
- int *argc, const char **argv,
|
|
|
1c5238 |
- struct sss_tool_ctx **_tool_ctx);
|
|
|
1c5238 |
-
|
|
|
1c5238 |
struct sss_cmdline {
|
|
|
1c5238 |
const char *exec; /* argv[0] */
|
|
|
1c5238 |
const char *command; /* command name */
|
|
|
1c5238 |
@@ -69,14 +65,6 @@ struct sss_route_cmd {
|
|
|
1c5238 |
int flags;
|
|
|
1c5238 |
};
|
|
|
1c5238 |
|
|
|
1c5238 |
-void sss_tool_usage(const char *tool_name,
|
|
|
1c5238 |
- struct sss_route_cmd *commands);
|
|
|
1c5238 |
-
|
|
|
1c5238 |
-errno_t sss_tool_route(int argc, const char **argv,
|
|
|
1c5238 |
- struct sss_tool_ctx *tool_ctx,
|
|
|
1c5238 |
- struct sss_route_cmd *commands,
|
|
|
1c5238 |
- void *pvt);
|
|
|
1c5238 |
-
|
|
|
1c5238 |
typedef errno_t (*sss_popt_fn)(poptContext pc, char option, void *pvt);
|
|
|
1c5238 |
|
|
|
1c5238 |
enum sss_tool_opt {
|
|
|
1c5238 |
--
|
|
|
1c5238 |
2.37.3
|
|
|
1c5238 |
|