[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  de2bc19 selftest: systematize formatting of if/elseif/else indentation in cleanup_child
       via  98304a8 selftest: improve logic in cleanup_child() with early return
       via  e06d016 selftest: improve misleading indentation in cleanup_child()
       via  7a3f0cf selftest: fix printf in cleanup_child()
      from  b2b951d heimdal make kvno unisgned internally

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


- Log -----------------------------------------------------------------
commit de2bc193ad0a46518e0c34210eadddaa81648758
Author: Michael Adam <obnox at samba.org>
Date:   Sat May 14 00:51:19 2016 +0200

    selftest: systematize formatting of if/elseif/else indentation in cleanup_child
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue May 24 13:43:35 CEST 2016 on sn-devel-144

commit 98304a84b7d404a6ac675a7474c9b68ff076a90b
Author: Michael Adam <obnox at samba.org>
Date:   Sat May 14 00:49:40 2016 +0200

    selftest: improve logic in cleanup_child() with early return
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit e06d01647ea406e38627d644d21d1f9361683550
Author: Michael Adam <obnox at samba.org>
Date:   Sat May 14 00:44:18 2016 +0200

    selftest: improve misleading indentation in cleanup_child()
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 7a3f0cfd6589023b2e66bf008966bdea785c18b9
Author: Michael Adam <obnox at samba.org>
Date:   Sat May 14 00:38:48 2016 +0200

    selftest: fix printf in cleanup_child()
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 selftest/target/Samba.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 6f37aa3..bb33fb7 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -313,20 +313,21 @@ sub get_interface($)
 sub cleanup_child($$)
 {
     my ($pid, $name) = @_;
-    my $childpid = -1;
 
-    if (defined($pid)) {
-        $childpid = waitpid($pid, WNOHANG);
+    if (!defined($pid)) {
+        print STDERR "cleanup_child: pid not defined ... not calling waitpid\n";
+        return -1;
     }
 
+    my $childpid = waitpid($pid, WNOHANG);
+
     if ($childpid == 0) {
     } elsif ($childpid < 0) {
-	printf STDERR "%s child process %d isn't here any more\n",
+	printf STDERR "%s child process %d isn't here any more\n", $name, $pid;
 	return $childpid;
-    }
-    elsif ($? & 127) {
+    } elsif ($? & 127) {
 	printf STDERR "%s child process %d, died with signal %d, %s coredump\n",
-	$name, $childpid, ($? & 127),  ($? & 128) ? 'with' : 'without';
+		$name, $childpid, ($? & 127),  ($? & 128) ? 'with' : 'without';
     } else {
 	printf STDERR "%s child process %d exited with value %d\n", $name, $childpid, $? >> 8;
     }


-- 
Samba Shared Repository