The great 'long int' purge of 2023 part 4

[s]printf format fix-ups

src/sbbs3/chksmb.c

@@ -440,7 +440,7 @@ int main(int argc, char **argv)
 			fprintf(stderr,"%sHeader length mismatch\n",beep);
 			msgerr=TRUE;
 			if(extinfo)
-				printf("MSGERR: Header length (%hu) does not match calculcated length (%lu)\n"
+				printf("MSGERR: Header length (%hu) does not match calculcated length (%u)\n"
 					,msg.hdr.length,smb_getmsghdrlen(&msg));
 			hdrlenerr++;
 		}

src/sbbs3/mailsrvr.c

@@ -1520,7 +1520,7 @@ static void pop3_thread(void* arg)
 						continue;
 					}
 					if(!strnicmp(buf, "LIST",4)) {
-						sockprintf(socket,client.protocol,session,"+OK %" PRIu32 " %lu",msgnum,smb_getmsgtxtlen(&msg));
+						sockprintf(socket,client.protocol,session,"+OK %" PRIu32 " %u",msgnum,smb_getmsgtxtlen(&msg));
 					} else /* UIDL */
 						sockprintf(socket,client.protocol,session,"+OK %" PRIu32 " %u",msgnum,msg.hdr.number);
 
@@ -1552,7 +1552,7 @@ static void pop3_thread(void* arg)
 						break;
 					}
 					if(!strnicmp(buf, "LIST",4)) {
-						sockprintf(socket,client.protocol,session,"%u %lu",l+1,smb_getmsgtxtlen(&msg));
+						sockprintf(socket,client.protocol,session,"%u %u",l+1,smb_getmsgtxtlen(&msg));
 					} else /* UIDL */
 						sockprintf(socket,client.protocol,session,"%u %u",l+1,msg.hdr.number);
 

src/smblib/smbadd.c

