Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2016-03-20 23:59:43 +0300
committerCorinna Vinschen <corinna@vinschen.de>2016-03-20 23:59:43 +0300
commitbf0f4baf95d8c67ae7656db6649d986875e9c4af (patch)
tree466f9e24c6b16c7d74b9e3e8da6e8c5029b7e4ca
parent66dc7d731aaefb79efda7181bffd81abdc7d5413 (diff)
Revert "Debug printfs."
This reverts commit 9f82de59a07da145c177648fe474f19cd9def7a1. Revert accidental push
-rw-r--r--winsup/cygwin/fhandler.cc1
-rw-r--r--winsup/cygwin/fhandler_console.cc10
-rw-r--r--winsup/cygwin/select.cc12
3 files changed, 2 insertions, 21 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 86f77c3e8..33743d44d 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -90,7 +90,6 @@ fhandler_base::get_readahead ()
/* FIXME - not thread safe */
if (raixget >= ralen)
raixget = raixput = ralen = 0;
- debug_printf("available: %d", chret > -1);
return chret;
}
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index e0e2813ad..c510d7021 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -309,8 +309,6 @@ fhandler_console::read (void *pv, size_t& buflen)
int ch;
set_input_state ();
- debug_printf("requested buflen %d", buflen);
-
/* Check console read-ahead buffer filled from terminal requests */
if (con.cons_rapoi && *con.cons_rapoi)
{
@@ -320,7 +318,6 @@ fhandler_console::read (void *pv, size_t& buflen)
}
int copied_chars = get_readahead_into_buffer (buf, buflen);
- debug_printf("copied_chars %d", copied_chars);
if (copied_chars)
{
@@ -698,11 +695,9 @@ fhandler_console::read (void *pv, size_t& buflen)
continue;
}
- debug_printf("toadd = %p, nread = %d", toadd, nread);
if (toadd)
{
- ssize_t bytes_read;
- line_edit_status res = line_edit (toadd, nread, ti, &bytes_read);
+ line_edit_status res = line_edit (toadd, nread, ti);
if (res == line_edit_signalled)
goto sig_exit;
else if (res == line_edit_input_done)
@@ -710,8 +705,6 @@ fhandler_console::read (void *pv, size_t& buflen)
}
}
- debug_printf("ralen = %d, bytes = %d", ralen, ralen - raixget);
-
while (buflen)
if ((ch = get_readahead ()) < 0)
break;
@@ -723,7 +716,6 @@ fhandler_console::read (void *pv, size_t& buflen)
#undef buf
buflen = copied_chars;
- debug_printf("buflen set to %d", buflen);
return;
err:
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index 25b0c5a98..10205a051 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -925,28 +925,18 @@ peek_console (select_record *me, bool)
if (irec.Event.KeyEvent.bKeyDown
&& (irec.Event.KeyEvent.uChar.AsciiChar
|| fhandler_console::get_nonascii_key (irec, tmpbuf)))
- {
- debug_printf("peeked KEY_EVENT");
- return me->read_ready = true;
- }
+ return me->read_ready = true;
}
else
{
if (irec.EventType == MOUSE_EVENT
&& fh->mouse_aware (irec.Event.MouseEvent))
- {
- debug_printf("peeked MOUSE_EVENT");
return me->read_ready = true;
- }
if (irec.EventType == FOCUS_EVENT && fh->focus_aware ())
- {
- debug_printf("peeked FOCUS_EVENT");
return me->read_ready = true;
- }
}
/* Read and discard the event */
- debug_printf("discarded other event");
ReadConsoleInput (h, &irec, 1, &events_read);
}