[PATCH 27/37] param: remove unnecessary dump a service
abartlet at samba.org
abartlet at samba.org
Fri Jun 20 05:47:49 MDT 2014
From: Garming Sam <garming at catalyst.net.nz>
Change-Id: I59b4edf929b4f8338e4c1a7116e0d1ef1bcad287
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
---
source3/param/loadparm.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 15a1ea1..ed91fe5 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2907,15 +2907,6 @@ static void dump_globals(FILE *f, bool show_defaults)
}
/***************************************************************************
- Display the contents of a single services record.
-***************************************************************************/
-
-static void dump_a_service(struct loadparm_service *pService, FILE * f, bool show_defaults)
-{
- return lpcfg_dump_a_service(pService, &sDefault, f, flags_list, show_defaults);
-}
-
-/***************************************************************************
Display the contents of a parameter of a single services record.
***************************************************************************/
@@ -4208,7 +4199,7 @@ void lp_dump(FILE *f, bool show_defaults, int maxtoprint)
dump_globals(f, defaults_saved);
- dump_a_service(&sDefault, f, show_defaults);
+ lpcfg_dump_a_service(&sDefault, &sDefault, f, flags_list, show_defaults);
for (iService = 0; iService < maxtoprint; iService++) {
fprintf(f,"\n");
@@ -4225,7 +4216,8 @@ void lp_dump_one(FILE * f, bool show_defaults, int snum)
if (VALID(snum)) {
if (ServicePtrs[snum]->szService[0] == '\0')
return;
- dump_a_service(ServicePtrs[snum], f, show_defaults);
+ lpcfg_dump_a_service(ServicePtrs[snum], &sDefault, f,
+ flags_list, show_defaults);
}
}
--
1.9.3
More information about the samba-technical
mailing list