From 6eef03f92e0df848c6aeca3fd49c3ee6edbf357d Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 2 Apr 2002 18:49:01 +0000
Subject: [PATCH] Fixed FidoNet address fields in printf format strings (%hu
for unsigned short).
---
src/sbbs3/chksmb.c | 2 +-
src/sbbs3/fido.cpp | 6 +++---
src/sbbs3/misc.c | 4 ++--
src/sbbs3/rechocfg.c | 8 ++++----
src/sbbs3/sbbsecho.c | 8 ++++----
src/sbbs3/smbutil.c | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/sbbs3/chksmb.c b/src/sbbs3/chksmb.c
index bf94132894..8e5ea7c44d 100644
--- a/src/sbbs3/chksmb.c
+++ b/src/sbbs3/chksmb.c
@@ -73,7 +73,7 @@ char *faddrtoa(fidoaddr_t addr)
static char str[25];
char point[25];
- sprintf(str,"%u:%u/%u",addr.zone,addr.net,addr.node);
+ sprintf(str,"%hu:%hu/%hu",addr.zone,addr.net,addr.node);
if(addr.point) {
sprintf(point,".%u",addr.point);
strcat(str,point); }
diff --git a/src/sbbs3/fido.cpp b/src/sbbs3/fido.cpp
index 549e444619..e063e7b71e 100644
--- a/src/sbbs3/fido.cpp
+++ b/src/sbbs3/fido.cpp
@@ -43,18 +43,18 @@ void pt_zone_kludge(fmsghdr_t hdr,int fido)
{
char str[256];
- sprintf(str,"\1INTL %u:%u/%u %u:%u/%u\r"
+ sprintf(str,"\1INTL %hu:%hu/%hu %hu:%hu/%hu\r"
,hdr.destzone,hdr.destnet,hdr.destnode
,hdr.origzone,hdr.orignet,hdr.orignode);
write(fido,str,strlen(str));
if(hdr.destpoint) {
- sprintf(str,"\1TOPT %u\r"
+ sprintf(str,"\1TOPT %hu\r"
,hdr.destpoint);
write(fido,str,strlen(str)); }
if(hdr.origpoint) {
- sprintf(str,"\1FMPT %u\r"
+ sprintf(str,"\1FMPT %hu\r"
,hdr.origpoint);
write(fido,str,strlen(str)); }
}
diff --git a/src/sbbs3/misc.c b/src/sbbs3/misc.c
index 2d1b4bc8f9..8095581e4b 100644
--- a/src/sbbs3/misc.c
+++ b/src/sbbs3/misc.c
@@ -382,9 +382,9 @@ char *faddrtoa(faddr_t* addr, char* outstr)
if(addr==NULL)
return("0:0/0");
- sprintf(str,"%u:%u/%u",addr->zone,addr->net,addr->node);
+ sprintf(str,"%hu:%hu/%hu",addr->zone,addr->net,addr->node);
if(addr->point) {
- sprintf(point,".%u",addr->point);
+ sprintf(point,".%hu",addr->point);
strcat(str,point); }
if(outstr==NULL)
return(str);
diff --git a/src/sbbs3/rechocfg.c b/src/sbbs3/rechocfg.c
index 8644597bda..6b5352e415 100644
--- a/src/sbbs3/rechocfg.c
+++ b/src/sbbs3/rechocfg.c
@@ -175,21 +175,21 @@ char *faddrtoa(faddr_t addr)
if(addr.zone==0xffff)
strcpy(str,"ALL");
else {
- sprintf(str,"%u:",addr.zone);
+ sprintf(str,"%hu:",addr.zone);
if(addr.net==0xffff)
strcat(str,"ALL");
else {
- sprintf(tmp,"%u/",addr.net);
+ sprintf(tmp,"%hu/",addr.net);
strcat(str,tmp);
if(addr.node==0xffff)
strcat(str,"ALL");
else {
- sprintf(tmp,"%u",addr.node);
+ sprintf(tmp,"%hu",addr.node);
strcat(str,tmp);
if(addr.point==0xffff)
strcat(str,".ALL");
else if(addr.point) {
- sprintf(tmp,".%u",addr.point);
+ sprintf(tmp,".%hu",addr.point);
strcat(str,tmp); } } } }
return(str);
}
diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index 3396e27ec8..98ef73613e 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -410,7 +410,7 @@ do {
sprintf(hdr.subj,"%.71s",subject);
fwrite(&hdr,sizeof(fmsghdr_t),1,fstream);
- sprintf(str,"\1INTL %u:%u/%u %u:%u/%u\r"
+ sprintf(str,"\1INTL %hu:%hu/%hu %hu:%hu/%hu\r"
,hdr.destzone,hdr.destnet,hdr.destnode
,hdr.origzone,hdr.orignet,hdr.orignode);
fwrite(str,strlen(str),1,fstream);
@@ -421,10 +421,10 @@ do {
else
fwrite("\r",1,1,fstream); }
if(hdr.destpoint) {
- sprintf(str,"\1TOPT %u\r",hdr.destpoint);
+ sprintf(str,"\1TOPT %hu\r",hdr.destpoint);
fwrite(str,strlen(str),1,fstream); }
if(hdr.origpoint) {
- sprintf(str,"\1FMPT %u\r",hdr.origpoint);
+ sprintf(str,"\1FMPT %hu\r",hdr.origpoint);
fwrite(str,strlen(str),1,fstream); }
if(!file || (!(attr&ATTR_DIRECT) && file))
fwrite(body,strlen(body)+1,1,fstream); /* Write additional NULL */
@@ -3232,7 +3232,7 @@ int import_netmail(char *path,fmsghdr_t hdr, FILE *fidomsg)
else
str[0]=0;
printf("import_netmail line %d\n",__LINE__);
- sprintf(info,"%s%s%s (%u:%u/%u%s) To: %s (%u:%u/%u%s)"
+ sprintf(info,"%s%s%s (%hu:%hu/%hu%s) To: %s (%hu:%hu/%hu%s)"
,path,path[0] ? " ":""
,hdr.from,hdr.origzone,hdr.orignet,hdr.orignode,tmp
,hdr.to,hdr.destzone,hdr.destnet,hdr.destnode,str);
diff --git a/src/sbbs3/smbutil.c b/src/sbbs3/smbutil.c
index 367157a2ca..6c27e9ab7f 100644
--- a/src/sbbs3/smbutil.c
+++ b/src/sbbs3/smbutil.c
@@ -488,7 +488,7 @@ char *faddrtoa(fidoaddr_t addr)
static char str[25];
char point[25];
- sprintf(str,"%u:%u/%u",addr.zone,addr.net,addr.node);
+ sprintf(str,"%hu:%hu/%hu",addr.zone,addr.net,addr.node);
if(addr.point) {
sprintf(point,".%u",addr.point);
strcat(str,point); }
--
GitLab