From 9ea50a60e17a1c52ff92ce8b24578442e6c30ec2 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Thu, 22 May 2008 01:25:37 +0000
Subject: [PATCH] * string.h (strchr): Eliminate. * syscalls.cc (rename): Work
 around inexplicable C++ warning.

---
 winsup/cygwin/ChangeLog   |  6 ++++++
 winsup/cygwin/string.h    | 21 ---------------------
 winsup/cygwin/syscalls.cc |  2 +-
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 98d189d52..dc823062b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-21  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* string.h (strchr): Eliminate.
+
+	* syscalls.cc (rename): Work around inexplicable C++ warning.
+
 2008-05-21  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_disk_file.cc (get_ino_by_handle): Rename pfai to fai.
diff --git a/winsup/cygwin/string.h b/winsup/cygwin/string.h
index 0e0477deb..b02fadb8f 100644
--- a/winsup/cygwin/string.h
+++ b/winsup/cygwin/string.h
@@ -17,27 +17,6 @@ details. */
 extern "C" {
 #endif
 
-#undef strchr
-#define strchr cygwin_strchr
-static inline __stdcall char *
-strchr (const char *s, int c)
-{
-  register char * res;
-  __asm__ __volatile__ ("\
-	movb	%%al,%%ah\n\
-1:	movb	(%1),%%al\n\
-	cmpb	%%ah,%%al\n\
-	je	2f\n\
-	incl	%1\n\
-	testb	%%al,%%al\n\
-	jne	1b\n\
-	xorl	%1,%1\n\
-2:	movl	%1,%0\n\
-	":"=a" (res), "=r" (s)
-	:"0" (c), "1" (s));
-  return res;
-}
-
 #undef strechr
 #define strechr cygwin_strechr
 static inline __stdcall char *
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 01e744570..a7471d958 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1505,7 +1505,7 @@ rename (const char *oldpath, const char *newpath)
   bool old_explicit_suffix = false, new_explicit_suffix = false;
   size_t olen, nlen;
   bool equal_path;
-  NTSTATUS status;
+  NTSTATUS status = 0;
   HANDLE fh = NULL, nfh;
   HANDLE old_trans = NULL, trans = NULL;
   OBJECT_ATTRIBUTES attr;