@@ -76,7 +76,7 @@ int smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, int dupechk_hashes
 
 			if(smb_findhash(smb, hashes, &found, dupechk_hashes, /* mark? */FALSE)==SMB_SUCCESS) {
 				safe_snprintf(smb->last_error,sizeof(smb->last_error)
-					,"%s duplicate %s: %s found in message #%lu"
+					,"%s duplicate %s: %s found in message #%u"
 					,__FUNCTION__
 					,smb_hashsourcetype(found.source)
 					,smb_hashsource(msg,found.source)
@@ -188,7 +188,7 @@ int smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, int dupechk_hashes
 
 				if(smb_fwrite(smb,body,bodylen,smb->sdt_fp)!=bodylen) {
 					safe_snprintf(smb->last_error,sizeof(smb->last_error)
-						,"%s writing body (%ld bytes)"
+						,"%s writing body (%d bytes)"
 						,__FUNCTION__
 						,(int)bodylen);
 					retval=SMB_ERR_WRITE;
@@ -211,7 +211,7 @@ int smb_addmsg(smb_t* smb, smbmsg_t* msg, int storage, int dupechk_hashes
 
 				if(smb_fwrite(smb,tail,taillen-sizeof(xlat),smb->sdt_fp)!=taillen-sizeof(xlat)) {
 					safe_snprintf(smb->last_error,sizeof(smb->last_error)
-						,"%s writing tail (%ld bytes)"
+						,"%s writing tail (%d bytes)"
 						,__FUNCTION__
 						,(int)(taillen-sizeof(xlat)));
 					retval=SMB_ERR_WRITE;

src/smblib/smballoc.c

@@ -239,7 +239,7 @@ int smb_incdat(smb_t* smb, off_t offset, uint length, uint16_t refs)
 		}
 		i+=refs;
 		if(fseek(smb->sda_fp,-(int)sizeof(i),SEEK_CUR)) {
-			safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s rewinding %ld", __FUNCTION__, -(int)sizeof(i));
+			safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s rewinding %d", __FUNCTION__, -(int)sizeof(i));
 			return(SMB_ERR_SEEK);
 		}
 		if(!fwrite(&i,sizeof(i),1,smb->sda_fp)) {
@@ -318,7 +318,7 @@ int smb_freemsghdr(smb_t* smb, off_t offset, uint length)
 	}
 
 	if(fseeko(smb->sha_fp, sha_offset, SEEK_SET)) {
-		safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s seeking to %ld", __FUNCTION__, (int)sha_offset);
+		safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s seeking to %d", __FUNCTION__, (int)sha_offset);
 		return(SMB_ERR_SEEK);
 	}
 	for(l=0;l<blocks;l++)
@@ -400,7 +400,7 @@ off_t smb_allochdr(smb_t* smb, uint length)
 	}
 	clearerr(smb->sha_fp);
 	if(fseek(smb->sha_fp,offset/SHD_BLOCK_LEN,SEEK_SET)) {
-		safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s seeking to %ld", __FUNCTION__, offset/SHD_BLOCK_LEN);
+		safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s seeking to %d", __FUNCTION__, offset/SHD_BLOCK_LEN);
 		return(SMB_ERR_SEEK);
 	}
 	for(l=0;l<blocks;l++)

src/smblib/smbhash.c

@@ -303,7 +303,7 @@ int smb_hashmsg(smb_t* smb, smbmsg_t* msg, const uchar* text, BOOL update)
 	if(smb_findhash(smb, hashes, &found, SMB_HASH_SOURCE_DUPE, update)==SMB_SUCCESS && !update) {
 		retval=SMB_DUPE_MSG;
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s duplicate %s: %s found in message #%lu", __FUNCTION__
+			,"%s duplicate %s: %s found in message #%u", __FUNCTION__
 			,smb_hashsourcetype(found.source)
 			,smb_hashsource(msg,found.source)
 			,(uint)found.number);

src/smblib/smblib.c

@@ -251,7 +251,7 @@ int smb_trunchdr(smb_t* smb)
 		else
 			if(time(NULL)-start>=(time_t)smb->retry_time) {	 /* Time-out */
 				safe_snprintf(smb->last_error,sizeof(smb->last_error)
-					,"%s timeout changing header file size (retry_time=%lu)", __FUNCTION__
+					,"%s timeout changing header file size (retry_time=%u)", __FUNCTION__
 					,(uint)smb->retry_time);
 				return(SMB_ERR_TIMEOUT); 
 			}
@@ -385,7 +385,7 @@ BOOL smb_valid_hdr_offset(smb_t* smb, uint offset)
 	if(offset<sizeof(smbhdr_t)+sizeof(smbstatus_t) 
 		|| offset<smb->status.header_offset) {
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s invalid header offset: %lu (0x%lX)", __FUNCTION__
+			,"%s invalid header offset: %u (0x%X)", __FUNCTION__
 			,offset,offset);
 		return(FALSE);
 	}
@@ -464,14 +464,14 @@ int smb_getmsgidx(smb_t* smb, smbmsg_t* msg)
 			byte_offset=msg->idx_offset*idxreclen;
 		if(byte_offset>=length) {
 			safe_snprintf(smb->last_error,sizeof(smb->last_error)
-				,"%s invalid index offset: %ld, byte offset: %ld, length: %" PRIdOFF, __FUNCTION__
+				,"%s invalid index offset: %d, byte offset: %d, length: %" PRIdOFF, __FUNCTION__
 				,(int)msg->idx_offset, byte_offset, length);
 			return(SMB_ERR_HDR_OFFSET);
 		}
 		if(ftell(smb->sid_fp) != byte_offset) {
 			if(fseek(smb->sid_fp,byte_offset,SEEK_SET)) {
 				safe_snprintf(smb->last_error,sizeof(smb->last_error)
-					,"%s %d '%s' seeking to offset %ld (byte %lu) in index file", __FUNCTION__
+					,"%s %d '%s' seeking to offset %d (byte %u) in index file", __FUNCTION__
 					,get_errno(),STRERROR(get_errno())
 					,(int)msg->idx_offset,byte_offset);
 				return(SMB_ERR_SEEK);
@@ -479,7 +479,7 @@ int smb_getmsgidx(smb_t* smb, smbmsg_t* msg)
 		}
 		if(smb_fread(smb,&msg->idx,sizeof(msg->idx),smb->sid_fp)!=sizeof(msg->idx)) {
 			safe_snprintf(smb->last_error,sizeof(smb->last_error)
-				,"%s reading index at offset %ld (byte %lu)", __FUNCTION__
+				,"%s reading index at offset %d (byte %u)", __FUNCTION__
 				,(int)msg->idx_offset,byte_offset);
 			return(SMB_ERR_READ);
 		}
@@ -493,25 +493,25 @@ int smb_getmsgidx(smb_t* smb, smbmsg_t* msg)
 	l=total/2; /* Start at middle index */
 	while(1) {
 		if(l>=total) {
-			safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s msg %lu not found"
+			safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s msg %u not found"
 				, __FUNCTION__, (uint)msg->hdr.number);
 			return(SMB_ERR_NOT_FOUND);
 		}
 		if(fseek(smb->sid_fp,l*idxreclen,SEEK_SET)) {
 			safe_snprintf(smb->last_error,sizeof(smb->last_error)
-				,"%s %d '%s' seeking to offset %lu (byte %lu) in index file", __FUNCTION__
+				,"%s %d '%s' seeking to offset %u (byte %u) in index file", __FUNCTION__
 				,get_errno(),STRERROR(get_errno())
-				,l,l*idxreclen);
+				,l,(uint)(l*idxreclen));
 			return(SMB_ERR_SEEK);
 		}
 		if(smb_fread(smb,&idx,sizeof(idx),smb->sid_fp)!=sizeof(idx)) {
 			safe_snprintf(smb->last_error,sizeof(smb->last_error)
-				,"%s reading index at offset %lu (byte %lu)", __FUNCTION__
-				,l,l*sizeof(idx));
+				,"%s reading index at offset %u (byte %u)", __FUNCTION__
+				,l,(uint)(l*sizeof(idx)));
 			return(SMB_ERR_READ);
 		}
 		if(bot==top-1 && idx.number!=msg->hdr.number) {
-			safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s msg %lu not found"
+			safe_snprintf(smb->last_error,sizeof(smb->last_error),"%s msg %u not found"
 				, __FUNCTION__, (uint)msg->hdr.number);
 			return(SMB_ERR_NOT_FOUND);
 		}
@@ -988,7 +988,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg)
 	if(offset != msg->idx.offset) {
 		if(fseek(smb->shd_fp,msg->idx.offset,SEEK_SET) != 0) {
 			safe_snprintf(smb->last_error,sizeof(smb->last_error)
-				,"%s %d '%s' seeking to offset %lu in header file", __FUNCTION__
+				,"%s %d '%s' seeking to offset %u in header file", __FUNCTION__
 				,get_errno(),STRERROR(get_errno())
 				,(uint)msg->idx.offset);
 			return(SMB_ERR_SEEK);
@@ -1002,12 +1002,12 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg)
 	msg->idx_offset=offset;
 	if(smb_fread(smb,&msg->hdr,sizeof(msghdr_t),smb->shd_fp)!=sizeof(msghdr_t)) {
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s reading msg header at offset %lu", __FUNCTION__, (uint)msg->idx.offset);
+			,"%s reading msg header at offset %u", __FUNCTION__, (uint)msg->idx.offset);
 		return(SMB_ERR_READ);
 	}
 	if(memcmp(msg->hdr.msghdr_id,SHD_HEADER_ID,LEN_HEADER_ID)) {
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s corrupt message header ID (%02X %02X %02X %02X) at offset %lu", __FUNCTION__
+			,"%s corrupt message header ID (%02X %02X %02X %02X) at offset %u", __FUNCTION__
 			,msg->hdr.msghdr_id[0]
 			,msg->hdr.msghdr_id[1]
 			,msg->hdr.msghdr_id[2]
@@ -1017,7 +1017,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg)
 	}
 	if(msg->hdr.version<0x110) {
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s insufficient header version: %X at offset %lu", __FUNCTION__
+			,"%s insufficient header version: %X at offset %u", __FUNCTION__
 			,msg->hdr.version, (uint)msg->idx.offset);
 		return(SMB_ERR_HDR_VER);
 	}
