diff options
| author | Christopher Faylor <me@cgf.cx> | 2008-05-22 01:25:37 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2008-05-22 01:25:37 +0000 |
| commit | 9ea50a60e17a1c52ff92ce8b24578442e6c30ec2 (patch) | |
| tree | 7b35e299fdec9feee09c9c7ba4bc87305401d4fa | |
| parent | 4962a9453ac3a9c23cba3c7e952242a6831f0cb3 (diff) | |
| download | cygnal-9ea50a60e17a1c52ff92ce8b24578442e6c30ec2.tar.gz cygnal-9ea50a60e17a1c52ff92ce8b24578442e6c30ec2.tar.bz2 cygnal-9ea50a60e17a1c52ff92ce8b24578442e6c30ec2.zip | |
* string.h (strchr): Eliminate.
* syscalls.cc (rename): Work around inexplicable C++ warning.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/string.h | 21 | ||||
| -rw-r--r-- | 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; |