From 1beaa471e7d11fa6942d501afbfd925182a6a7e3 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 27 Sep 2013 06:29:41 -0700 Subject: [PATCH] Remove dead code. Now we have no SWAT we don't use the invalid_services array or associated counter. Signed-off-by: Jeremy Allison --- source3/param/loadparm.c | 50 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index b9945ac..f3ba07d 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -288,8 +288,6 @@ static struct loadparm_service **ServicePtrs = NULL; static int iNumServices = 0; static int iServiceIndex = 0; static struct db_context *ServiceHash; -static int *invalid_services = NULL; -static int num_invalid_services = 0; static bool bInGlobalSection = true; static bool bGlobalOnly = false; @@ -1533,7 +1531,6 @@ static void free_service_byindex(int idx) return; ServicePtrs[idx]->valid = false; - invalid_services[num_invalid_services++] = idx; /* we have to cleanup the hash record */ @@ -1560,6 +1557,7 @@ static int add_a_service(const struct loadparm_service *pservice, const char *na int i; struct loadparm_service tservice; int num_to_alloc = iNumServices + 1; + struct loadparm_service **tsp = NULL; tservice = *pservice; @@ -1571,42 +1569,19 @@ static int add_a_service(const struct loadparm_service *pservice, const char *na } } - /* find an invalid one */ - i = iNumServices; - if (num_invalid_services > 0) { - i = invalid_services[--num_invalid_services]; - } - /* if not, then create one */ - if (i == iNumServices) { - struct loadparm_service **tsp; - int *tinvalid; - - tsp = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(ServicePtrs, struct loadparm_service *, num_to_alloc); - if (tsp == NULL) { - DEBUG(0,("add_a_service: failed to enlarge ServicePtrs!\n")); - return (-1); - } - ServicePtrs = tsp; - ServicePtrs[iNumServices] = talloc(NULL, struct loadparm_service); - if (!ServicePtrs[iNumServices]) { - DEBUG(0,("add_a_service: out of memory!\n")); - return (-1); - } - iNumServices++; - - /* enlarge invalid_services here for now... */ - tinvalid = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(invalid_services, int, - num_to_alloc); - if (tinvalid == NULL) { - DEBUG(0,("add_a_service: failed to enlarge " - "invalid_services!\n")); - return (-1); - } - invalid_services = tinvalid; - } else { - free_service_byindex(i); + tsp = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(ServicePtrs, struct loadparm_service *, num_to_alloc); + if (tsp == NULL) { + DEBUG(0,("add_a_service: failed to enlarge ServicePtrs!\n")); + return (-1); + } + ServicePtrs = tsp; + ServicePtrs[iNumServices] = talloc(NULL, struct loadparm_service); + if (!ServicePtrs[iNumServices]) { + DEBUG(0,("add_a_service: out of memory!\n")); + return (-1); } + iNumServices++; ServicePtrs[i]->valid = true; @@ -5277,7 +5252,6 @@ bool lp_preferred_master(void) void lp_remove_service(int snum) { ServicePtrs[snum]->valid = false; - invalid_services[num_invalid_services++] = snum; } /******************************************************************* -- 1.8.1.2