From 14204134bfdff8335adf06d94c092cb8e0774bd9 Mon Sep 17 00:00:00 2001 From: axel Date: Thu, 20 Oct 2005 22:06:10 +1000 Subject: [PATCH] Minor edits darcs-hash:20051020120610-ac50b-62950ed81377c38979ea2967f915eaa0e7f01e33.gz --- common.c | 1 - reader.c | 24 +++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/common.c b/common.c index 31e760349..4efe4fcb2 100644 --- a/common.c +++ b/common.c @@ -815,7 +815,6 @@ void debug( int level, wchar_t *msg, ... ) sb_printf( &sb, L"%ls: ", program_name ); sb_vprintf( &sb, msg, va ); va_end( va ); - if( screen_width ) { diff --git a/reader.c b/reader.c index a553ce952..f577a666d 100644 --- a/reader.c +++ b/reader.c @@ -2377,23 +2377,25 @@ static int read_i() return 0; } +/** + Test if there are bytes available for reading on the specified file + descriptor +*/ static int can_read( int fd ) { - struct pollfd pfd = - { - fd, POLLIN, 0 - } + struct pollfd pfd[] = + { + { + fd, POLLIN, 0 + } + } ; - switch( poll( &pfd, 1, 0 ) ) - { - case 1: - return 1; - } - return 0; + return poll( pfd, 1, 0 ) == 1; } /** - Test if the specified character is in the private use area that fish uses to store internal characters + Test if the specified character is in the private use area that + fish uses to store internal characters */ static int wchar_private( wchar_t c ) {