@@ -1026,7 +1026,7 @@ int smb_getmsghdr(smb_t* smb, smbmsg_t* msg)
 		&& (msg->dfield = malloc(sizeof(*msg->dfield)*msg->hdr.total_dfields)) == NULL) {
 		smb_freemsgmem(msg);
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s malloc failure of %ld bytes for %u data fields", __FUNCTION__
+			,"%s malloc failure of %d bytes for %u data fields", __FUNCTION__
 			,(int)(sizeof(*msg->dfield) * msg->hdr.total_dfields), msg->hdr.total_dfields);
 		return(SMB_ERR_MEM); 
 	}
@@ -1165,7 +1165,7 @@ int smb_copymsgmem(smb_t* smb, smbmsg_t* msg, smbmsg_t* srcmsg)
 		if((msg->dfield=(dfield_t *)malloc(msg->hdr.total_dfields*sizeof(dfield_t)))==NULL) {
 			if(smb!=NULL)
 				safe_snprintf(smb->last_error,sizeof(smb->last_error)
-					,"%s malloc failure of %ld bytes for %d data fields", __FUNCTION__
+					,"%s malloc failure of %d bytes for %d data fields", __FUNCTION__
 					,(int)(msg->hdr.total_dfields*sizeof(dfield_t)), msg->hdr.total_dfields);
 			return(SMB_ERR_MEM);
 		}
