[newlib-cygwin] Cygwin: rename: rename incoming flags argument to at2flags

Corinna Vinschen corinna@sourceware.org
Wed Jan 9 14:47:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=15094d5d0135db0de71d02472a167904bef53cf7

commit 15094d5d0135db0de71d02472a167904bef53cf7
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Wed Jan 9 14:45:37 2019 +0100

    Cygwin: rename: rename incoming flags argument to at2flags
    
    Avoid name confusion with later used flags variable
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/syscalls.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index fcf2d86..78ac44b 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -2209,14 +2209,14 @@ nt_path_has_executable_suffix (PUNICODE_STRING upath)
    of the rename is just to change the case of oldpath on a
    case-insensitive file system. */
 static int
-rename2 (const char *oldpath, const char *newpath, unsigned int flags)
+rename2 (const char *oldpath, const char *newpath, unsigned int at2flags)
 {
   tmp_pathbuf tp;
   int res = -1;
   path_conv oldpc, newpc, new2pc, *dstpc, *removepc = NULL;
   bool old_dir_requested = false, new_dir_requested = false;
   bool old_explicit_suffix = false, new_explicit_suffix = false;
-  bool noreplace = flags & RENAME_NOREPLACE;
+  bool noreplace = at2flags & RENAME_NOREPLACE;
   size_t olen, nlen;
   bool equal_path;
   NTSTATUS status = STATUS_SUCCESS;
@@ -2229,7 +2229,7 @@ rename2 (const char *oldpath, const char *newpath, unsigned int flags)
 
   __try
     {
-      if (flags & ~RENAME_NOREPLACE)
+      if (at2flags & ~RENAME_NOREPLACE)
 	/* RENAME_NOREPLACE is the only flag currently supported. */
 	{
 	  set_errno (EINVAL);



More information about the Cygwin-cvs mailing list