public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Takashi Yano <tyan0@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: pty: Adopt the variable name to the name generally used.
Date: Sat,  5 Mar 2022 01:06:01 +0000 (GMT)	[thread overview]
Message-ID: <20220305010601.19F953858D1E@sourceware.org> (raw)

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

commit 7c87cce6e2fe67584c20da1d4f7c5e4f19940250
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Sat Mar 5 09:39:26 2022 +0900

    Cygwin: pty: Adopt the variable name to the name generally used.
    
    - Generally, '\n' is called "line feed" (not "new line"), so the
      variable name p_nl has been changed to p_lf.

Diff:
---
 winsup/cygwin/fhandler_tty.cc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index c2e612580..e29b93ceb 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -580,20 +580,20 @@ fhandler_pty_master::accept_input ()
       /* Write line by line for transfer input. */
       char *p0 = p;
       char *p_cr = (char *) memchr (p0, '\r', bytes_left - (p0 - p));
-      char *p_nl = (char *) memchr (p0, '\n', bytes_left - (p0 - p));
+      char *p_lf = (char *) memchr (p0, '\n', bytes_left - (p0 - p));
       DWORD n;
-      while (p_cr || p_nl)
+      while (p_cr || p_lf)
 	{
 	  char *p1 =
-	    p_cr ?  (p_nl ? ((p_cr + 1 == p_nl)
-			     ?  p_nl : min(p_cr, p_nl)) : p_cr) : p_nl;
+	    p_cr ?  (p_lf ? ((p_cr + 1 == p_lf)
+			     ?  p_lf : min(p_cr, p_lf)) : p_cr) : p_lf;
 	  n = p1 - p0 + 1;
 	  rc = WriteFile (write_to, p0, n, &n, NULL);
 	  if (rc)
 	    written += n;
 	  p0 = p1 + 1;
 	  p_cr = (char *) memchr (p0, '\r', bytes_left - (p0 - p));
-	  p_nl = (char *) memchr (p0, '\n', bytes_left - (p0 - p));
+	  p_lf = (char *) memchr (p0, '\n', bytes_left - (p0 - p));
 	}
       if (rc && (n = bytes_left - (p0 - p)))
 	{
@@ -3920,19 +3920,19 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
 	  /* Call WriteFile() line by line */
 	  char *p0 = ptr;
 	  char *p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr));
-	  char *p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr));
-	  while (p_cr || p_nl)
+	  char *p_lf = (char *) memchr (p0, '\n', len - (p0 - ptr));
+	  while (p_cr || p_lf)
 	    {
 	      char *p1 =
-		p_cr ?  (p_nl ? ((p_cr + 1 == p_nl)
-				 ?  p_nl : min(p_cr, p_nl)) : p_cr) : p_nl;
+		p_cr ?  (p_lf ? ((p_cr + 1 == p_lf)
+				 ?  p_lf : min(p_cr, p_lf)) : p_cr) : p_lf;
 	      *p1 = '\n';
 	      n = p1 - p0 + 1;
 	      if (n && WriteFile (to, p0, n, &n, NULL) && n)
 		transfered = true;
 	      p0 = p1 + 1;
 	      p_cr = (char *) memchr (p0, '\r', len - (p0 - ptr));
-	      p_nl = (char *) memchr (p0, '\n', len - (p0 - ptr));
+	      p_lf = (char *) memchr (p0, '\n', len - (p0 - ptr));
 	    }
 	  n = len - (p0 - ptr);
 	  if (n && WriteFile (to, p0, n, &n, NULL) && n)


                 reply	other threads:[~2022-03-05  1:06 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220305010601.19F953858D1E@sourceware.org \
    --to=tyan0@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).