Skip to content
Snippets Groups Projects
Commit 0196bfce authored by rswindell's avatar rswindell
Browse files

Use the preferred US-English spelling of "Canceled".

parent f5187f3f
No related branches found
No related tags found
No related merge requests found
...@@ -193,6 +193,7 @@ int xmodem_get_block(xmodem_t* xm, uchar* block, unsigned expected_block_num) ...@@ -193,6 +193,7 @@ int xmodem_get_block(xmodem_t* xm, uchar* block, unsigned expected_block_num)
uint b,errors; uint b,errors;
uint16_t crc,calc_crc; 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++) { for(errors=0;errors<=xm->max_errors && is_connected(xm);errors++) {
i=getcom(expected_block_num<=1 ? 3 : 10); 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) ...@@ -228,7 +229,7 @@ int xmodem_get_block(xmodem_t* xm, uchar* block, unsigned expected_block_num)
,expected_block_num); ,expected_block_num);
continue; 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); return(CAN);
default: default:
lprintf(xm,LOG_WARNING,"Block %u: Received %s Expected SOH, STX, or EOT" 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) ...@@ -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 */ if((*xm->mode)&GMODE) { /* Don't wait for ACK on X/Ymodem-G */
SLEEP(xm->g_delay); SLEEP(xm->g_delay);
if(getcom(0)==CAN) { 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); xmodem_cancel(xm);
return(CAN); return(CAN);
} }
...@@ -376,7 +377,7 @@ int xmodem_get_ack(xmodem_t* xm, unsigned tries, unsigned block_num) ...@@ -376,7 +377,7 @@ int xmodem_get_ack(xmodem_t* xm, unsigned tries, unsigned block_num)
break; break;
if(i==CAN) { if(i==CAN) {
if(can) { /* 2 CANs in a row */ 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); xmodem_cancel(xm);
return(CAN); return(CAN);
} }
...@@ -426,7 +427,7 @@ BOOL xmodem_get_mode(xmodem_t* xm) ...@@ -426,7 +427,7 @@ BOOL xmodem_get_mode(xmodem_t* xm)
return(TRUE); return(TRUE);
case CAN: case CAN:
if(can) { if(can) {
lprintf(xm,LOG_WARNING,"Cancelled remotely"); lprintf(xm,LOG_WARNING,"Canceled remotely");
return(FALSE); return(FALSE);
} }
can=1; can=1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment