From 0196bfcefc0cc9bd6ea1705a5d6d771d728cdf61 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sat, 31 Aug 2019 22:39:24 +0000
Subject: [PATCH] Use the preferred US-English spelling of "Canceled".
---
src/sbbs3/xmodem.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/sbbs3/xmodem.c b/src/sbbs3/xmodem.c
index 60fe0a4453..dc85fcbd36 100644
--- a/src/sbbs3/xmodem.c
+++ b/src/sbbs3/xmodem.c
@@ -193,6 +193,7 @@ int xmodem_get_block(xmodem_t* xm, uchar* block, unsigned expected_block_num)
uint b,errors;
uint16_t crc,calc_crc;
+ lprintf(xm, LOG_DEBUG, "Requesting data block %u", expected_block_num);
for(errors=0;errors<=xm->max_errors && is_connected(xm);errors++) {
i=getcom(expected_block_num<=1 ? 3 : 10);
@@ -228,7 +229,7 @@ int xmodem_get_block(xmodem_t* xm, uchar* block, unsigned expected_block_num)
,expected_block_num);
continue;
}
- lprintf(xm,LOG_WARNING,"Block %u: Cancelled remotely", expected_block_num);
+ lprintf(xm,LOG_WARNING,"Block %u: Canceled remotely", expected_block_num);
return(CAN);
default:
lprintf(xm,LOG_WARNING,"Block %u: Received %s Expected SOH, STX, or EOT"
@@ -362,7 +363,7 @@ int xmodem_get_ack(xmodem_t* xm, unsigned tries, unsigned block_num)
if((*xm->mode)&GMODE) { /* Don't wait for ACK on X/Ymodem-G */
SLEEP(xm->g_delay);
if(getcom(0)==CAN) {
- lprintf(xm,LOG_WARNING,"Block %u: !Cancelled remotely", block_num);
+ lprintf(xm,LOG_WARNING,"Block %u: !Canceled remotely", block_num);
xmodem_cancel(xm);
return(CAN);
}
@@ -376,7 +377,7 @@ int xmodem_get_ack(xmodem_t* xm, unsigned tries, unsigned block_num)
break;
if(i==CAN) {
if(can) { /* 2 CANs in a row */
- lprintf(xm,LOG_WARNING,"Block %u: !Cancelled remotely", block_num);
+ lprintf(xm,LOG_WARNING,"Block %u: !Canceled remotely", block_num);
xmodem_cancel(xm);
return(CAN);
}
@@ -426,7 +427,7 @@ BOOL xmodem_get_mode(xmodem_t* xm)
return(TRUE);
case CAN:
if(can) {
- lprintf(xm,LOG_WARNING,"Cancelled remotely");
+ lprintf(xm,LOG_WARNING,"Canceled remotely");
return(FALSE);
}
can=1;
--
GitLab