[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  415e3df loadparm: Remove an unneeded variable
      from  afc81e0 tests: Replace realpath with the more available 'readlink -f'

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 415e3df6416a5318841fea7c22f2e00af746062d
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 18 08:16:20 2016 +0100

    loadparm: Remove an unneeded variable
    
    When reviewing the patch for bug 11740 I found that the definition of
    "num_to_alloc" was not part of the patch text, I had to look it up
    in context. Unnecessary I believe.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Feb 19 15:56:19 CET 2016 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/param/loadparm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 50b29e3..1f8e578 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1372,7 +1372,6 @@ static void free_service_byindex(int idx)
 static int add_a_service(const struct loadparm_service *pservice, const char *name)
 {
 	int i;
-	int num_to_alloc = iNumServices + 1;
 	struct loadparm_service **tsp = NULL;
 
 	/* it might already exist */
@@ -1393,7 +1392,7 @@ static int add_a_service(const struct loadparm_service *pservice, const char *na
 		/* if not, then create one */
 		tsp = talloc_realloc(NULL, ServicePtrs,
 				     struct loadparm_service *,
-				     num_to_alloc);
+				     iNumServices + 1);
 		if (tsp == NULL) {
 			DEBUG(0, ("add_a_service: failed to enlarge "
 				  "ServicePtrs!\n"));


-- 
Samba Shared Repository