@@ -1177,7 +1177,7 @@ int smb_copymsgmem(smb_t* smb, smbmsg_t* msg, smbmsg_t* srcmsg)
 		if((msg->hfield=(hfield_t *)malloc(msg->total_hfields*sizeof(hfield_t)))==NULL) {
 			if(smb!=NULL)
 				safe_snprintf(smb->last_error,sizeof(smb->last_error)
-					,"%s malloc failure of %ld bytes for %d header fields", __FUNCTION__
+					,"%s malloc failure of %d bytes for %d header fields", __FUNCTION__
 					,(int)(msg->total_hfields*sizeof(hfield_t)), msg->total_hfields);
 			return(SMB_ERR_MEM);
 		}
@@ -1187,7 +1187,7 @@ int smb_copymsgmem(smb_t* smb, smbmsg_t* msg, smbmsg_t* srcmsg)
 		if((msg->hfield_dat=(void**)malloc(msg->total_hfields*sizeof(void*)))==NULL) {
 			if(smb!=NULL)
 				safe_snprintf(smb->last_error,sizeof(smb->last_error)
-					,"%s malloc failure of %ld bytes for %d header fields", __FUNCTION__
+					,"%s malloc failure of %d bytes for %d header fields", __FUNCTION__
 					,(int)(msg->total_hfields*sizeof(void*)), msg->total_hfields);
 			return(SMB_ERR_MEM);
 		}
@@ -1520,7 +1520,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc)
 		else
 			if(time(NULL)-start>=(time_t)smb->retry_time) {
 				safe_snprintf(smb->last_error,sizeof(smb->last_error)
-					,"%s timeout opening %s (retry_time=%lu)", __FUNCTION__
+					,"%s timeout opening %s (retry_time=%u)", __FUNCTION__
 					,str, (uint)smb->retry_time);
 				return(SMB_ERR_TIMEOUT); 
 			}
@@ -1581,7 +1581,7 @@ int smb_addcrc(smb_t* smb, uint32_t crc)
 
 	if(wr!=sizeof(crc)) {	
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s %d '%s' writing %ld bytes", __FUNCTION__
+			,"%s %d '%s' writing %d bytes", __FUNCTION__
 			,get_errno(),STRERROR(get_errno()),(int)sizeof(crc));
 		return(SMB_ERR_WRITE);
 	}
