From: Gurusamy Sarathy <gsar@cpan.org>
Date: Tue, 1 Aug 2000 04:24:24 +0000 (+0000)
Subject: various syntax errors and such (not fixed: comp/require.t#22 coredump
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a7867d0afe06715af8daed54e07334b50c98a192;p=p5sagit%2Fp5-mst-13.2.git

various syntax errors and such (not fixed: comp/require.t#22 coredump
on Windows)

p4raw-id: //depot/perl@6476
---

diff --git a/t/pragma/utf8.t b/t/pragma/utf8.t
index 03f7a35..d1546fe 100755
--- a/t/pragma/utf8.t
+++ b/t/pragma/utf8.t
@@ -10,7 +10,7 @@ BEGIN {
     }
 }
 
-print "1..67\n";
+print "1..66\n";
 
 my $test = 1;
 
diff --git a/utf8.c b/utf8.c
index 6a99d9d..e86c49f 100644
--- a/utf8.c
+++ b/utf8.c
@@ -333,7 +333,7 @@ Perl_utf16_to_utf8(pTHX_ U8* p, U8* d, I32 bytelen, I32 *newlen)
     U8* dstart = d;
 
     if (bytelen & 1)
-	Perl_croak("panic: utf16_to_utf8: odd bytelen");
+	Perl_croak(aTHX_ "panic: utf16_to_utf8: odd bytelen");
 
     pend = p + bytelen;
 
diff --git a/win32/win32.c b/win32/win32.c
index 3c3d1e5..6856884 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1666,20 +1666,19 @@ win32_waitpid(int pid, int *status, int flags)
 	long child = find_pid(pid);
 	if (child >= 0) {
 	    HANDLE hProcess = w32_child_handles[child];
-		 DWORD timeout=(flags&WNOHANG)?0:INFINITE;
-		 DWORD waitcode = WaitForSingleObject(hProcess, timeout);
-		 if (waitcode == WAIT_TIMEOUT) {
-		 {
-			return 0;
-		 }
-		 else if (waitcode != WAIT_FAILED) {
-		     if (GetExitCodeProcess(hProcess, &waitcode)) {
-			 *status = (int)((waitcode & 0xff) << 8);
-			 retval = (int)w32_child_pids[child];
-			 remove_dead_process(child);
-			 return retval;
-		     }
+	    DWORD timeout = (flags & WNOHANG) ? 0 : INFINITE;
+	    DWORD waitcode = WaitForSingleObject(hProcess, timeout);
+	    if (waitcode == WAIT_TIMEOUT) {
+		return 0;
+	    }
+	    else if (waitcode != WAIT_FAILED) {
+		 if (GetExitCodeProcess(hProcess, &waitcode)) {
+		     *status = (int)((waitcode & 0xff) << 8);
+		     retval = (int)w32_child_pids[child];
+		     remove_dead_process(child);
+		     return retval;
 		 }
+	    }
 	    else
 		errno = ECHILD;
 	}