comparison common-channel.c @ 433:c216212001fc

Fix for -pedantic -ansi compilation, change // to /**/, plus some signedness and trailing-comma-in-array issues
author Matt Johnston <matt@ucc.asn.au>
date Fri, 16 Feb 2007 14:42:08 +0000
parents b2b67cfcd66e
children ab370c629d36
comparison
equal deleted inserted replaced
432:517e76bdfb2d 433:c216212001fc
459 if ((channel->writefd >= 0 && cbuf_getused(channel->writebuf) > 0 ) 459 if ((channel->writefd >= 0 && cbuf_getused(channel->writebuf) > 0 )
460 || channel->initconn) { 460 || channel->initconn) {
461 FD_SET(channel->writefd, writefds); 461 FD_SET(channel->writefd, writefds);
462 } 462 }
463 463
464 if (ERRFD_IS_WRITE(channel) != NULL && channel->errfd >= 0 464 if (ERRFD_IS_WRITE(channel) && channel->errfd >= 0
465 && cbuf_getused(channel->extrabuf) > 0 ) { 465 && cbuf_getused(channel->extrabuf) > 0 ) {
466 FD_SET(channel->errfd, writefds); 466 FD_SET(channel->errfd, writefds);
467 } 467 }
468 468
469 } /* foreach channel */ 469 } /* foreach channel */
638 638
639 encrypt_packet(); 639 encrypt_packet();
640 640
641 /* If we receive less data than we requested when flushing, we've 641 /* If we receive less data than we requested when flushing, we've
642 reached the equivalent of EOF */ 642 reached the equivalent of EOF */
643 if (channel->flushing && len < maxlen) 643 if (channel->flushing && len < (ssize_t)maxlen)
644 { 644 {
645 TRACE(("closing from channel, flushing out.")) 645 TRACE(("closing from channel, flushing out."))
646 close_chan_fd(channel, fd, SHUT_RD); 646 close_chan_fd(channel, fd, SHUT_RD);
647 } 647 }
648 TRACE(("leave send_msg_channel_data")) 648 TRACE(("leave send_msg_channel_data"))