From 4c28ddf7f0d33451b88e6061308a620f6701f145 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sun, 1 Mar 2026 12:45:38 -0500 Subject: fix compile, rename cryptic bw to rxbuflen. --- src/irc.c | 12 ++++++------ src/irc.h | 6 +++--- src/main.c | 3 +-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/irc.c b/src/irc.c index 8dfc6c5..18cd32d 100644 --- a/src/irc.c +++ b/src/irc.c @@ -393,7 +393,7 @@ static void irc_split_Lines(void) { int i; char *p = rx_buf; - for(i = 0; i < bw; i++) { + for(i = 0; i < rxbuflen; i++) { msgbuf[msgbuf_len] = *p; if(*p == CH_EOL) { msgbuf[msgbuf_len + 1] = '\0'; @@ -432,13 +432,13 @@ int irc_read(void) { } // Get # of bytes waiting, no more than size of rx_buf - bw = OS.dvstat[1] * 256 + OS.dvstat[0]; + rxbuflen = OS.dvstat[1] * 256 + OS.dvstat[0]; - if(bw > sizeof(rx_buf)) - bw = sizeof(rx_buf); + if(rxbuflen > sizeof(rx_buf)) + rxbuflen = sizeof(rx_buf); - if(bw > 0) { - err = nread(url, rx_buf, bw); + if(rxbuflen > 0) { + err = nread(url, rx_buf, rxbuflen); if(err != 1) { scr_print_current("READ ERROR: "); print_errnum(); diff --git a/src/irc.h b/src/irc.h index 2c0680f..8a230cd 100644 --- a/src/irc.h +++ b/src/irc.h @@ -8,13 +8,13 @@ extern char url[256]; extern char usernick[32]; extern char channel[32]; -extern unsigned char rx_buf[MAX_IRC_MSG_LEN]; -extern unsigned short bw; +extern char *rx_buf; +extern unsigned short rxbuflen; extern unsigned char err; extern unsigned char trip; extern unsigned int txbuflen; -extern char tx_buf[MAX_IRC_MSG_LEN]; +extern char *tx_buf; /* clears the transmit buffer. */ void txbuf_init(void); diff --git a/src/main.c b/src/main.c index 2685da8..354369d 100644 --- a/src/main.c +++ b/src/main.c @@ -28,8 +28,7 @@ unsigned char err; // error code of last operation. unsigned char trip=0; // if trip=1, fujinet is asking us for attention. bool old_enabled=false; // were interrupts enabled for old vector void* old_vprced; // old PROCEED vector, restored on exit. -unsigned short bw=0; // # of bytes waiting. -extern char *rx_buf, *tx_buf /* 512 bytes each, see addrs.c */ +unsigned short rxbuflen; unsigned int txbuflen; // TX buffer length char channel[32] = DEF_CHANNEL; -- cgit v1.2.3