@@ -1616,7 +1616,7 @@ int smb_addmsghdr(smb_t* smb, smbmsg_t* msg, int storage)
 	if(hdrlen>SMB_MAX_HDR_LEN) { /* headers are limited to 64k in size */
 		smb_unlocksmbhdr(smb);
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s illegal message header length (%lu > %u)", __FUNCTION__
+			,"%s illegal message header length (%u > %u)", __FUNCTION__
 			,hdrlen,SMB_MAX_HDR_LEN);
 		return(SMB_ERR_HDR_LEN);
 	}
@@ -1629,12 +1629,12 @@ int smb_addmsghdr(smb_t* smb, smbmsg_t* msg, int storage)
 	idxlen = filelength(fileno(smb->sid_fp));
 	if(idxlen != (smb->status.total_msgs * idxreclen)) {
 		safe_snprintf(smb->last_error, sizeof(smb->last_error)
-			,"%s index file length (%" PRIdOFF "), expected (%ld)", __FUNCTION__
-			,idxlen, smb->status.total_msgs * idxreclen);
+			,"%s index file length (%" PRIdOFF "), expected (%d)", __FUNCTION__
+			,idxlen, (uint)(smb->status.total_msgs * idxreclen));
 		smb_unlocksmbhdr(smb);
 		return SMB_ERR_FILE_LEN;
 	}
-		
+
 	msg->hdr.number=smb->status.last_msg+1;
 
 	if(msg->hdr.thread_id==0)	/* new thread being started */
@@ -1851,8 +1851,8 @@ int smb_putmsgidx(smb_t* smb, smbmsg_t* msg)
 	length = filelength(fileno(smb->sid_fp));
 	if(length < (int)(msg->idx_offset*idxreclen)) {
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s invalid index offset: %ld, byte offset: %lu, length: %" PRIdOFF, __FUNCTION__
-			,(int)msg->idx_offset, msg->idx_offset*idxreclen, length);
+			,"%s invalid index offset: %d, byte offset: %u, length: %" PRIdOFF, __FUNCTION__
+			,(int)msg->idx_offset, (uint)(msg->idx_offset*idxreclen), length);
 		return(SMB_ERR_HDR_OFFSET);
 	}
 	if(fseek(smb->sid_fp,msg->idx_offset*idxreclen,SEEK_SET)) {
@@ -1902,7 +1902,7 @@ int smb_putmsghdr(smb_t* smb, smbmsg_t* msg)
 	clearerr(smb->shd_fp);
 	if(fseek(smb->shd_fp,msg->idx.offset,SEEK_SET)) {
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s %d '%s' seeking to %lu in header file", __FUNCTION__
+			,"%s %d '%s' seeking to %u in header file", __FUNCTION__
 			,get_errno(),STRERROR(get_errno()), (uint)msg->idx.offset);
 		return(SMB_ERR_SEEK);
 	}
