Mercurial > hg > xemacs-beta
diff src/lstream.c @ 70:131b0175ea99 r20-0b30
Import from CVS: tag r20-0b30
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:02:59 +0200 |
parents | 441bb1e64a06 |
children | 54cc21c15cbb |
line wrap: on
line diff
--- a/src/lstream.c Mon Aug 13 09:00:04 2007 +0200 +++ b/src/lstream.c Mon Aug 13 09:02:59 2007 +0200 @@ -282,7 +282,11 @@ static void signal_simple_internal_error (CONST char *reason, Lisp_Object obj) { +#ifdef DEBUG_XEMACS + abort (); +#else signal_simple_error (reason, obj); +#endif } void @@ -686,8 +690,6 @@ static int Lstream_pseudo_close (Lstream *lstr) { - int rc; - if (!lstr->flags & LSTREAM_FL_IS_OPEN) { Lisp_Object obj = Qnil; @@ -697,20 +699,18 @@ } /* don't check errors here -- best not to risk file descriptor loss */ - rc = Lstream_flush (lstr); + Lstream_flush (lstr); - return rc; + return 0; } int Lstream_close (Lstream *lstr) { - int rc = 0; - if (lstr->flags & LSTREAM_FL_IS_OPEN) { /* don't return here on error, or file descriptor leak will result. */ - rc = Lstream_pseudo_close (lstr); + Lstream_pseudo_close (lstr); if (lstr->imp->closer) { if ((lstr->imp->closer) (lstr) < 0) @@ -743,7 +743,7 @@ lstr->unget_buffer = 0; } - return rc; + return 0; } int @@ -888,11 +888,11 @@ int current_pos; int end_pos; int chars_sans_newline; - unsigned int closing :1; - unsigned int allow_quit :1; - unsigned int blocked_ok :1; - unsigned int pty_flushing :1; - unsigned int blocking_error_p :1; + int closing :1; + int allow_quit :1; + int blocked_ok :1; + int pty_flushing :1; + int blocking_error_p :1; }; #define FILEDESC_STREAM_DATA(stream) LSTREAM_TYPE_DATA (stream, filedesc)