@@ -1911,13 +1911,13 @@ int smb_putmsghdr(smb_t* smb, smbmsg_t* msg)
 	hdrlen=smb_getmsghdrlen(msg);
 	if(hdrlen>SMB_MAX_HDR_LEN) { /* headers are limited to 64k in size */
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s illegal message header length (%lu > %u)", __FUNCTION__
+			,"%s illegal message header length (%u > %u)", __FUNCTION__
 			,hdrlen,SMB_MAX_HDR_LEN);
 		return(SMB_ERR_HDR_LEN);
 	}
 	if(smb_hdrblocks(hdrlen) > smb_hdrblocks(msg->hdr.length)) {
 		safe_snprintf(smb->last_error,sizeof(smb->last_error)
-			,"%s illegal header length increase: %lu (%lu blocks, %hu hfields, %hu dfields) vs %hu (%lu blocks)", __FUNCTION__
+			,"%s illegal header length increase: %u (%u blocks, %hu hfields, %hu dfields) vs %hu (%u blocks)", __FUNCTION__
 			,hdrlen, smb_hdrblocks(hdrlen), msg->total_hfields, msg->hdr.total_dfields
 			,msg->hdr.length, smb_hdrblocks(msg->hdr.length));
 		return(SMB_ERR_HDR_LEN);
@@ -2030,7 +2030,7 @@ int smb_create(smb_t* smb)
 
 	SAFEPRINTF(str,"%s.ini",smb->file);
 	if((fp = fopen(str, "w")) != NULL) {
-		fprintf(fp, "Created = 0x%lx\n", (int)time(NULL));
+		fprintf(fp, "Created = 0x%x\n", (int)time(NULL));
 		fclose(fp);
 	}
 	SAFEPRINTF(str,"%s.sda",smb->file);

src/smblib/smbtxt.c

@@ -56,7 +56,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode)
 			length=strlen(str)+2;	/* +2 for crlf */
 			if((p=(char*)realloc(buf,l+length+1))==NULL) {
 				safe_snprintf(smb->last_error, sizeof(smb->last_error)
-					,"%s realloc failure of %ld bytes for comment buffer"
+					,"%s realloc failure of %d bytes for comment buffer"
 					, __FUNCTION__, l+length+1);
 				free(buf);
 				return(NULL);
@@ -67,7 +67,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode)
 		if(l) {	/* Add a blank line after comments */
 			if((p=(char*)realloc(buf,l+3))==NULL) {
 				safe_snprintf(smb->last_error, sizeof(smb->last_error)
-					,"%s realloc failure of %ld bytes for comment buffer"
+					,"%s realloc failure of %d bytes for comment buffer"
 					, __FUNCTION__, l+3);
 				free(buf);
 				return(NULL);
@@ -83,7 +83,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode)
 			length = safe_snprintf(tmp, sizeof(tmp), "%2u: %s\r\n", ++answers, (char*)msg->hfield_dat[i]);
 			if((p=(char*)realloc(buf,l+length+1))==NULL) {
 				safe_snprintf(smb->last_error, sizeof(smb->last_error)
-					,"%s realloc failure of %ld bytes for comment buffer"
+					,"%s realloc failure of %d bytes for comment buffer"
 					, __FUNCTION__, l+length+1);
 				free(buf);
 				return(NULL);
@@ -131,7 +131,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode)
 				continue;
 			if((lzhbuf=(char*)malloc(length))==NULL) {
 				safe_snprintf(smb->last_error, sizeof(smb->last_error)
-					,"%s malloc failure of %ld bytes for LZH buffer"
+					,"%s malloc failure of %d bytes for LZH buffer"
 					, __FUNCTION__, length);
 				free(buf);
 				free(preamble);
@@ -139,7 +139,7 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode)
 			}
 			if(smb_fread(smb,lzhbuf,length,smb->sdt_fp) != length) {
 				safe_snprintf(smb->last_error, sizeof(smb->last_error)
-					,"%s read failure of %ld bytes for LZH data"
+					,"%s read failure of %d bytes for LZH data"
 					, __FUNCTION__, length);
 				free(lzhbuf);
 				free(buf);
@@ -149,8 +149,8 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode)
 			lzhlen=*(int32_t*)lzhbuf;
 			if((p=(char*)realloc(buf,l+lzhlen+3L))==NULL) {
 				safe_snprintf(smb->last_error, sizeof(smb->last_error)
-					,"%s realloc failure of %ld bytes for text buffer"
-					, __FUNCTION__, l+lzhlen+3L);
+					,"%s realloc failure of %d bytes for text buffer"
+					, __FUNCTION__, l+lzhlen+3);
 				free(lzhbuf);
 				free(buf);
 				free(preamble);
@@ -164,8 +164,8 @@ char* smb_getmsgtxt(smb_t* smb, smbmsg_t* msg, uint mode)
 		else {
 			if((p=(char*)realloc(buf,l+length+3L))==NULL) {
 				safe_snprintf(smb->last_error, sizeof(smb->last_error)
-					,"%s realloc failure of %ld bytes for text buffer"
-					, __FUNCTION__, l+length+3L);
+					,"%s realloc failure of %d bytes for text buffer"
+					, __FUNCTION__, l+length+3);
 				free(buf);
 				free(preamble);
 				return(NULL);