From 1aa52dba9b693044ffd067990be3faefaa0e1301 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Tue, 20 Sep 2005 03:41:11 +0000
Subject: [PATCH] Scrape out some of the 16-bit cruft.
---
src/sbbs3/addfiles.c | 4 +-
src/sbbs3/baja.c | 40 ++++++-------
src/sbbs3/chat.cpp | 30 +++++-----
src/sbbs3/chat/MainFormUnit.cpp | 4 +-
src/sbbs3/chksmb.c | 6 +-
src/sbbs3/ctrl/StatsLogFormUnit.cpp | 2 +-
src/sbbs3/delfiles.c | 10 ++--
src/sbbs3/dupefind.c | 18 +++---
src/sbbs3/echocfg.c | 24 ++++----
src/sbbs3/exec.cpp | 28 ++++-----
src/sbbs3/execfunc.cpp | 2 +-
src/sbbs3/execmisc.cpp | 48 ++++++++--------
src/sbbs3/fido.cpp | 42 +++++++-------
src/sbbs3/file.cpp | 6 +-
src/sbbs3/filedat.c | 52 ++++++++---------
src/sbbs3/filelist.c | 18 +++---
src/sbbs3/finddupes.c | 11 +---
src/sbbs3/getmail.c | 4 +-
src/sbbs3/getmsg.cpp | 2 +-
src/sbbs3/getnode.cpp | 16 +++---
src/sbbs3/install/sbbsinst.c | 30 +++++-----
src/sbbs3/js_bbs.cpp | 16 +++---
src/sbbs3/js_global.c | 2 +-
src/sbbs3/listfile.cpp | 64 ++++++++++-----------
src/sbbs3/logout.cpp | 6 +-
src/sbbs3/mail.cpp | 14 ++---
src/sbbs3/mailsrvr.c | 2 +-
src/sbbs3/main.cpp | 78 ++++++++++++-------------
src/sbbs3/msgtoqwk.cpp | 4 +-
src/sbbs3/pack_qwk.cpp | 10 ++--
src/sbbs3/pack_rep.cpp | 12 ++--
src/sbbs3/prntfile.cpp | 8 +--
src/sbbs3/putmsg.cpp | 2 +-
src/sbbs3/qwk.cpp | 40 ++++++-------
src/sbbs3/qwknodes.c | 6 +-
src/sbbs3/qwktomsg.cpp | 14 ++---
src/sbbs3/readmail.cpp | 8 +--
src/sbbs3/readmsgs.cpp | 48 ++++++++--------
src/sbbs3/rechocfg.c | 22 ++++----
src/sbbs3/sbbs.h | 6 +-
src/sbbs3/sbbsecho.c | 64 ++++++++++-----------
src/sbbs3/scfg/scfg.c | 20 +++----
src/sbbs3/scfg/scfgchat.c | 30 +++++-----
src/sbbs3/scfg/scfgmdm.c | 12 ++--
src/sbbs3/scfg/scfgmsg.c | 12 ++--
src/sbbs3/scfg/scfgnet.c | 26 ++++-----
src/sbbs3/scfg/scfgnode.c | 2 +-
src/sbbs3/scfg/scfgsub.c | 6 +-
src/sbbs3/scfg/scfgxfr1.c | 56 +++++++++---------
src/sbbs3/scfg/scfgxfr2.c | 18 +++---
src/sbbs3/scfg/scfgxtrn.c | 38 ++++++-------
src/sbbs3/scfglib1.c | 30 +++++-----
src/sbbs3/scfglib2.c | 88 ++++++++++++++---------------
src/sbbs3/smbactiv.c | 4 +-
src/sbbs3/smbutil.c | 16 +++---
src/sbbs3/sortdir.cpp | 34 +++++------
src/sbbs3/str.cpp | 30 +++++-----
src/sbbs3/text_sec.cpp | 12 ++--
src/sbbs3/tmp_xfer.cpp | 4 +-
src/sbbs3/uedit/uedit.c | 64 ++++++++++-----------
src/sbbs3/umonitor/chat.c | 4 +-
src/sbbs3/umonitor/umonitor.c | 38 ++++++-------
src/sbbs3/userdat.c | 2 +-
src/sbbs3/writemsg.cpp | 14 ++---
src/sbbs3/xtrn_sec.cpp | 18 +++---
65 files changed, 698 insertions(+), 703 deletions(-)
diff --git a/src/sbbs3/addfiles.c b/src/sbbs3/addfiles.c
index 14ee8d3568..1a19016dca 100644
--- a/src/sbbs3/addfiles.c
+++ b/src/sbbs3/addfiles.c
@@ -555,14 +555,14 @@ void synclist(char *inpath, int dirnum)
printf("ERR_LEN (%ld) of %s\n",length,str);
return;
}
- if((ixbbuf=(uchar HUGE16 *)MALLOC(length))==NULL) {
+ if((ixbbuf=(uchar *)malloc(length))==NULL) {
close(file);
printf("ERR_ALLOC %s\n",str);
return;
}
if(lread(file,ixbbuf,length)!=length) {
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
printf("ERR_READ %s\n",str);
return;
}
diff --git a/src/sbbs3/baja.c b/src/sbbs3/baja.c
index 77a1796a7d..2b38e0bcc9 100644
--- a/src/sbbs3/baja.c
+++ b/src/sbbs3/baja.c
@@ -333,7 +333,7 @@ void newvar(uchar* src, uchar *in)
if(i<vars)
return;
}
- if((var_name=(ulong *)REALLOC(var_name,sizeof(long)*(vars+1)))==NULL) {
+ if((var_name=(ulong *)realloc(var_name,sizeof(long)*(vars+1)))==NULL) {
printf("Too many (%lu) variables!\n",vars);
bail(1); }
var_name[vars]=l;
@@ -532,18 +532,18 @@ void compile(char *src)
if(sp)
*sp=0;
truncsp(arg2);
- if((define_str=(char **)REALLOC(define_str,sizeof(char *)*(defines+1)))
+ if((define_str=(char **)realloc(define_str,sizeof(char *)*(defines+1)))
==NULL) {
printf("Too many defines.\n");
bail(1); }
- if((define_str[defines]=(char *)MALLOC(strlen(arg)+1))==NULL) {
+ if((define_str[defines]=(char *)malloc(strlen(arg)+1))==NULL) {
printf("Too many defines.\n");
bail(1); }
- if((define_val=(char **)REALLOC(define_val,sizeof(char *)*(defines+1)))
+ if((define_val=(char **)realloc(define_val,sizeof(char *)*(defines+1)))
==NULL) {
printf("Too many defines.\n");
bail(1); }
- if((define_val[defines]=(char *)MALLOC(strlen(arg2)+1))==NULL) {
+ if((define_val[defines]=(char *)malloc(strlen(arg2)+1))==NULL) {
printf("Too many defines.\n");
bail(1); }
strcpy(define_str[defines],arg);
@@ -728,15 +728,15 @@ void compile(char *src)
printf("!SYNTAX ERROR (duplicate label name):\n");
printf(linestr,src,line,p);
bail(1); }
- if((label_name=(char **)REALLOC(label_name,sizeof(char *)*(labels+1)))
+ if((label_name=(char **)realloc(label_name,sizeof(char *)*(labels+1)))
==NULL) {
printf("Too many labels.\n");
bail(1); }
- if((label_indx=(uint *)REALLOC(label_indx,sizeof(int)*(labels+1)))
+ if((label_indx=(uint *)realloc(label_indx,sizeof(int)*(labels+1)))
==NULL) {
printf("Too many labels.\n");
bail(1); }
- if((label_name[labels]=(char *)MALLOC(strlen(p)+1))==NULL) {
+ if((label_name[labels]=(char *)malloc(strlen(p)+1))==NULL) {
printf("Too many labels.\n");
bail(1); }
strcpy(label_name[labels],p);
@@ -748,26 +748,26 @@ void compile(char *src)
sp=strchr(arg,' ');
if(sp)
*sp=0;
- if((goto_label=(char **)REALLOC(goto_label,sizeof(char *)*(gotos+1)))
+ if((goto_label=(char **)realloc(goto_label,sizeof(char *)*(gotos+1)))
==NULL) {
printf("Too many gotos.\n");
bail(1); }
- if((goto_file=(char **)REALLOC(goto_file,sizeof(char *)*(gotos+1)))
+ if((goto_file=(char **)realloc(goto_file,sizeof(char *)*(gotos+1)))
==NULL) {
printf("Too many gotos.\n");
bail(1); }
- if((goto_indx=(uint *)REALLOC(goto_indx,sizeof(int)*(gotos+1)))
+ if((goto_indx=(uint *)realloc(goto_indx,sizeof(int)*(gotos+1)))
==NULL) {
printf("Too many gotos.\n");
bail(1); }
- if((goto_line=(uint *)REALLOC(goto_line,sizeof(int)*(gotos+1)))
+ if((goto_line=(uint *)realloc(goto_line,sizeof(int)*(gotos+1)))
==NULL) {
printf("Too many gotos.\n");
bail(1); }
- if((goto_label[gotos]=(char *)MALLOC(strlen(arg)+1))==NULL) {
+ if((goto_label[gotos]=(char *)malloc(strlen(arg)+1))==NULL) {
printf("Too many gotos.\n");
bail(1); }
- if((goto_file[gotos]=(char *)MALLOC(strlen(str)+1))==NULL) {
+ if((goto_file[gotos]=(char *)malloc(strlen(str)+1))==NULL) {
printf("Too many gotos.\n");
bail(1); }
strcpy(goto_label[gotos],arg);
@@ -782,26 +782,26 @@ void compile(char *src)
sp=strchr(arg,' ');
if(sp)
*sp=0;
- if((call_label=(char **)REALLOC(call_label,sizeof(char *)*(calls+1)))
+ if((call_label=(char **)realloc(call_label,sizeof(char *)*(calls+1)))
==NULL) {
printf("Too many calls.\n");
bail(1); }
- if((call_file=(char **)REALLOC(call_file,sizeof(char *)*(calls+1)))
+ if((call_file=(char **)realloc(call_file,sizeof(char *)*(calls+1)))
==NULL) {
printf("Too many calls.\n");
bail(1); }
- if((call_indx=(uint *)REALLOC(call_indx,sizeof(int)*(calls+1)))
+ if((call_indx=(uint *)realloc(call_indx,sizeof(int)*(calls+1)))
==NULL) {
printf("Too many calls.\n");
bail(1); }
- if((call_line=(uint *)REALLOC(call_line,sizeof(int)*(calls+1)))
+ if((call_line=(uint *)realloc(call_line,sizeof(int)*(calls+1)))
==NULL) {
printf("Too many calls.\n");
bail(1); }
- if((call_label[calls]=(char *)MALLOC(strlen(arg)+1))==NULL) {
+ if((call_label[calls]=(char *)malloc(strlen(arg)+1))==NULL) {
printf("Too many calls.\n");
bail(1); }
- if((call_file[calls]=(char *)MALLOC(strlen(src)+1))==NULL) {
+ if((call_file[calls]=(char *)malloc(strlen(src)+1))==NULL) {
printf("Too many calls.\n");
bail(1); }
diff --git a/src/sbbs3/chat.cpp b/src/sbbs3/chat.cpp
index 440462ba91..b28c64fc75 100644
--- a/src/sbbs3/chat.cpp
+++ b/src/sbbs3/chat.cpp
@@ -77,7 +77,7 @@ void sbbs_t::multinodechat(int channel)
}
bprintf(text[WelcomeToChannelN],channel,cfg.chan[channel-1]->name);
if(gurubuf) {
- FREE(gurubuf);
+ free(gurubuf);
gurubuf=NULL; }
if(cfg.chan[channel-1]->misc&CHAN_GURU && cfg.chan[channel-1]->guru<cfg.total_gurus
&& chk_ar(cfg.guru[cfg.chan[channel-1]->guru]->ar,&useron)) {
@@ -85,7 +85,7 @@ void sbbs_t::multinodechat(int channel)
if((file=nopen(str,O_RDONLY))==-1) {
errormsg(WHERE,ERR_OPEN,str,O_RDONLY);
return; }
- if((gurubuf=(char *)MALLOC(filelength(file)+1))==NULL) {
+ if((gurubuf=(char *)malloc(filelength(file)+1))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,filelength(file)+1);
return; }
@@ -211,7 +211,7 @@ void sbbs_t::multinodechat(int channel)
bputs(text[WrongPassword]);
continue; }
if(gurubuf) {
- FREE(gurubuf);
+ free(gurubuf);
gurubuf=NULL; }
if(cfg.chan[savch-1]->misc&CHAN_GURU
&& cfg.chan[savch-1]->guru<cfg.total_gurus
@@ -222,7 +222,7 @@ void sbbs_t::multinodechat(int channel)
if((file=nopen(str,O_RDONLY))==-1) {
errormsg(WHERE,ERR_OPEN,str,O_RDONLY);
break; }
- if((gurubuf=(char *)MALLOC(filelength(file)+1))==NULL) {
+ if((gurubuf=(char *)malloc(filelength(file)+1))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str
,filelength(file)+1);
@@ -537,7 +537,7 @@ bool sbbs_t::guru_page(void)
errormsg(WHERE,ERR_OPEN,path,O_RDONLY);
return(false);
}
- if((gurubuf=(char *)MALLOC(filelength(file)+1))==NULL) {
+ if((gurubuf=(char *)malloc(filelength(file)+1))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,path,filelength(file)+1);
return(false);
@@ -546,7 +546,7 @@ bool sbbs_t::guru_page(void)
gurubuf[filelength(file)]=0;
close(file);
localguru(gurubuf,i);
- FREE(gurubuf);
+ free(gurubuf);
return(true);
}
@@ -632,7 +632,7 @@ void sbbs_t::chatsection()
default: /* 'Q' or <CR> */
lncntr=0;
// if(gurubuf)
-// FREE(gurubuf);
+// free(gurubuf);
return; }
action=NODE_CHAT;
if(!(useron.misc&EXPERT) || useron.misc&(WIP|HTML)
@@ -642,7 +642,7 @@ void sbbs_t::chatsection()
ASYNC;
bputs(text[ChatPrompt]); }
// if(gurubuf)
-// FREE(gurubuf);
+// free(gurubuf);
}
/****************************************************************************/
@@ -832,7 +832,7 @@ void sbbs_t::privchat(bool local)
errormsg(WHERE,ERR_OPEN,str,O_RDWR|O_DENYNONE|O_CREAT);
return; }
- if((p=(char *)MALLOC(PCHAT_LEN))==NULL) {
+ if((p=(char *)malloc(PCHAT_LEN))==NULL) {
close(in);
close(out);
errormsg(WHERE,ERR_ALLOC,str,PCHAT_LEN);
@@ -840,7 +840,7 @@ void sbbs_t::privchat(bool local)
memset(p,0,PCHAT_LEN);
write(in,p,PCHAT_LEN);
write(out,p,PCHAT_LEN);
- FREE(p);
+ free(p);
lseek(in,0L,SEEK_SET);
lseek(out,0L,SEEK_SET);
@@ -1431,11 +1431,11 @@ void sbbs_t::guruchat(char* line, char* gurubuf, int gurunum, char* last_answer)
localtime_r(&now,&tm);
for(i=0;i<100;i++) {
- if((answer[i]=(char *)MALLOC(512))==NULL) {
+ if((answer[i]=(char *)malloc(512))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,512);
while(i) {
i--;
- FREE(answer[i]); }
+ free(answer[i]); }
sys_status&=~SS_GURUCHAT;
return; } }
ptr=gurubuf;
@@ -1459,7 +1459,7 @@ void sbbs_t::guruchat(char* line, char* gurubuf, int gurunum, char* last_answer)
break; }
if(k<1) {
for(i=0;i<100;i++)
- FREE(answer[i]);
+ free(answer[i]);
return; }
if(cstr[k+1]=='?')
k++;
@@ -1682,7 +1682,7 @@ void sbbs_t::guruchat(char* line, char* gurubuf, int gurunum, char* last_answer)
hangup();
break; } }
for(i=0;i<100;i++)
- FREE(answer[i]);
+ free(answer[i]);
}
/****************************************************************************/
@@ -1711,7 +1711,7 @@ bool sbbs_t::guruexp(char **ptrptr, char *line)
ar=arstr(NULL,str,&cfg);
c=chk_ar(ar,&useron);
if(ar[0]!=AR_NULL)
- FREE(ar);
+ free(ar);
if(!c && _and) {
result=false;
break; }
diff --git a/src/sbbs3/chat/MainFormUnit.cpp b/src/sbbs3/chat/MainFormUnit.cpp
index 5b49fb7d55..ca8d6b06cd 100644
--- a/src/sbbs3/chat/MainFormUnit.cpp
+++ b/src/sbbs3/chat/MainFormUnit.cpp
@@ -147,7 +147,7 @@ void __fastcall TMainForm::FormShow(TObject *Sender)
return;
}
- if((p=(char *)MALLOC(PCHAT_LEN))==NULL) {
+ if((p=(char *)malloc(PCHAT_LEN))==NULL) {
close(in);
close(out);
Remote->Lines->Add("!Error allocating memory");
@@ -156,7 +156,7 @@ void __fastcall TMainForm::FormShow(TObject *Sender)
memset(p,0,PCHAT_LEN);
write(in,p,PCHAT_LEN);
write(out,p,PCHAT_LEN);
- FREE(p);
+ free(p);
lseek(in,0L,SEEK_SET);
lseek(out,0L,SEEK_SET);
diff --git a/src/sbbs3/chksmb.c b/src/sbbs3/chksmb.c
index cd4e868e89..3afa00a27e 100644
--- a/src/sbbs3/chksmb.c
+++ b/src/sbbs3/chksmb.c
@@ -239,7 +239,7 @@ int main(int argc, char **argv)
}
if((length/SHD_BLOCK_LEN)*sizeof(ulong)) {
- if((number=(ulong *)MALLOC(((length/SHD_BLOCK_LEN)+2)*sizeof(ulong)))
+ if((number=(ulong *)malloc(((length/SHD_BLOCK_LEN)+2)*sizeof(ulong)))
==NULL) {
printf("Error allocating %lu bytes of memory\n"
,(length/SHD_BLOCK_LEN)*sizeof(ulong));
@@ -662,11 +662,11 @@ int main(int argc, char **argv)
fprintf(stderr,"\nChecking %s Index\n\n",smb.file);
- if((offset=(ulong *)MALLOC(total*sizeof(ulong)))==NULL) {
+ if((offset=(ulong *)malloc(total*sizeof(ulong)))==NULL) {
printf("Error allocating %lu bytes of memory\n",total*sizeof(ulong));
return(++errors);
}
- if((number=(ulong *)MALLOC(total*sizeof(ulong)))==NULL) {
+ if((number=(ulong *)malloc(total*sizeof(ulong)))==NULL) {
printf("Error allocating %lu bytes of memory\n",total*sizeof(ulong));
return(++errors);
}
diff --git a/src/sbbs3/ctrl/StatsLogFormUnit.cpp b/src/sbbs3/ctrl/StatsLogFormUnit.cpp
index f83aebf9bf..e89495687f 100644
--- a/src/sbbs3/ctrl/StatsLogFormUnit.cpp
+++ b/src/sbbs3/ctrl/StatsLogFormUnit.cpp
@@ -84,7 +84,7 @@ void __fastcall TStatsLogForm::FormShow(TObject *Sender)
close(file);
return;
}
- if((buf=(char *)MALLOC(length))==NULL) {
+ if((buf=(char *)malloc(length))==NULL) {
close(file);
sprintf(str,"!Error allocating %lu bytes",length);
Log->Lines->Add(AnsiString(str));
diff --git a/src/sbbs3/delfiles.c b/src/sbbs3/delfiles.c
index 2fe9fc2576..19d0d6e477 100644
--- a/src/sbbs3/delfiles.c
+++ b/src/sbbs3/delfiles.c
@@ -21,7 +21,7 @@ void bail(int code)
exit(code);
}
-long lputs(char FAR16 *str)
+long lputs(char *str)
{
char tmp[256];
int i,j,k;
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
file_t workfile;
scfg_t cfg;
glob_t gl;
- uchar HUGE16 *ixbbuf;
+ uchar *ixbbuf;
putenv("TZ=UCT0");
setvbuf(stdout,NULL,_IONBF,0);
@@ -199,14 +199,14 @@ for(i=0;i<cfg.total_dirs;i++) {
if(!l) {
close(file);
continue; }
- if((ixbbuf=(char *)MALLOC(l))==NULL) {
+ if((ixbbuf=(char *)malloc(l))==NULL) {
close(file);
printf("\7ERR_ALLOC %s %lu\n",str,l);
continue; }
if(read(file,ixbbuf,l)!=l) {
close(file);
printf("\7ERR_READ %s %lu\n",str,l);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
continue; }
close(file);
@@ -259,5 +259,5 @@ for(i=0;i<cfg.total_dirs;i++) {
if(!(misc&REPORT))
removefiledat(&cfg, &workfile); } }
- FREE((char *)ixbbuf); }
+ free((char *)ixbbuf); }
}
diff --git a/src/sbbs3/dupefind.c b/src/sbbs3/dupefind.c
index de3077b92a..3d41d251b5 100644
--- a/src/sbbs3/dupefind.c
+++ b/src/sbbs3/dupefind.c
@@ -12,7 +12,7 @@ void bail(int code)
exit(code);
}
-long lputs(char FAR16 *str)
+long lputs(char *str)
{
char tmp[256];
int i,j,k;
@@ -113,7 +113,7 @@ fprintf(stderr,"\nDUPEFIND Version %s (%s) - Synchronet Duplicate File "
if(argc>2)
end_lib=atoi(argv[2])-1;
- if((fcrc=(ulong **)MALLOC(cfg.total_dirs*sizeof(ulong *)))==NULL) {
+ if((fcrc=(ulong **)malloc(cfg.total_dirs*sizeof(ulong *)))==NULL) {
printf("Not enough memory for CRCs.\r\n");
return(1); }
@@ -121,27 +121,27 @@ fprintf(stderr,"\nDUPEFIND Version %s (%s) - Synchronet Duplicate File "
fprintf(stderr,"Reading directory index %u of %u\r",i+1,cfg.total_dirs);
sprintf(str,"%s%s.ixb",cfg.dir[i]->data_dir,cfg.dir[i]->code);
if((file=nopen(str,O_RDONLY|O_BINARY))==-1) {
- fcrc[i]=(ulong *)MALLOC(1*sizeof(ulong));
+ fcrc[i]=(ulong *)malloc(1*sizeof(ulong));
fcrc[i][0]=0;
continue; }
l=filelength(file);
if(!l || (cfg.dir[i]->lib<start_lib || cfg.dir[i]->lib>end_lib)) {
close(file);
- fcrc[i]=(ulong *)MALLOC(1*sizeof(ulong));
+ fcrc[i]=(ulong *)malloc(1*sizeof(ulong));
fcrc[i][0]=0;
continue; }
- if((fcrc[i]=(ulong *)MALLOC((l/22+2)*sizeof(ulong)))==NULL) {
+ if((fcrc[i]=(ulong *)malloc((l/22+2)*sizeof(ulong)))==NULL) {
printf("Not enough memory for CRCs.\r\n");
return(1); }
fcrc[i][0]=(ulong)(l/22);
- if((ixbbuf=(char *)MALLOC(l))==NULL) {
+ if((ixbbuf=(char *)malloc(l))==NULL) {
close(file);
printf("\7Error allocating memory for index %s.\r\n",str);
continue; }
if(read(file,ixbbuf,l)!=l) {
close(file);
printf("\7Error reading %s.\r\n",str);
- FREE(ixbbuf);
+ free(ixbbuf);
continue; }
close(file);
j=1;
@@ -151,7 +151,7 @@ fprintf(stderr,"\nDUPEFIND Version %s (%s) - Synchronet Duplicate File "
strupr(str);
fcrc[i][j++]=crc32(str,0);
m+=22; }
- FREE(ixbbuf); }
+ free(ixbbuf); }
lputs("\n");
foundcrc=0L;
@@ -172,7 +172,7 @@ fprintf(stderr,"\nDUPEFIND Version %s (%s) - Synchronet Duplicate File "
g=total_found+1; }
if(g==total_found) {
++total_found;
- if((foundcrc=(ulong *)REALLOC(foundcrc
+ if((foundcrc=(ulong *)realloc(foundcrc
,total_found*sizeof(ulong)))==NULL) {
printf("Out of memory reallocating\r\n");
return(1); } }
diff --git a/src/sbbs3/echocfg.c b/src/sbbs3/echocfg.c
index d43668edca..23fd66911a 100644
--- a/src/sbbs3/echocfg.c
+++ b/src/sbbs3/echocfg.c
@@ -219,13 +219,13 @@ int main(int argc, char **argv)
read_echo_cfg();
// savnum=0;
- if((opt=(char **)MALLOC(sizeof(char *)*300))==NULL) {
+ if((opt=(char **)malloc(sizeof(char *)*300))==NULL) {
uifc.bail();
puts("memory allocation error\n");
exit(1);
}
for(i=0;i<300;i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL) {
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL) {
uifc.bail();
puts("memory allocation error\n");
exit(1);
@@ -341,7 +341,7 @@ int main(int argc, char **argv)
,"Node Address (ALL wildcard allowed)",str
,25,K_EDIT)<1)
continue;
- if((cfg.nodecfg=(nodecfg_t *)REALLOC(cfg.nodecfg
+ if((cfg.nodecfg=(nodecfg_t *)realloc(cfg.nodecfg
,sizeof(nodecfg_t)*(cfg.nodecfgs+1)))==NULL) {
printf("\nMemory Allocation Error\n");
exit(1); }
@@ -362,7 +362,7 @@ int main(int argc, char **argv)
for(j=i;j<cfg.nodecfgs;j++)
memcpy(&cfg.nodecfg[j],&cfg.nodecfg[j+1]
,sizeof(nodecfg_t));
- if((cfg.nodecfg=(nodecfg_t *)REALLOC(cfg.nodecfg
+ if((cfg.nodecfg=(nodecfg_t *)realloc(cfg.nodecfg
,sizeof(nodecfg_t)*(cfg.nodecfgs)))==NULL) {
printf("\nMemory Allocation Error\n");
exit(1); }
@@ -503,7 +503,7 @@ int main(int argc, char **argv)
,K_EDIT|K_UPPER)<1)
continue;
if((cfg.nodecfg[i].flag=(flag_t *)
- REALLOC(cfg.nodecfg[i].flag
+ realloc(cfg.nodecfg[i].flag
,sizeof(flag_t)*
(cfg.nodecfg[i].numflags+1)))==NULL) {
printf("\nMemory Allocation Error\n");
@@ -528,7 +528,7 @@ int main(int argc, char **argv)
strcpy(cfg.nodecfg[i].flag[j].flag
,cfg.nodecfg[i].flag[j+1].flag);
if((cfg.nodecfg[i].flag=(flag_t *)
- REALLOC(cfg.nodecfg[i].flag
+ realloc(cfg.nodecfg[i].flag
,sizeof(flag_t)*
(cfg.nodecfg[i].numflags)))==NULL) {
printf("\nMemory Allocation Error\n");
@@ -857,7 +857,7 @@ int main(int argc, char **argv)
if(uifc.input(WIN_MID,0,0
,"Packer Name",str,25,K_EDIT|K_UPPER)<1)
continue;
- if((cfg.arcdef=(arcdef_t *)REALLOC(cfg.arcdef
+ if((cfg.arcdef=(arcdef_t *)realloc(cfg.arcdef
,sizeof(arcdef_t)*(cfg.arcdefs+1)))==NULL) {
printf("\nMemory Allocation Error\n");
exit(1); }
@@ -880,7 +880,7 @@ int main(int argc, char **argv)
for(j=i;j<cfg.arcdefs;j++)
memcpy(&cfg.arcdef[j],&cfg.arcdef[j+1]
,sizeof(arcdef_t));
- if((cfg.arcdef=(arcdef_t *)REALLOC(cfg.arcdef
+ if((cfg.arcdef=(arcdef_t *)realloc(cfg.arcdef
,sizeof(arcdef_t)*(cfg.arcdefs)))==NULL) {
printf("\nMemory Allocation Error\n");
exit(1); }
@@ -965,7 +965,7 @@ int main(int argc, char **argv)
if(uifc.input(WIN_MID|WIN_SAV,0,0
,"Echo List Path/Name",str,50,K_EDIT)<1)
continue;
- if((cfg.listcfg=(echolist_t *)REALLOC(cfg.listcfg
+ if((cfg.listcfg=(echolist_t *)realloc(cfg.listcfg
,sizeof(echolist_t)*(cfg.listcfgs+1)))==NULL) {
printf("\nMemory Allocation Error\n");
exit(1); }
@@ -986,7 +986,7 @@ int main(int argc, char **argv)
for(j=i;j<cfg.listcfgs;j++)
memcpy(&cfg.listcfg[j],&cfg.listcfg[j+1]
,sizeof(echolist_t));
- if((cfg.listcfg=(echolist_t *)REALLOC(cfg.listcfg
+ if((cfg.listcfg=(echolist_t *)realloc(cfg.listcfg
,sizeof(echolist_t)*(cfg.listcfgs)))==NULL) {
printf("\nMemory Allocation Error\n");
exit(1); }
@@ -1075,7 +1075,7 @@ int main(int argc, char **argv)
,K_EDIT|K_UPPER)<1)
continue;
if((cfg.listcfg[i].flag=(flag_t *)
- REALLOC(cfg.listcfg[i].flag
+ realloc(cfg.listcfg[i].flag
,sizeof(flag_t)*
(cfg.listcfg[i].numflags+1)))==NULL) {
printf("\nMemory Allocation Error\n");
@@ -1100,7 +1100,7 @@ int main(int argc, char **argv)
strcpy(cfg.listcfg[i].flag[j].flag
,cfg.listcfg[i].flag[j+1].flag);
if((cfg.listcfg[i].flag=(flag_t *)
- REALLOC(cfg.listcfg[i].flag
+ realloc(cfg.listcfg[i].flag
,sizeof(flag_t)*
(cfg.listcfg[i].numflags)))==NULL) {
printf("\nMemory Allocation Error\n");
diff --git a/src/sbbs3/exec.cpp b/src/sbbs3/exec.cpp
index 49b90acdd9..258a24a774 100644
--- a/src/sbbs3/exec.cpp
+++ b/src/sbbs3/exec.cpp
@@ -475,15 +475,15 @@ void sbbs_t::freevars(csi_t *bin)
if(bin->str_var) {
for(i=0;i<bin->str_vars;i++)
if(bin->str_var[i])
- FREE(bin->str_var[i]);
- FREE(bin->str_var);
+ free(bin->str_var[i]);
+ free(bin->str_var);
}
if(bin->int_var)
- FREE(bin->int_var);
+ free(bin->int_var);
if(bin->str_var_name)
- FREE(bin->str_var_name);
+ free(bin->str_var_name);
if(bin->int_var_name)
- FREE(bin->int_var_name);
+ free(bin->int_var_name);
for(i=0;i<bin->files;i++) {
if(bin->file[i]) {
fclose((FILE *)bin->file[i]);
@@ -513,7 +513,7 @@ char * sbbs_t::copystrvar(csi_t *csi, char *p, char *str)
if(p==sysvar_p[i])
break;
if(!p || i==MAX_SYSVARS) { /* Not system variable */
- if((np=(char*)REALLOC(p,strlen(str)+1))==NULL)
+ if((np=(char*)realloc(p,strlen(str)+1))==NULL)
errormsg(WHERE,ERR_ALLOC,"variable",strlen(str)+1);
else
p=np; } }
@@ -687,7 +687,7 @@ long sbbs_t::exec_bin(char *mod, csi_t *csi)
}
bin.length=filelength(file);
- if((bin.cs=(uchar *)MALLOC(bin.length))==NULL) {
+ if((bin.cs=(uchar *)malloc(bin.length))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,bin.length);
return(-1);
@@ -695,7 +695,7 @@ long sbbs_t::exec_bin(char *mod, csi_t *csi)
if(lread(file,bin.cs,bin.length)!=bin.length) {
close(file);
errormsg(WHERE,ERR_READ,str,bin.length);
- FREE(bin.cs);
+ free(bin.cs);
return(-1);
}
close(file);
@@ -713,7 +713,7 @@ long sbbs_t::exec_bin(char *mod, csi_t *csi)
}
freevars(&bin);
- FREE(bin.cs);
+ free(bin.cs);
csi->logic=bin.logic;
return(bin.retval);
}
@@ -1064,7 +1064,7 @@ int sbbs_t::exec(csi_t *csi)
for(i=0;i<TOTAL_TEXT;i++)
if(text[i]!=text_sav[i]) {
if(text[i]!=nulstr)
- FREE(text[i]);
+ free(text[i]);
text[i]=text_sav[i]; }
sprintf(str,"%s%s.dat"
,cfg.ctrl_dir,cmdstr((char*)csi->ip,path,csi->str,(char*)buf));
@@ -1076,10 +1076,10 @@ int sbbs_t::exec(csi_t *csi)
i--;
continue; }
if(!strcmp(text[i],text_sav[i])) { /* If identical */
- FREE(text[i]); /* Don't alloc */
+ free(text[i]); /* Don't alloc */
text[i]=text_sav[i]; }
else if(text[i][0]==0) {
- FREE(text[i]);
+ free(text[i]);
text[i]=nulstr; } }
if(i<TOTAL_TEXT) {
fclose(stream);
@@ -1326,7 +1326,7 @@ int sbbs_t::exec(csi_t *csi)
if((ushort)i==0xffff) {
for(i=0;i<TOTAL_TEXT;i++) {
if(text[i]!=text_sav[i] && text[i]!=nulstr)
- FREE(text[i]);
+ free(text[i]);
text[i]=text_sav[i]; }
return(0); }
i--;
@@ -1334,7 +1334,7 @@ int sbbs_t::exec(csi_t *csi)
errormsg(WHERE,ERR_CHK,"revert text #",i);
return(0); }
if(text[i]!=text_sav[i] && text[i]!=nulstr)
- FREE(text[i]);
+ free(text[i]);
text[i]=text_sav[i];
return(0);
default:
diff --git a/src/sbbs3/execfunc.cpp b/src/sbbs3/execfunc.cpp
index 4aa2915748..17eac2f89a 100644
--- a/src/sbbs3/execfunc.cpp
+++ b/src/sbbs3/execfunc.cpp
@@ -225,7 +225,7 @@ int sbbs_t::exec_function(csi_t *csi)
p=(uchar *)nulstr;
bulkmail(p);
if(p && p[0])
- FREE(p);
+ free(p);
return(0);
case CS_INC_MAIN_CMDS:
diff --git a/src/sbbs3/execmisc.cpp b/src/sbbs3/execmisc.cpp
index 1e22a908e2..c3dc320a93 100644
--- a/src/sbbs3/execmisc.cpp
+++ b/src/sbbs3/execmisc.cpp
@@ -120,19 +120,19 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
csi->ip+=4;
return(0); }
csi->str_vars++;
- csi->str_var=(char **)REALLOC(csi->str_var
+ csi->str_var=(char **)realloc(csi->str_var
,sizeof(char *)*csi->str_vars);
- csi->str_var_name=(long *)REALLOC(csi->str_var_name
+ csi->str_var_name=(long *)realloc(csi->str_var_name
,sizeof(long)*csi->str_vars);
if(csi->str_var==NULL
|| csi->str_var_name==NULL) { /* REALLOC failed */
errormsg(WHERE,ERR_ALLOC,"local str var"
,sizeof(char *)*csi->str_vars);
if(csi->str_var_name) {
- FREE(csi->str_var_name);
+ free(csi->str_var_name);
csi->str_var_name=0; }
if(csi->str_var) {
- FREE(csi->str_var);
+ free(csi->str_var);
csi->str_var=0; }
csi->str_vars=0; }
else {
@@ -145,19 +145,19 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
csi->ip+=4;
return(0); }
csi->int_vars++;
- csi->int_var=(long *)REALLOC(csi->int_var
+ csi->int_var=(long *)realloc(csi->int_var
,sizeof(char *)*csi->int_vars);
- csi->int_var_name=(long *)REALLOC(csi->int_var_name
+ csi->int_var_name=(long *)realloc(csi->int_var_name
,sizeof(long)*csi->int_vars);
if(csi->int_var==NULL
|| csi->int_var_name==NULL) { /* REALLOC failed */
errormsg(WHERE,ERR_ALLOC,"local int var"
,sizeof(char *)*csi->int_vars);
if(csi->int_var_name) {
- FREE(csi->int_var_name);
+ free(csi->int_var_name);
csi->int_var_name=0; }
if(csi->int_var) {
- FREE(csi->int_var);
+ free(csi->int_var);
csi->int_var=0; }
csi->int_vars=0; }
else {
@@ -170,19 +170,19 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
csi->ip+=4;
return(0); }
global_str_vars++;
- global_str_var=(char **)REALLOC(global_str_var
+ global_str_var=(char **)realloc(global_str_var
,sizeof(char *)*global_str_vars);
- global_str_var_name=(long *)REALLOC(global_str_var_name
+ global_str_var_name=(long *)realloc(global_str_var_name
,sizeof(long)*global_str_vars);
if(global_str_var==NULL
|| global_str_var_name==NULL) { /* REALLOC failed */
errormsg(WHERE,ERR_ALLOC,"global str var"
,sizeof(char *)*global_str_vars);
if(global_str_var_name) {
- FREE(global_str_var_name);
+ free(global_str_var_name);
global_str_var_name=0; }
if(global_str_var) {
- FREE(global_str_var);
+ free(global_str_var);
global_str_var=0; }
global_str_vars=0; }
else {
@@ -196,19 +196,19 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
csi->ip+=4;
return(0); }
global_int_vars++;
- global_int_var=(long *)REALLOC(global_int_var
+ global_int_var=(long *)realloc(global_int_var
,sizeof(char *)*global_int_vars);
- global_int_var_name=(long *)REALLOC(global_int_var_name
+ global_int_var_name=(long *)realloc(global_int_var_name
,sizeof(long)*global_int_vars);
if(global_int_var==NULL
|| global_int_var_name==NULL) { /* REALLOC failed */
errormsg(WHERE,ERR_ALLOC,"local int var"
,sizeof(char *)*global_int_vars);
if(global_int_var_name) {
- FREE(global_int_var_name);
+ free(global_int_var_name);
global_int_var_name=0; }
if(global_int_var) {
- FREE(global_int_var);
+ free(global_int_var);
global_int_var=0; }
global_int_vars=0; }
else {
@@ -436,9 +436,9 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
break;
if(pp && *pp!=csi->str && i==MAX_SYSVARS) {
if(*pp)
- *pp=(char *)REALLOC(*pp,strlen(*pp)+strlen(tmp)+1);
+ *pp=(char *)realloc(*pp,strlen(*pp)+strlen(tmp)+1);
else
- *pp=(char *)REALLOC(*pp,strlen(tmp)+1); }
+ *pp=(char *)realloc(*pp,strlen(tmp)+1); }
if(pp && *pp)
strcat(*pp,tmp);
return(0);
@@ -464,9 +464,9 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
break;
if(pp && *pp!=csi->str && i==MAX_SYSVARS) {
if(*pp)
- *pp=(char *)REALLOC(*pp,strlen(*pp)+strlen(tmp)+1);
+ *pp=(char *)realloc(*pp,strlen(*pp)+strlen(tmp)+1);
else
- *pp=(char *)REALLOC(*pp,strlen(tmp)+1); }
+ *pp=(char *)realloc(*pp,strlen(tmp)+1); }
if(pp && *pp)
strcat(*pp,tmp);
return(0);
@@ -482,9 +482,9 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
break;
if(*pp1!=csi->str && (!*pp1 || i==MAX_SYSVARS)) {
if(*pp1)
- *pp1=(char *)REALLOC(*pp1,strlen(*pp1)+strlen(*pp2)+1);
+ *pp1=(char *)realloc(*pp1,strlen(*pp1)+strlen(*pp2)+1);
else
- *pp1=(char *)REALLOC(*pp1,strlen(*pp2)+1); }
+ *pp1=(char *)realloc(*pp1,strlen(*pp2)+1); }
strcat(*pp1,*pp2);
return(0);
case FORMAT_STR_VAR:
@@ -1502,12 +1502,12 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
while(*(csi->ip++)); /* Find NULL */
return(0); }
if(text[i]!=text_sav[i] && text[i]!=nulstr)
- FREE(text[i]);
+ free(text[i]);
j=strlen(cmdstr((char *)csi->ip,path,csi->str,buf));
if(!j)
text[i]=nulstr;
else
- text[i]=(char *)MALLOC(j+1);
+ text[i]=(char *)malloc(j+1);
if(!text[i]) {
errormsg(WHERE,ERR_ALLOC,"replacement text",j);
while(*(csi->ip++)); /* Find NULL */
diff --git a/src/sbbs3/fido.cpp b/src/sbbs3/fido.cpp
index 199bbf7971..df3b650fc5 100644
--- a/src/sbbs3/fido.cpp
+++ b/src/sbbs3/fido.cpp
@@ -301,7 +301,7 @@ bool sbbs_t::netmail(char *into, char *title, long mode)
errormsg(WHERE,ERR_OPEN,str,O_RDONLY);
return(false); }
length=filelength(file);
- if((buf=(char *)MALLOC(length))==NULL) {
+ if((buf=(char *)malloc(length))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,length);
return(false); }
@@ -399,7 +399,7 @@ bool sbbs_t::netmail(char *into, char *title, long mode)
if(cfg.netmail_sem[0]) /* update semaphore file */
ftouch(cmdstr(cfg.netmail_sem,nulstr,nulstr,NULL));
- FREE(buf);
+ free(buf);
return(true);
}
@@ -408,7 +408,7 @@ bool sbbs_t::netmail(char *into, char *title, long mode)
/****************************************************************************/
void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
{
- char HUGE16 *qwkbuf,to[129],name[129],sender[129],senderaddr[129]
+ char *qwkbuf,to[129],name[129],sender[129],senderaddr[129]
,str[256],*p,*cp,*addr,fulladdr[129],ch;
char tmp[512];
int i,fido,inet=0,qnet=0;
@@ -429,7 +429,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
if(n<2L || n>999999L) {
errormsg(WHERE,ERR_CHK,"QWK blocks",n);
return; }
- if((qwkbuf=(char *)MALLOC(n*QWK_BLOCK_LEN))==NULL) {
+ if((qwkbuf=(char *)malloc(n*QWK_BLOCK_LEN))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,n*QWK_BLOCK_LEN);
return; }
memcpy((char *)qwkbuf,block,QWK_BLOCK_LEN);
@@ -463,7 +463,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
fidoaddr=cfg.dflt_faddr;
else {
bputs(text[InvalidNetMailAddr]);
- FREE(qwkbuf);
+ free(qwkbuf);
return; } }
else {
fidoaddr=atofaddr(&cfg,p+1); /* Get fido address */
@@ -474,13 +474,13 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
if(!inet && !qnet && /* FidoNet */
((!SYSOP && !(cfg.netmail_misc&NMAIL_ALLOW)) || !cfg.total_faddrs)) {
bputs(text[NoNetMailAllowed]);
- FREE(qwkbuf);
+ free(qwkbuf);
return; }
truncsp(to); /* Truncate off space */
if(!stricmp(to,"SBBS") && !SYSOP && qnet) {
- FREE(qwkbuf);
+ free(qwkbuf);
return; }
l=QWK_BLOCK_LEN; /* Start of message text */
@@ -567,7 +567,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
if(!fulladdr[0]) { /* Invalid address, so BOUNCE it */
/**
errormsg(WHERE,ERR_CHK,addr,0);
- FREE(qwkbuf);
+ free(qwkbuf);
smb_freemsgmem(msg);
return;
**/
@@ -597,12 +597,12 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
if(cfg.inetmail_cost && !(useron.exempt&FLAG('S'))) {
if(useron.cdt+useron.freecdt<cfg.inetmail_cost) {
bputs(text[NotEnoughCredits]);
- FREE(qwkbuf);
+ free(qwkbuf);
smb_freemsgmem(&msg);
return; }
sprintf(str,text[NetMailCostContinueQ],cfg.inetmail_cost);
if(noyes(str)) {
- FREE(qwkbuf);
+ free(qwkbuf);
smb_freemsgmem(&msg);
return; } }
@@ -622,7 +622,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
if((i=smb_stack(&smb,SMB_STACK_PUSH))!=0) {
errormsg(WHERE,ERR_OPEN,"MAIL",i);
- FREE(qwkbuf);
+ free(qwkbuf);
smb_freemsgmem(&msg);
return; }
sprintf(smb.file,"%smail", cfg.data_dir);
@@ -631,7 +631,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
if((i=smb_open(&smb))!=0) {
smb_stack(&smb,SMB_STACK_POP);
errormsg(WHERE,ERR_OPEN,smb.file,i,smb.last_error);
- FREE(qwkbuf);
+ free(qwkbuf);
smb_freemsgmem(&msg);
return; }
@@ -644,7 +644,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
errormsg(WHERE,ERR_CREATE,smb.file,i,smb.last_error);
- FREE(qwkbuf);
+ free(qwkbuf);
smb_freemsgmem(&msg);
return; } }
@@ -656,7 +656,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
smb_stack(&smb,SMB_STACK_POP);
sprintf(str,"REP msg (%ld)",n);
errormsg(WHERE,ERR_LEN,str,length);
- FREE(qwkbuf);
+ free(qwkbuf);
smb_freemsgmem(&msg);
return; }
@@ -664,7 +664,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
errormsg(WHERE,ERR_OPEN,smb.file,i,smb.last_error);
- FREE(qwkbuf);
+ free(qwkbuf);
smb_freemsgmem(&msg);
return; }
if(cfg.sys_misc&SM_FASTMAIL)
@@ -722,7 +722,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
,qnet ? "QWK":"Internet",name,qnet ? fulladdr : to);
logline("EN",str); }
- FREE((char *)qwkbuf);
+ free((char *)qwkbuf);
return; }
@@ -730,7 +730,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
if(!fidoaddr.zone || !cfg.netmail_dir[0]) { // No fido netmail allowed
bputs(text[InvalidNetMailAddr]);
- FREE(qwkbuf);
+ free(qwkbuf);
return;
}
@@ -753,11 +753,11 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
if(cfg.netmail_cost && !(useron.exempt&FLAG('S'))) {
if(useron.cdt+useron.freecdt<cfg.netmail_cost) {
bputs(text[NotEnoughCredits]);
- FREE(qwkbuf);
+ free(qwkbuf);
return; }
sprintf(str,text[NetMailCostContinueQ],cfg.netmail_cost);
if(noyes(str)) {
- FREE(qwkbuf);
+ free(qwkbuf);
return; } }
hdr.destzone =fidoaddr.zone;
@@ -834,7 +834,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
bputs(text[TooManyEmailsToday]);
return; }
if((fido=nopen(str,O_WRONLY|O_CREAT|O_EXCL))==-1) {
- FREE(qwkbuf);
+ free(qwkbuf);
errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_CREAT|O_EXCL);
return; }
write(fido,&hdr,sizeof(hdr));
@@ -862,7 +862,7 @@ void sbbs_t::qwktonetmail(FILE *rep, char *block, char *into, uchar fromhub)
l=0;
write(fido,&l,1); /* Null terminator */
close(fido);
- FREE((char *)qwkbuf);
+ free((char *)qwkbuf);
if(cfg.netmail_sem[0]) /* update semaphore file */
ftouch(cmdstr(cfg.netmail_sem,nulstr,nulstr,NULL));
if(!(useron.exempt&FLAG('S')))
diff --git a/src/sbbs3/file.cpp b/src/sbbs3/file.cpp
index 58434dc7aa..7958b54374 100644
--- a/src/sbbs3/file.cpp
+++ b/src/sbbs3/file.cpp
@@ -187,13 +187,13 @@ void sbbs_t::closefile(file_t* f)
errormsg(WHERE,ERR_OPEN,str1,O_RDONLY);
return; }
length=filelength(file);
- if((buf=(char *)MALLOC(length))==NULL) {
+ if((buf=(char *)malloc(length))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str1,length);
return; }
if(read(file,buf,length)!=length) {
close(file);
- FREE(buf);
+ free(buf);
errormsg(WHERE,ERR_READ,str1,length);
return; }
close(file);
@@ -210,7 +210,7 @@ void sbbs_t::closefile(file_t* f)
ch=1;
continue; } }
write(file,buf+l,BO_LEN); }
- FREE(buf);
+ free(buf);
close(file);
}
diff --git a/src/sbbs3/filedat.c b/src/sbbs3/filedat.c
index e10576c8ed..483ebe6236 100644
--- a/src/sbbs3/filedat.c
+++ b/src/sbbs3/filedat.c
@@ -160,7 +160,7 @@ BOOL DLLCALL addfiledat(scfg_t* cfg, file_t* f)
{
char str[MAX_PATH+1],fname[13],c,fdat[F_LEN+1];
char tmp[128];
- uchar HUGE16 *ixbbuf,idx[3];
+ uchar *ixbbuf,idx[3];
int i,file;
long l,length;
time_t now;
@@ -244,13 +244,13 @@ BOOL DLLCALL addfiledat(scfg_t* cfg, file_t* f)
close(file);
return(FALSE);
}
- if((ixbbuf=(uchar *)MALLOC(length))==NULL) {
+ if((ixbbuf=(uchar *)malloc(length))==NULL) {
close(file);
return(FALSE);
}
if(lread(file,ixbbuf,length)!=length) {
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE);
}
/************************************************/
@@ -261,7 +261,7 @@ BOOL DLLCALL addfiledat(scfg_t* cfg, file_t* f)
for(i=0;i<12 && toupper(fname[i])==toupper(ixbbuf[l+i]);i++);
if(i==12) { /* file already in directory index */
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE);
}
if(cfg->dir[f->dir]->sort==SORT_NAME_A
@@ -285,22 +285,22 @@ BOOL DLLCALL addfiledat(scfg_t* cfg, file_t* f)
lseek(file,l,SEEK_SET);
if(write(file,fname,11)!=11) { /* Write filename to IXB file */
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE);
}
if(write(file,idx,3)!=3) { /* Write DAT offset into IXB file */
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE);
}
write(file,&f->dateuled,sizeof(time_t));
write(file,&f->datedled,4); /* Write 0 for datedled */
if(lwrite(file,&ixbbuf[l],length-l)!=length-l) { /* Write rest of IXB */
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE);
}
- FREE((char *)ixbbuf); }
+ free((char *)ixbbuf); }
else { /* IXB file is empty... No files */
if(write(file,fname,11)!=11) { /* Write filename it IXB file */
close(file);
@@ -326,7 +326,7 @@ BOOL DLLCALL addfiledat(scfg_t* cfg, file_t* f)
BOOL DLLCALL getfileixb(scfg_t* cfg, file_t* f)
{
char str[MAX_PATH+1],fname[13];
- uchar HUGE16 * ixbbuf;
+ uchar * ixbbuf;
int file;
long l,length;
@@ -339,13 +339,13 @@ BOOL DLLCALL getfileixb(scfg_t* cfg, file_t* f)
close(file);
return(FALSE);
}
- if((ixbbuf=(uchar *)MALLOC(length))==NULL) {
+ if((ixbbuf=(uchar *)malloc(length))==NULL) {
close(file);
return(FALSE);
}
if(lread(file,ixbbuf,length)!=length) {
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE);
}
close(file);
@@ -358,7 +358,7 @@ BOOL DLLCALL getfileixb(scfg_t* cfg, file_t* f)
break;
}
if(l>=length) {
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE);
}
l+=11;
@@ -367,7 +367,7 @@ BOOL DLLCALL getfileixb(scfg_t* cfg, file_t* f)
|((long)ixbbuf[l+5]<<16)|((long)ixbbuf[l+6]<<24);
f->datedled=ixbbuf[l+7]|((long)ixbbuf[l+8]<<8)
|((long)ixbbuf[l+9]<<16)|((long)ixbbuf[l+10]<<24);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(TRUE);
}
@@ -376,7 +376,7 @@ BOOL DLLCALL getfileixb(scfg_t* cfg, file_t* f)
/****************************************************************************/
BOOL DLLCALL removefiledat(scfg_t* cfg, file_t* f)
{
- char c,str[MAX_PATH+1],ixbname[12],HUGE16 *ixbbuf,fname[13];
+ char c,str[MAX_PATH+1],ixbname[12],*ixbbuf,fname[13];
int i,file;
long l,length;
@@ -392,13 +392,13 @@ BOOL DLLCALL removefiledat(scfg_t* cfg, file_t* f)
close(file);
return(FALSE);
}
- if((ixbbuf=(char *)MALLOC(length))==0) {
+ if((ixbbuf=(char *)malloc(length))==0) {
close(file);
return(FALSE);
}
if(lread(file,ixbbuf,length)!=length) {
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE);
}
close(file);
@@ -412,11 +412,11 @@ BOOL DLLCALL removefiledat(scfg_t* cfg, file_t* f)
if(stricmp(ixbname,fname))
if(lwrite(file,&ixbbuf[l],F_IXBSIZE)!=F_IXBSIZE) {
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE);
}
}
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
close(file);
SAFEPRINTF2(str,"%s%s.dat",cfg->dir[f->dir]->data_dir,cfg->dir[f->dir]->code);
if((file=sopen(str,O_WRONLY|O_BINARY,SH_DENYRW))==-1) {
@@ -441,7 +441,7 @@ BOOL DLLCALL removefiledat(scfg_t* cfg, file_t* f)
/****************************************************************************/
BOOL DLLCALL findfile(scfg_t* cfg, uint dirnum, char *filename)
{
- char str[MAX_PATH+1],fname[13],HUGE16 *ixbbuf;
+ char str[MAX_PATH+1],fname[13],*ixbbuf;
int i,file;
long length,l;
@@ -455,19 +455,19 @@ BOOL DLLCALL findfile(scfg_t* cfg, uint dirnum, char *filename)
if(!length) {
close(file);
return(FALSE); }
- if((ixbbuf=(char *)MALLOC(length))==NULL) {
+ if((ixbbuf=(char *)malloc(length))==NULL) {
close(file);
return(FALSE); }
if(lread(file,ixbbuf,length)!=length) {
close(file);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(FALSE); }
close(file);
for(l=0;l<length;l+=F_IXBSIZE) {
for(i=0;i<11;i++)
if(toupper(fname[i])!=toupper(ixbbuf[l+i])) break;
if(i==11) break; }
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
if(l!=length)
return(TRUE);
return(FALSE);
@@ -534,18 +534,18 @@ BOOL DLLCALL rmuserxfers(scfg_t* cfg, int fromuser, int destuser, char *fname)
return(FALSE);
}
length=filelength(file);
- if((ixtbuf=(char *)MALLOC(length))==NULL) {
+ if((ixtbuf=(char *)malloc(length))==NULL) {
close(file);
return(FALSE);
}
if(read(file,ixtbuf,length)!=length) {
close(file);
- FREE(ixtbuf);
+ free(ixtbuf);
return(FALSE);
}
close(file);
if((file=sopen(str,O_WRONLY|O_TRUNC|O_BINARY,SH_DENYRW))==-1) {
- FREE(ixtbuf);
+ free(ixtbuf);
return(FALSE);
}
for(l=0;l<length;l+=24) {
@@ -570,7 +570,7 @@ BOOL DLLCALL rmuserxfers(scfg_t* cfg, int fromuser, int destuser, char *fname)
continue;
write(file,ixtbuf+l,24); }
close(file);
- FREE(ixtbuf);
+ free(ixtbuf);
return(TRUE);
}
diff --git a/src/sbbs3/filelist.c b/src/sbbs3/filelist.c
index 539a3a22c3..6944dbd03f 100644
--- a/src/sbbs3/filelist.c
+++ b/src/sbbs3/filelist.c
@@ -302,7 +302,7 @@ int main(int argc, char **argv)
close(file);
if(misc&AUTO) fclose(out);
continue; }
- if((ixbbuf=(char *)MALLOC(l))==NULL) {
+ if((ixbbuf=(char *)malloc(l))==NULL) {
close(file);
if(misc&AUTO) fclose(out);
printf("\7ERR_ALLOC %s %lu\n",str,l);
@@ -311,27 +311,27 @@ int main(int argc, char **argv)
close(file);
if(misc&AUTO) fclose(out);
printf("\7ERR_READ %s %lu\n",str,l);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
continue; }
close(file);
sprintf(str,"%s%s.dat",scfg.dir[i]->data_dir,scfg.dir[i]->code);
if((file=nopen(str,O_RDONLY))==-1) {
printf("\7ERR_OPEN %s %u\n",str,O_RDONLY);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
if(misc&AUTO) fclose(out);
continue; }
datbuflen=filelength(file);
- if((datbuf=MALLOC(datbuflen))==NULL) {
+ if((datbuf=malloc(datbuflen))==NULL) {
close(file);
printf("\7ERR_ALLOC %s %lu\n",str,datbuflen);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
if(misc&AUTO) fclose(out);
continue; }
if(read(file,datbuf,datbuflen)!=(int)datbuflen) {
close(file);
printf("\7ERR_READ %s %lu\n",str,datbuflen);
- FREE((char *)datbuf);
- FREE((char *)ixbbuf);
+ free((char *)datbuf);
+ free((char *)ixbbuf);
if(misc&AUTO) fclose(out);
continue; }
close(file);
@@ -447,8 +447,8 @@ int main(int argc, char **argv)
lines++; }
fclose(in); }
fprintf(out,"\r\n"); }
- FREE((char *)datbuf);
- FREE((char *)ixbbuf);
+ free((char *)datbuf);
+ free((char *)ixbbuf);
fprintf(out,"\r\n"); /* blank line at end of dir */
if(misc&AUTO) fclose(out); }
diff --git a/src/sbbs3/finddupes.c b/src/sbbs3/finddupes.c
index 06eccbefd1..59d15fe526 100644
--- a/src/sbbs3/finddupes.c
+++ b/src/sbbs3/finddupes.c
@@ -27,11 +27,6 @@ typedef struct {
file_t* file;
ulong file_count=0;
-#ifdef FREE
-#undef FREE
-#endif
-#define FREE(x) if(x!=NULL) free(x);
-
int fchksum(const char* fname, long length,
#ifdef USE_MD5
BYTE*
@@ -58,7 +53,7 @@ int fchksum(const char* fname, long length,
if(fread(buf,sizeof(BYTE),length,fp) != length) {
perror(fname);
fclose(fp);
- FREE(buf);
+ FREE_AND_NULL(buf);
return(-1);
}
@@ -68,7 +63,7 @@ int fchksum(const char* fname, long length,
#else
*chksum = crc32(buf, length);
#endif
- FREE(buf);
+ FREE_AND_NULL(buf);
return(0);
}
@@ -233,4 +228,4 @@ int main(int argc, char** argv)
if(del_files)
printf("%lu bytes deleted in %lu files\n", del_bytes, del_files);
return(0);
-}
\ No newline at end of file
+}
diff --git a/src/sbbs3/getmail.c b/src/sbbs3/getmail.c
index 15d37d8894..6c11b557f6 100644
--- a/src/sbbs3/getmail.c
+++ b/src/sbbs3/getmail.c
@@ -151,7 +151,7 @@ mail_t* DLLCALL loadmail(smb_t* smb, long* msgs, uint usernumber
continue;
if(mode&LM_UNREAD && idx.attr&MSG_READ)
continue;
- if((mail=(mail_t *)REALLOC(mail,sizeof(mail_t)*(l+1)))
+ if((mail=(mail_t *)realloc(mail,sizeof(mail_t)*(l+1)))
==NULL) {
smb_unlocksmbhdr(smb);
return(NULL);
@@ -166,5 +166,5 @@ mail_t* DLLCALL loadmail(smb_t* smb, long* msgs, uint usernumber
void DLLCALL freemail(mail_t* mail)
{
- FREE(mail);
+ free(mail);
}
diff --git a/src/sbbs3/getmsg.cpp b/src/sbbs3/getmsg.cpp
index 4ac3c37827..296b4c6543 100644
--- a/src/sbbs3/getmsg.cpp
+++ b/src/sbbs3/getmsg.cpp
@@ -213,7 +213,7 @@ void sbbs_t::quotemsg(smbmsg_t* msg, int tails)
/****************************************************************************/
void sbbs_t::msgtotxt(smbmsg_t* msg, char *str, int header, int tails)
{
- char HUGE16 *buf;
+ char *buf;
int i;
FILE *out;
diff --git a/src/sbbs3/getnode.cpp b/src/sbbs3/getnode.cpp
index 757eb14050..a16614f09a 100644
--- a/src/sbbs3/getnode.cpp
+++ b/src/sbbs3/getnode.cpp
@@ -198,7 +198,7 @@ void sbbs_t::nodesync()
/****************************************************************************/
int sbbs_t::getnmsg()
{
- char str[MAX_PATH+1], HUGE16 *buf;
+ char str[MAX_PATH+1], *buf;
int file;
long length;
@@ -221,14 +221,14 @@ int sbbs_t::getnmsg()
close(file);
return(0);
}
- if((buf=(char *)LMALLOC(length+1))==NULL) {
+ if((buf=(char *)malloc(length+1))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,length+1);
return(-1);
}
if(lread(file,buf,length)!=length) {
close(file);
- FREE(buf);
+ free(buf);
errormsg(WHERE,ERR_READ,str,length);
return(errno);
}
@@ -241,7 +241,7 @@ int sbbs_t::getnmsg()
CRLF;
}
putmsg(buf,P_NOATCODES);
- LFREE(buf);
+ free(buf);
return(0);
}
@@ -302,7 +302,7 @@ int sbbs_t::getnodeext(uint number, char *ext)
/****************************************************************************/
int sbbs_t::getsmsg(int usernumber)
{
- char str[MAX_PATH+1], HUGE16 *buf;
+ char str[MAX_PATH+1], *buf;
int file;
long length;
@@ -314,14 +314,14 @@ int sbbs_t::getsmsg(int usernumber)
return(errno);
}
length=filelength(file);
- if((buf=(char *)LMALLOC(length+1))==NULL) {
+ if((buf=(char *)malloc(length+1))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,length+1);
return(-1);
}
if(lread(file,buf,length)!=length) {
close(file);
- FREE(buf);
+ free(buf);
errormsg(WHERE,ERR_READ,str,length);
return(errno);
}
@@ -340,7 +340,7 @@ int sbbs_t::getsmsg(int usernumber)
}
}
putmsg(buf,P_NOATCODES);
- LFREE(buf);
+ free(buf);
return(0);
}
diff --git a/src/sbbs3/install/sbbsinst.c b/src/sbbs3/install/sbbsinst.c
index c397abe68c..0277da0315 100644
--- a/src/sbbs3/install/sbbsinst.c
+++ b/src/sbbs3/install/sbbsinst.c
@@ -349,16 +349,16 @@ int main(int argc, char **argv)
bail(1);
}
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
- if((mopt=(char **)MALLOC(sizeof(char *)*MAX_OPTS))==NULL)
+ if((mopt=(char **)malloc(sizeof(char *)*MAX_OPTS))==NULL)
allocfail(sizeof(char *)*MAX_OPTS);
for(i=0;i<MAX_OPTS;i++)
- if((mopt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((mopt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
sprintf(str,"Synchronet Installation %s-%s",revision,PLATFORM_DESC);
@@ -690,7 +690,7 @@ int view_file(char *filename, char *title)
if(fexist(filename)) {
if((buffile=sopen(filename,O_RDONLY,SH_DENYWR))>=0) {
j=filelength(buffile);
- if((buf=(char *)MALLOC(j+1))!=NULL) {
+ if((buf=(char *)malloc(j+1))!=NULL) {
read(buffile,buf,j);
close(buffile);
*(buf+j)=0;
@@ -916,10 +916,10 @@ get_distlist(void)
int (*readline) (int sock, char *buf, size_t length, char *error)=NULL;
memset(errors,0,sizeof(errors));
- if((dist=(dist_t **)MALLOC(sizeof(void *)*MAX_DISTRIBUTIONS))==NULL)
+ if((dist=(dist_t **)malloc(sizeof(void *)*MAX_DISTRIBUTIONS))==NULL)
allocfail(sizeof(void *)*MAX_DISTRIBUTIONS);
for(i=0;i<MAX_DISTRIBUTIONS;i++)
- if((dist[i]=(void *)MALLOC(sizeof(dist_t)))==NULL)
+ if((dist[i]=(void *)malloc(sizeof(dist_t)))==NULL)
allocfail(sizeof(dist_t));
sprintf(str,DEFAULT_LIBFILE,params.sys_desc);
@@ -928,10 +928,10 @@ get_distlist(void)
if(!fexistcase(str)) /* use lib-unix.tgz if all else fails */
sprintf(str,DEFAULT_LIBFILE,DEFAULT_SYSTYPE);
if(fexist(DEFAULT_DISTFILE) && fexistcase(str)) {
- if((file=(char **)MALLOC(sizeof(char *)*MAX_DIST_FILES))==NULL)
+ if((file=(char **)malloc(sizeof(char *)*MAX_DIST_FILES))==NULL)
allocfail(sizeof(char *)*MAX_DIST_FILES);
for(i=0;i<MAX_DIST_FILES;i++)
- if((file[i]=(char *)MALLOC(MAX_FILELEN))==NULL)
+ if((file[i]=(char *)malloc(MAX_FILELEN))==NULL)
allocfail(MAX_FILELEN);
server=NULL;
f=0;
@@ -1002,10 +1002,10 @@ get_distlist(void)
file=NULL;
- if((server=(struct server_ent_t **)MALLOC(sizeof(void *)*MAX_SERVERS))==NULL)
+ if((server=(struct server_ent_t **)malloc(sizeof(void *)*MAX_SERVERS))==NULL)
allocfail(sizeof(struct server_ent_t *)*MAX_SERVERS);
for(i=0;i<MAX_SERVERS;i++)
- if((server[i]=(struct server_ent_t *)MALLOC(sizeof(struct server_ent_t)))==NULL)
+ if((server[i]=(struct server_ent_t *)malloc(sizeof(struct server_ent_t)))==NULL)
allocfail(64);
f=0;
s=0;
@@ -1022,16 +1022,16 @@ get_distlist(void)
if(server!=NULL)
memset(server[s],0,sizeof(struct server_ent_t));
- if((file=(char **)MALLOC(sizeof(char *)*MAX_DIST_FILES))==NULL)
+ if((file=(char **)malloc(sizeof(char *)*MAX_DIST_FILES))==NULL)
allocfail(sizeof(char *)*MAX_DIST_FILES);
for(i=0;i<MAX_DIST_FILES;i++)
- if((file[i]=(char *)MALLOC(MAX_FILELEN))==NULL)
+ if((file[i]=(char *)malloc(MAX_FILELEN))==NULL)
allocfail(MAX_FILELEN);
- if((server=(struct server_ent_t **)MALLOC(sizeof(struct server_ent_t *)*MAX_SERVERS))==NULL)
+ if((server=(struct server_ent_t **)malloc(sizeof(struct server_ent_t *)*MAX_SERVERS))==NULL)
allocfail(sizeof(struct server_ent_t *)*MAX_SERVERS);
for(i=0;i<MAX_SERVERS;i++)
- if((server[i]=(struct server_ent_t *)MALLOC(sizeof(struct server_ent_t)))==NULL)
+ if((server[i]=(struct server_ent_t *)malloc(sizeof(struct server_ent_t)))==NULL)
allocfail(64);
f=0;
s=0;
diff --git a/src/sbbs3/js_bbs.cpp b/src/sbbs3/js_bbs.cpp
index f13611701b..401233b366 100644
--- a/src/sbbs3/js_bbs.cpp
+++ b/src/sbbs3/js_bbs.cpp
@@ -1093,7 +1093,7 @@ js_replace_text(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv
return(JS_TRUE);
if(sbbs->text[i]!=sbbs->text_sav[i] && sbbs->text[i]!=nulstr)
- FREE(sbbs->text[i]);
+ free(sbbs->text[i]);
if((js_str=JS_ValueToString(cx, argv[1]))==NULL)
return(JS_TRUE);
@@ -1106,7 +1106,7 @@ js_replace_text(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv
sbbs->text[i]=nulstr;
*rval = JSVAL_TRUE;
} else {
- sbbs->text[i]=(char *)MALLOC(len+1);
+ sbbs->text[i]=(char *)malloc(len+1);
if(sbbs->text[i]==NULL) {
sbbs->text[i]=sbbs->text_sav[i];
} else {
@@ -1133,12 +1133,12 @@ js_revert_text(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
if(i<0 || i>=TOTAL_TEXT) {
for(i=0;i<TOTAL_TEXT;i++) {
if(sbbs->text[i]!=sbbs->text_sav[i] && sbbs->text[i]!=nulstr)
- FREE(sbbs->text[i]);
+ free(sbbs->text[i]);
sbbs->text[i]=sbbs->text_sav[i];
}
} else {
if(sbbs->text[i]!=sbbs->text_sav[i] && sbbs->text[i]!=nulstr)
- FREE(sbbs->text[i]);
+ free(sbbs->text[i]);
sbbs->text[i]=sbbs->text_sav[i];
}
@@ -1167,7 +1167,7 @@ js_load_text(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
for(i=0;i<TOTAL_TEXT;i++) {
if(sbbs->text[i]!=sbbs->text_sav[i]) {
if(sbbs->text[i]!=nulstr)
- FREE(sbbs->text[i]);
+ free(sbbs->text[i]);
sbbs->text[i]=sbbs->text_sav[i];
}
}
@@ -1184,11 +1184,11 @@ js_load_text(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
continue;
}
if(!strcmp(sbbs->text[i],sbbs->text_sav[i])) { /* If identical */
- FREE(sbbs->text[i]); /* Don't alloc */
+ free(sbbs->text[i]); /* Don't alloc */
sbbs->text[i]=sbbs->text_sav[i];
}
else if(sbbs->text[i][0]==0) {
- FREE(sbbs->text[i]);
+ free(sbbs->text[i]);
sbbs->text[i]=nulstr;
}
}
@@ -1890,7 +1890,7 @@ js_bulkmail(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
}
sbbs->bulkmail(ar);
if(ar && ar[0])
- FREE(ar);
+ free(ar);
return(JS_TRUE);
}
diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index ef48d8deba..1d793865ab 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -2348,7 +2348,7 @@ js_socket_select(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r
if((rarray = JS_NewArrayObject(cx, 0, NULL))==NULL)
return(JS_FALSE);
- if((index=(SOCKET *)MALLOC(sizeof(SOCKET)*limit))==NULL)
+ if((index=(SOCKET *)malloc(sizeof(SOCKET)*limit))==NULL)
return(JS_FALSE);
FD_ZERO(&socket_set);
diff --git a/src/sbbs3/listfile.cpp b/src/sbbs3/listfile.cpp
index c76c270f2e..c4202f6bf3 100644
--- a/src/sbbs3/listfile.cpp
+++ b/src/sbbs3/listfile.cpp
@@ -74,32 +74,32 @@ int sbbs_t::listfiles(uint dirnum, char *filespec, int tofile, long mode)
if(!l) {
close(file);
return(0); }
- if((ixbbuf=(uchar *)MALLOC(l))==NULL) {
+ if((ixbbuf=(uchar *)malloc(l))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,l);
return(0); }
if(lread(file,ixbbuf,l)!=l) {
close(file);
errormsg(WHERE,ERR_READ,str,l);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(0); }
close(file);
sprintf(str,"%s%s.dat",cfg.dir[dirnum]->data_dir,cfg.dir[dirnum]->code);
if((file=nopen(str,O_RDONLY))==-1) {
errormsg(WHERE,ERR_OPEN,str,O_RDONLY);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(0); }
datbuflen=filelength(file);
- if((datbuf=(char *)MALLOC(datbuflen))==NULL) {
+ if((datbuf=(char *)malloc(datbuflen))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,datbuflen);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
return(0); }
if(lread(file,datbuf,datbuflen)!=datbuflen) {
close(file);
errormsg(WHERE,ERR_READ,str,datbuflen);
- FREE((char *)datbuf);
- FREE((char *)ixbbuf);
+ free((char *)datbuf);
+ free((char *)ixbbuf);
return(0); }
close(file);
if(!tofile) {
@@ -134,8 +134,8 @@ int sbbs_t::listfiles(uint dirnum, char *filespec, int tofile, long mode)
found-=letter-'A'; }
letter='A'; }
else if((int)i==-1) {
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
return(-1); }
else
break;
@@ -150,8 +150,8 @@ int sbbs_t::listfiles(uint dirnum, char *filespec, int tofile, long mode)
anchor=m;
if(msgabort()) { /* used to be !tofile && msgabort() */
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
return(-1); }
for(j=0;j<12 && m<l;j++)
if(j==8)
@@ -287,13 +287,13 @@ int sbbs_t::listfiles(uint dirnum, char *filespec, int tofile, long mode)
bputs("\r\1>");
if(mode&FL_EXFIND) {
if(!viewfile(&f,1)) {
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
return(-1); } }
else {
if(!viewfile(&f,0)) {
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
return(-1); } } }
else if(tofile)
@@ -309,8 +309,8 @@ int sbbs_t::listfiles(uint dirnum, char *filespec, int tofile, long mode)
disp=1;
found++; }
if(sys_status&SS_ABORT) {
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
return(-1); }
if(mode&(FL_EXFIND|FL_VIEW))
continue;
@@ -333,8 +333,8 @@ int sbbs_t::listfiles(uint dirnum, char *filespec, int tofile, long mode)
lncntr=0;
lastbat=found;
if((int)(i=batchflagprompt(dirnum,bf,letter-'A'+1,l/F_IXBSIZE))<1) {
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
if((int)i==-1)
return(-1);
else
@@ -362,8 +362,8 @@ int sbbs_t::listfiles(uint dirnum, char *filespec, int tofile, long mode)
if(filespec[0] && !strchr(filespec,'*') && !strchr(filespec,'?') && m)
break; }
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
return(found);
}
@@ -371,7 +371,7 @@ int sbbs_t::listfiles(uint dirnum, char *filespec, int tofile, long mode)
/* Prints one file's information on a single line */
/* Return 1 if displayed, 0 otherwise */
/****************************************************************************/
-bool sbbs_t::listfile(char *fname, char HUGE16 *buf, uint dirnum
+bool sbbs_t::listfile(char *fname, char *buf, uint dirnum
, char *search, char letter, ulong datoffset)
{
char str[256],ext[513]="",*ptr,*cr,*lf,exist=1;
@@ -854,13 +854,13 @@ int sbbs_t::listfileinfo(uint dirnum, char *filespec, long mode)
errormsg(WHERE,ERR_OPEN,str,O_RDONLY);
return(0); }
usrxfrlen=filelength(file);
- if((usrxfrbuf=(uchar *)MALLOC(usrxfrlen))==NULL) {
+ if((usrxfrbuf=(uchar *)malloc(usrxfrlen))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,usrxfrlen);
return(0); }
if(read(file,usrxfrbuf,usrxfrlen)!=usrxfrlen) {
close(file);
- FREE(usrxfrbuf);
+ free(usrxfrbuf);
errormsg(WHERE,ERR_READ,str,usrxfrlen);
return(0); }
close(file); }
@@ -871,24 +871,24 @@ int sbbs_t::listfileinfo(uint dirnum, char *filespec, long mode)
if(!l) {
close(file);
return(0); }
- if((ixbbuf=(uchar *)MALLOC(l))==NULL) {
+ if((ixbbuf=(uchar *)malloc(l))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,l);
return(0); }
if(lread(file,ixbbuf,l)!=l) {
close(file);
errormsg(WHERE,ERR_READ,str,l);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
if(usrxfrbuf)
- FREE(usrxfrbuf);
+ free(usrxfrbuf);
return(0); }
close(file);
sprintf(str,"%s%s.dat",cfg.dir[dirnum]->data_dir,cfg.dir[dirnum]->code);
if((file=nopen(str,O_RDONLY))==-1) {
errormsg(WHERE,ERR_READ,str,O_RDONLY);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
if(usrxfrbuf)
- FREE(usrxfrbuf);
+ free(usrxfrbuf);
return(0); }
close(file);
m=0;
@@ -1286,16 +1286,16 @@ int sbbs_t::listfileinfo(uint dirnum, char *filespec, long mode)
if(filespec[0] && !strchr(filespec,'*') && !strchr(filespec,'?'))
break;
}
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
if(usrxfrbuf)
- FREE(usrxfrbuf);
+ free(usrxfrbuf);
return(found);
}
/****************************************************************************/
/* Prints one file's information on a single line to a file 'file' */
/****************************************************************************/
-void sbbs_t::listfiletofile(char *fname, char HUGE16 *buf, uint dirnum, int file)
+void sbbs_t::listfiletofile(char *fname, char *buf, uint dirnum, int file)
{
char str[256];
char tmp[512];
diff --git a/src/sbbs3/logout.cpp b/src/sbbs3/logout.cpp
index 6875706744..ffeb46228c 100644
--- a/src/sbbs3/logout.cpp
+++ b/src/sbbs3/logout.cpp
@@ -192,13 +192,13 @@ void sbbs_t::backout()
errormsg(WHERE,ERR_OPEN,str,O_RDONLY);
return; }
length=filelength(file);
- if((buf=(char *)MALLOC(length))==NULL) {
+ if((buf=(char *)malloc(length))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,length);
return; }
if(read(file,buf,length)!=length) {
close(file);
- FREE(buf);
+ free(buf);
errormsg(WHERE,ERR_READ,str,length);
return; }
close(file);
@@ -217,7 +217,7 @@ void sbbs_t::backout()
break;
default:
errormsg(WHERE,ERR_CHK,str,buf[l]); } }
- FREE(buf);
+ free(buf);
remove(str); /* always remove the backout file */
}
diff --git a/src/sbbs3/mail.cpp b/src/sbbs3/mail.cpp
index 707ced0cbb..3f26ea3aa2 100644
--- a/src/sbbs3/mail.cpp
+++ b/src/sbbs3/mail.cpp
@@ -44,7 +44,7 @@
int sbbs_t::delmail(uint usernumber, int which)
{
ulong i,l,now;
- idxrec_t HUGE16 *idxbuf;
+ idxrec_t *idxbuf;
smbmsg_t msg;
now=time(NULL);
@@ -53,17 +53,17 @@ int sbbs_t::delmail(uint usernumber, int which)
return(2); }
if(!smb.status.total_msgs)
return(0);
- if((idxbuf=(idxrec_t *)LMALLOC(smb.status.total_msgs*sizeof(idxrec_t)))==NULL) {
+ if((idxbuf=(idxrec_t *)malloc(smb.status.total_msgs*sizeof(idxrec_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,smb.file,smb.status.total_msgs*sizeof(idxrec_t));
return(-1); }
if((i=smb_open_da(&smb))!=0) {
errormsg(WHERE,ERR_OPEN,smb.file,i,smb.last_error);
- LFREE(idxbuf);
+ free(idxbuf);
return(i); }
if((i=smb_open_ha(&smb))!=0) {
smb_close_da(&smb);
errormsg(WHERE,ERR_OPEN,smb.file,i,smb.last_error);
- LFREE(idxbuf);
+ free(idxbuf);
return(i); }
smb_rewind(smb.sid_fp);
for(l=0;l<smb.status.total_msgs;) {
@@ -101,7 +101,7 @@ int sbbs_t::delmail(uint usernumber, int which)
smb_fsetlength(smb.sid_fp,0);
for(i=0;i<l;i++)
smb_fwrite(&smb,&idxbuf[i],sizeof(idxrec_t),smb.sid_fp);
- LFREE(idxbuf);
+ free(idxbuf);
smb.status.total_msgs=l;
smb_putstatus(&smb);
smb_fflush(smb.sid_fp);
@@ -174,7 +174,7 @@ void sbbs_t::delallmail(uint usernumber)
if((i=smb_locksmbhdr(&smb))!=0) { /* Lock the base, so nobody */
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
- FREE(mail);
+ free(mail);
errormsg(WHERE,ERR_LOCK,smb.file,i,smb.last_error); /* messes with the index */
return; }
for(l=0;l<msgs;l++) {
@@ -191,7 +191,7 @@ void sbbs_t::delallmail(uint usernumber)
smb_unlockmsghdr(&smb,&msg); } }
if(msgs)
- FREE(mail);
+ free(mail);
if(deleted && cfg.sys_misc&SM_DELEMAIL)
delmail(usernumber,MAIL_ANY);
smb_unlocksmbhdr(&smb);
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index e102a99ae7..64ca682133 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -1733,7 +1733,7 @@ static int chk_received_hdr(SOCKET socket,const char *buf,IN_ADDR *dnsbl_result,
char *p;
char *p2;
- fromstr=(char *)MALLOC(strlen(buf)+1);
+ fromstr=(char *)malloc(strlen(buf)+1);
if(fromstr==NULL)
return(0);
strcpy(fromstr,buf);
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index 3c4dc3928f..b04f60f2f9 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -2513,7 +2513,7 @@ bool sbbs_t::init()
/* Reset COMMAND SHELL */
- main_csi.str=(char *)MALLOC(1024);
+ main_csi.str=(char *)malloc(1024);
if(main_csi.str==NULL) {
errormsg(WHERE,ERR_ALLOC,"main_csi.str",1024);
return(false);
@@ -2525,17 +2525,17 @@ bool sbbs_t::init()
usrgrp_total = cfg.total_grps;
- if((cursub=(uint *)MALLOC(sizeof(uint)*usrgrp_total))==NULL) {
+ if((cursub=(uint *)malloc(sizeof(uint)*usrgrp_total))==NULL) {
errormsg(WHERE, ERR_ALLOC, "cursub", sizeof(uint)*usrgrp_total);
return(false);
}
- if((usrgrp=(uint *)MALLOC(sizeof(uint)*usrgrp_total))==NULL) {
+ if((usrgrp=(uint *)malloc(sizeof(uint)*usrgrp_total))==NULL) {
errormsg(WHERE, ERR_ALLOC, "usrgrp", sizeof(uint)*usrgrp_total);
return(false);
}
- if((usrsubs=(uint *)MALLOC(sizeof(uint)*usrgrp_total))==NULL) {
+ if((usrsubs=(uint *)malloc(sizeof(uint)*usrgrp_total))==NULL) {
errormsg(WHERE, ERR_ALLOC, "usrsubs", sizeof(uint)*usrgrp_total);
return(false);
}
@@ -2545,7 +2545,7 @@ bool sbbs_t::init()
return(false);
}
- if((subscan=(subscan_t *)MALLOC(sizeof(subscan_t)*cfg.total_subs))==NULL) {
+ if((subscan=(subscan_t *)malloc(sizeof(subscan_t)*cfg.total_subs))==NULL) {
errormsg(WHERE, ERR_ALLOC, "subscan", sizeof(subscan_t)*cfg.total_subs);
return(false);
}
@@ -2559,7 +2559,7 @@ bool sbbs_t::init()
}
if(l)
for(i=0;i<cfg.total_grps;i++)
- if((usrsub[i]=(uint *)MALLOC(sizeof(uint)*l))==NULL) {
+ if((usrsub[i]=(uint *)malloc(sizeof(uint)*l))==NULL) {
errormsg(WHERE, ERR_ALLOC, "usrsub[x]", sizeof(uint)*l);
return(false);
}
@@ -2568,17 +2568,17 @@ bool sbbs_t::init()
usrlib_total = cfg.total_libs;
- if((curdir=(uint *)MALLOC(sizeof(uint)*usrlib_total))==NULL) {
+ if((curdir=(uint *)malloc(sizeof(uint)*usrlib_total))==NULL) {
errormsg(WHERE, ERR_ALLOC, "curdir", sizeof(uint)*usrlib_total);
return(false);
}
- if((usrlib=(uint *)MALLOC(sizeof(uint)*usrlib_total))==NULL) {
+ if((usrlib=(uint *)malloc(sizeof(uint)*usrlib_total))==NULL) {
errormsg(WHERE, ERR_ALLOC, "usrlib", sizeof(uint)*usrlib_total);
return(false);
}
- if((usrdirs=(uint *)MALLOC(sizeof(uint)*usrlib_total))==NULL) {
+ if((usrdirs=(uint *)malloc(sizeof(uint)*usrlib_total))==NULL) {
errormsg(WHERE, ERR_ALLOC, "usrdirs", sizeof(uint)*usrlib_total);
return(false);
}
@@ -2598,7 +2598,7 @@ bool sbbs_t::init()
if(l) {
l++; /* for temp dir */
for(i=0;i<cfg.total_libs;i++)
- if((usrdir[i]=(uint *)MALLOC(sizeof(uint)*l))==NULL) {
+ if((usrdir[i]=(uint *)malloc(sizeof(uint)*l))==NULL) {
errormsg(WHERE, ERR_ALLOC, "usrdir[x]", sizeof(uint)*l);
return(false);
}
@@ -2606,32 +2606,32 @@ bool sbbs_t::init()
if(cfg.max_batup) {
- if((batup_desc=(char **)MALLOC(sizeof(char *)*cfg.max_batup))==NULL) {
+ if((batup_desc=(char **)malloc(sizeof(char *)*cfg.max_batup))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batup_desc", sizeof(char *)*cfg.max_batup);
return(false);
}
- if((batup_name=(char **)MALLOC(sizeof(char *)*cfg.max_batup))==NULL) {
+ if((batup_name=(char **)malloc(sizeof(char *)*cfg.max_batup))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batup_name", sizeof(char *)*cfg.max_batup);
return(false);
}
- if((batup_misc=(long *)MALLOC(sizeof(long)*cfg.max_batup))==NULL) {
+ if((batup_misc=(long *)malloc(sizeof(long)*cfg.max_batup))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batup_misc", sizeof(char *)*cfg.max_batup);
return(false);
}
- if((batup_dir=(uint *)MALLOC(sizeof(uint)*cfg.max_batup))==NULL) {
+ if((batup_dir=(uint *)malloc(sizeof(uint)*cfg.max_batup))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batup_dir", sizeof(char *)*cfg.max_batup);
return(false);
}
- if((batup_alt=(ushort *)MALLOC(sizeof(ushort)*cfg.max_batup))==NULL) {
+ if((batup_alt=(ushort *)malloc(sizeof(ushort)*cfg.max_batup))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batup_alt", sizeof(char *)*cfg.max_batup);
return(false);
}
for(i=0;i<cfg.max_batup;i++) {
- if((batup_desc[i]=(char *)MALLOC(59))==NULL) {
+ if((batup_desc[i]=(char *)malloc(59))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batup_desc[x]", 59);
return(false);
}
- if((batup_name[i]=(char *)MALLOC(13))==NULL) {
+ if((batup_name[i]=(char *)malloc(13))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batup_name[x]", 13);
return(false);
}
@@ -2640,32 +2640,32 @@ bool sbbs_t::init()
if(cfg.max_batdn) {
- if((batdn_name=(char **)MALLOC(sizeof(char *)*cfg.max_batdn))==NULL) {
+ if((batdn_name=(char **)malloc(sizeof(char *)*cfg.max_batdn))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batdn_name", sizeof(char *)*cfg.max_batdn);
return(false);
}
- if((batdn_dir=(uint *)MALLOC(sizeof(uint)*cfg.max_batdn))==NULL) {
+ if((batdn_dir=(uint *)malloc(sizeof(uint)*cfg.max_batdn))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batdn_dir", sizeof(uint)*cfg.max_batdn);
return(false);
}
- if((batdn_offset=(long *)MALLOC(sizeof(long)*cfg.max_batdn))==NULL) {
+ if((batdn_offset=(long *)malloc(sizeof(long)*cfg.max_batdn))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batdn_offset", sizeof(long)*cfg.max_batdn);
return(false);
}
- if((batdn_size=(ulong *)MALLOC(sizeof(ulong)*cfg.max_batdn))==NULL) {
+ if((batdn_size=(ulong *)malloc(sizeof(ulong)*cfg.max_batdn))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batdn_size", sizeof(ulong)*cfg.max_batdn);
return(false);
}
- if((batdn_cdt=(ulong *)MALLOC(sizeof(ulong)*cfg.max_batdn))==NULL) {
+ if((batdn_cdt=(ulong *)malloc(sizeof(ulong)*cfg.max_batdn))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batdn_cdt", sizeof(long)*cfg.max_batdn);
return(false);
}
- if((batdn_alt=(ushort *)MALLOC(sizeof(ushort)*cfg.max_batdn))==NULL) {
+ if((batdn_alt=(ushort *)malloc(sizeof(ushort)*cfg.max_batdn))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batdn_alt", sizeof(ushort)*cfg.max_batdn);
return(false);
}
for(i=0;i<cfg.max_batdn;i++)
- if((batdn_name[i]=(char *)MALLOC(13))==NULL) {
+ if((batdn_name[i]=(char *)malloc(13))==NULL) {
errormsg(WHERE, ERR_ALLOC, "batdn_name[x]", 13);
return(false);
}
@@ -2743,7 +2743,7 @@ sbbs_t::~sbbs_t()
for(i=0;i<TOTAL_TEXT && text!=NULL;i++)
if(text[i]!=text_sav[i]) {
if(text[i]!=nulstr)
- FREE(text[i]);
+ free(text[i]);
}
/* Global command shell vars */
@@ -2949,7 +2949,7 @@ int sbbs_t::mv(char *src, char *dest, char copy)
errormsg(WHERE,ERR_LEN,src,0);
return(-1);
}
- if((buf=(char *)MALLOC(MV_BUFLEN))==NULL) {
+ if((buf=(char *)malloc(MV_BUFLEN))==NULL) {
fclose(inp);
fclose(outp);
errormsg(WHERE,ERR_ALLOC,nulstr,MV_BUFLEN);
@@ -2961,14 +2961,14 @@ int sbbs_t::mv(char *src, char *dest, char copy)
if(l+chunk>length)
chunk=length-l;
if(fread(buf,1,chunk,inp)!=chunk) {
- FREE(buf);
+ free(buf);
fclose(inp);
fclose(outp);
errormsg(WHERE,ERR_READ,src,chunk);
return(-1);
}
if(fwrite(buf,1,chunk,outp)!=chunk) {
- FREE(buf);
+ free(buf);
fclose(inp);
fclose(outp);
errormsg(WHERE,ERR_WRITE,dest,chunk);
@@ -2981,7 +2981,7 @@ int sbbs_t::mv(char *src, char *dest, char copy)
attr(atr);
/* getftime(ind,&ftime);
setftime(outd,&ftime); */
- FREE(buf);
+ free(buf);
fclose(inp);
fclose(outp);
if(!copy && remove(src)) {
@@ -3196,7 +3196,7 @@ void sbbs_t::reset_logon_vars(void)
void sbbs_t::catsyslog(int crash)
{
char str[MAX_PATH+1];
- char HUGE16 *buf;
+ char *buf;
int i,file;
long length;
struct tm tm;
@@ -3210,14 +3210,14 @@ void sbbs_t::catsyslog(int crash)
}
length=ftell(logfile_fp);
if(length) {
- if((buf=(char HUGE16 *)LMALLOC(length))==NULL) {
+ if((buf=(char *)malloc(length))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,length);
return;
}
rewind(logfile_fp);
if(fread(buf,1,length,logfile_fp)!=(size_t)length) {
errormsg(WHERE,ERR_READ,"log file",length);
- FREE((char *)buf);
+ free((char *)buf);
return;
}
now=time(NULL);
@@ -3226,13 +3226,13 @@ void sbbs_t::catsyslog(int crash)
,TM_YEAR(tm.tm_year));
if((file=nopen(str,O_WRONLY|O_APPEND|O_CREAT))==-1) {
errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_APPEND|O_CREAT);
- FREE((char *)buf);
+ free((char *)buf);
return;
}
if(lwrite(file,buf,length)!=length) {
close(file);
errormsg(WHERE,ERR_WRITE,str,length);
- FREE((char *)buf);
+ free((char *)buf);
return;
}
close(file);
@@ -3241,19 +3241,19 @@ void sbbs_t::catsyslog(int crash)
sprintf(str,"%scrash.log",i ? cfg.logs_dir : cfg.node_dir);
if((file=nopen(str,O_WRONLY|O_APPEND|O_CREAT))==-1) {
errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_APPEND|O_CREAT);
- FREE((char *)buf);
+ free((char *)buf);
return;
}
if(lwrite(file,buf,length)!=length) {
close(file);
errormsg(WHERE,ERR_WRITE,str,length);
- FREE((char *)buf);
+ free((char *)buf);
return;
}
close(file);
}
}
- FREE((char *)buf);
+ free((char *)buf);
}
fclose(logfile_fp);
@@ -3363,7 +3363,7 @@ void node_thread(void* arg)
sbbs->clearvars(&sbbs->main_csi);
sbbs->main_csi.length=filelength(file);
- if((sbbs->main_csi.cs=(uchar *)MALLOC(sbbs->main_csi.length))==NULL) {
+ if((sbbs->main_csi.cs=(uchar *)malloc(sbbs->main_csi.length))==NULL) {
close(file);
sbbs->errormsg(WHERE,ERR_ALLOC,str,sbbs->main_csi.length);
sbbs->hangup();
@@ -3374,7 +3374,7 @@ void node_thread(void* arg)
!=(int)sbbs->main_csi.length) {
sbbs->errormsg(WHERE,ERR_READ,str,sbbs->main_csi.length);
close(file);
- FREE(sbbs->main_csi.cs);
+ free(sbbs->main_csi.cs);
sbbs->main_csi.cs=NULL;
sbbs->hangup();
break;
diff --git a/src/sbbs3/msgtoqwk.cpp b/src/sbbs3/msgtoqwk.cpp
index 0b51541b8a..d20d98414e 100644
--- a/src/sbbs3/msgtoqwk.cpp
+++ b/src/sbbs3/msgtoqwk.cpp
@@ -47,7 +47,7 @@
ulong sbbs_t::msgtoqwk(smbmsg_t* msg, FILE *qwk_fp, long mode, int subnum
, int conf)
{
- char str[512],from[512],to[512],ch=0,tear=0,tearwatch=0,HUGE16 *buf,*p;
+ char str[512],from[512],to[512],ch=0,tear=0,tearwatch=0,*buf,*p;
char tmp[512];
long l,size=0,offset;
int i;
@@ -306,7 +306,7 @@ ulong sbbs_t::msgtoqwk(smbmsg_t* msg, FILE *qwk_fp, long mode, int subnum
fputc(ch,qwk_fp);
size++; }
- LFREE(buf);
+ free(buf);
if(ch!=QWK_NEWLINE) {
fputc(QWK_NEWLINE,qwk_fp); /* make sure it ends in CRLF */
size++; }
diff --git a/src/sbbs3/pack_qwk.cpp b/src/sbbs3/pack_qwk.cpp
index bd054f33b1..97feaf22b2 100644
--- a/src/sbbs3/pack_qwk.cpp
+++ b/src/sbbs3/pack_qwk.cpp
@@ -58,7 +58,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
time_t start;
node_t node;
mail_t *mail;
- post_t HUGE16 *post;
+ post_t *post;
glob_t g;
FILE *stream,*qwk,*personal,*ndx;
DIR* dir;
@@ -272,7 +272,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
fclose(personal);
smb_close(&smb);
errormsg(WHERE,ERR_OPEN,str,0);
- FREE(mail);
+ free(mail);
return(false);
}
}
@@ -326,7 +326,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
}
smb_close(&smb); /* Close the e-mail */
if(mailmsgs)
- FREE(mail);
+ free(mail);
}
/*********************/
@@ -394,7 +394,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
fclose(personal);
smb_close(&smb);
errormsg(WHERE,ERR_OPEN,str,0);
- LFREE(post);
+ free(post);
return(false);
}
}
@@ -471,7 +471,7 @@ bool sbbs_t::pack_qwk(char *packet, ulong *msgcnt, bool prepack)
remove(str);
}
smb_close(&smb);
- LFREE(post);
+ free(post);
if(l<posts)
break;
YIELD(); /* yield */
diff --git a/src/sbbs3/pack_rep.cpp b/src/sbbs3/pack_rep.cpp
index dd1a6625a0..065b41224b 100644
--- a/src/sbbs3/pack_rep.cpp
+++ b/src/sbbs3/pack_rep.cpp
@@ -51,7 +51,7 @@ bool sbbs_t::pack_rep(uint hubnum)
long l,msgcnt,submsgs,posts,packedmail,netfiles=0,deleted;
long mailmsgs;
ulong last,msgs;
- post_t HUGE16 *post;
+ post_t *post;
mail_t *mail;
FILE* rep;
DIR* dir;
@@ -126,7 +126,7 @@ bool sbbs_t::pack_rep(uint hubnum)
}
smb_close(&smb); /* Close the e-mail */
if(mailmsgs)
- FREE(mail);
+ free(mail);
for(i=0;i<cfg.qhub[hubnum]->subs;i++) {
j=cfg.qhub[hubnum]->sub[i]; /* j now equals the real sub num */
@@ -195,7 +195,7 @@ bool sbbs_t::pack_rep(uint hubnum)
YIELD(); /* yield */
}
eprintf(LOG_INFO,remove_ctrl_a(text[QWKPackedSubboard],tmp),submsgs,msgcnt);
- LFREE(post);
+ free(post);
smb_close(&smb);
YIELD(); /* yield */
}
@@ -256,14 +256,14 @@ bool sbbs_t::pack_rep(uint hubnum)
if((i=smb_locksmbhdr(&smb))!=0) { /* Lock the base, so nobody */
if(mailmsgs)
- FREE(mail);
+ free(mail);
smb_close(&smb);
errormsg(WHERE,ERR_LOCK,smb.file,i,smb.last_error); /* messes with the index */
return(true); }
if((i=smb_getstatus(&smb))!=0) {
if(mailmsgs)
- FREE(mail);
+ free(mail);
smb_close(&smb);
errormsg(WHERE,ERR_READ,smb.file,i,smb.last_error);
return(true); }
@@ -300,7 +300,7 @@ bool sbbs_t::pack_rep(uint hubnum)
delmail(0,MAIL_YOUR);
smb_close(&smb);
if(mailmsgs)
- FREE(mail);
+ free(mail);
eprintf(LOG_INFO,"Deleted %d sent NetMail messages",deleted);
}
diff --git a/src/sbbs3/prntfile.cpp b/src/sbbs3/prntfile.cpp
index 5b95624f2d..5a9a8aa12b 100644
--- a/src/sbbs3/prntfile.cpp
+++ b/src/sbbs3/prntfile.cpp
@@ -92,7 +92,7 @@ void sbbs_t::printfile(char *str, long mode)
errormsg(WHERE,ERR_CHK,str,length);
return;
}
- if((buf=(char*)MALLOC(length+1L))==NULL) {
+ if((buf=(char*)malloc(length+1L))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,length+1L);
return;
@@ -105,7 +105,7 @@ void sbbs_t::printfile(char *str, long mode)
buf[l]=0;
putmsg(buf,mode);
}
- FREE(buf);
+ free(buf);
if((mode&P_NOABORT || wip || rip || html) && online==ON_REMOTE) {
SYNC;
@@ -146,7 +146,7 @@ void sbbs_t::printtail(char *str, int lines, long mode)
errormsg(WHERE,ERR_CHK,str,length);
return;
}
- if((buf=(char*)MALLOC(length+1L))==NULL) {
+ if((buf=(char*)malloc(length+1L))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,length+1L);
return;
@@ -174,7 +174,7 @@ void sbbs_t::printtail(char *str, int lines, long mode)
SYNC;
rioctl(IOSM|ABORT);
}
- FREE(buf);
+ free(buf);
}
/****************************************************************************/
diff --git a/src/sbbs3/putmsg.cpp b/src/sbbs3/putmsg.cpp
index 25db97e992..70a2c84705 100644
--- a/src/sbbs3/putmsg.cpp
+++ b/src/sbbs3/putmsg.cpp
@@ -47,7 +47,7 @@
/* the attributes prior to diplaying the message are always restored. */
/* Ignores Ctrl-Z's */
/****************************************************************************/
-char sbbs_t::putmsg(char HUGE16 *str, long mode)
+char sbbs_t::putmsg(char *str, long mode)
{
char tmpatr,tmp2[256],tmp3[128];
uchar exatr=0;
diff --git a/src/sbbs3/qwk.cpp b/src/sbbs3/qwk.cpp
index 320ee2d7b8..6a50d4911e 100644
--- a/src/sbbs3/qwk.cpp
+++ b/src/sbbs3/qwk.cpp
@@ -198,16 +198,16 @@ void sbbs_t::update_qwkroute(char *via)
else
errormsg(WHERE,ERR_OPEN,str,O_WRONLY|O_CREAT|O_TRUNC);
for(i=0;i<total_nodes;i++) {
- FREE(qwk_node[i]);
- FREE(qwk_path[i]); }
+ free(qwk_node[i]);
+ free(qwk_path[i]); }
if(qwk_node) {
- FREE(qwk_node);
+ free(qwk_node);
qwk_node=NULL; }
if(qwk_path) {
- FREE(qwk_path);
+ free(qwk_path);
qwk_path=NULL; }
if(qwk_time) {
- FREE(qwk_time);
+ free(qwk_time);
qwk_time=NULL; }
total_nodes=0;
return; }
@@ -232,19 +232,19 @@ void sbbs_t::update_qwkroute(char *via)
if(i<total_nodes && qwk_time[i]>t)
continue;
if(i==total_nodes) {
- if((qwk_node=(char **)REALLOC(qwk_node,sizeof(char *)*(i+1)))==NULL) {
+ if((qwk_node=(char **)realloc(qwk_node,sizeof(char *)*(i+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,9*(i+1));
break; }
- if((qwk_path=(char **)REALLOC(qwk_path,sizeof(char *)*(i+1)))==NULL) {
+ if((qwk_path=(char **)realloc(qwk_path,sizeof(char *)*(i+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,sizeof(char*)*(i+1));
break; }
- if((qwk_time=(time_t *)REALLOC(qwk_time,sizeof(time_t)*(i+1)))==NULL) {
+ if((qwk_time=(time_t *)realloc(qwk_time,sizeof(time_t)*(i+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,sizeof(time_t)*(i+1));
break; }
- if((qwk_node[i]=(char *)MALLOC(9))==NULL) {
+ if((qwk_node[i]=(char *)malloc(9))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,9);
break; }
- if((qwk_path[i]=(char *)MALLOC(MAX_PATH+1))==NULL) {
+ if((qwk_path[i]=(char *)malloc(MAX_PATH+1))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,MAX_PATH+1);
break; }
total_nodes++; }
@@ -270,20 +270,20 @@ void sbbs_t::update_qwkroute(char *via)
if(!stricmp(qwk_node[i],node))
break;
if(i==total_nodes) { /* Not in list */
- if((qwk_node=(char **)REALLOC(qwk_node,sizeof(char *)*(total_nodes+1)))==NULL) {
+ if((qwk_node=(char **)realloc(qwk_node,sizeof(char *)*(total_nodes+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,9*(total_nodes+1));
break; }
- if((qwk_path=(char **)REALLOC(qwk_path,sizeof(char *)*(total_nodes+1)))==NULL) {
+ if((qwk_path=(char **)realloc(qwk_path,sizeof(char *)*(total_nodes+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,sizeof(char *)*(total_nodes+1));
break; }
- if((qwk_time=(time_t *)REALLOC(qwk_time,sizeof(time_t)*(total_nodes+1)))
+ if((qwk_time=(time_t *)realloc(qwk_time,sizeof(time_t)*(total_nodes+1)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,str,sizeof(time_t)*(total_nodes+1));
break; }
- if((qwk_node[total_nodes]=(char *)MALLOC(9))==NULL) {
+ if((qwk_node[total_nodes]=(char *)malloc(9))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,9);
break; }
- if((qwk_path[total_nodes]=(char *)MALLOC(MAX_PATH+1))==NULL) {
+ if((qwk_path[total_nodes]=(char *)malloc(MAX_PATH+1))==NULL) {
errormsg(WHERE,ERR_ALLOC,str,MAX_PATH+1);
break; }
total_nodes++; }
@@ -338,14 +338,14 @@ void sbbs_t::qwk_success(ulong msgcnt, char bi, char prepack)
if((i=smb_locksmbhdr(&smb))!=0) { /* Lock the base, so nobody */
if(msgs)
- FREE(mail);
+ free(mail);
smb_close(&smb);
errormsg(WHERE,ERR_LOCK,smb.file,i,smb.last_error); /* messes with the index */
return; }
if((i=smb_getstatus(&smb))!=0) {
if(msgs)
- FREE(mail);
+ free(mail);
smb_close(&smb);
errormsg(WHERE,ERR_READ,smb.file,i,smb.last_error);
return; }
@@ -380,7 +380,7 @@ void sbbs_t::qwk_success(ulong msgcnt, char bi, char prepack)
delmail(useron.number,MAIL_YOUR);
smb_close(&smb);
if(msgs)
- FREE(mail); }
+ free(mail); }
}
@@ -401,7 +401,7 @@ void sbbs_t::qwk_sec()
memset(&fd,0,sizeof(fd));
getusrdirs();
fd.dir=cfg.total_dirs;
- if((sav_ptr=(ulong *)MALLOC(sizeof(ulong)*cfg.total_subs))==NULL) {
+ if((sav_ptr=(ulong *)malloc(sizeof(ulong)*cfg.total_subs))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(ulong)*cfg.total_subs);
return; }
for(i=0;i<cfg.total_subs;i++)
@@ -767,7 +767,7 @@ void sbbs_t::qwk_sec()
//autohangup();
} }
delfiles(cfg.temp_dir,ALLFILES);
- FREE(sav_ptr);
+ free(sav_ptr);
}
void sbbs_t::qwksetptr(uint subnum, char *buf, int reset)
diff --git a/src/sbbs3/qwknodes.c b/src/sbbs3/qwknodes.c
index 2f024390ed..cabec0a1ef 100644
--- a/src/sbbs3/qwknodes.c
+++ b/src/sbbs3/qwknodes.c
@@ -110,7 +110,7 @@ char *loadmsgtail(smbmsg_t msg)
if(xlat!=XLAT_NONE) /* no translations supported */
continue;
length=msg.dfield[i].length-2;
- if((buf=REALLOC(buf,l+msg.dfield[i].length+1))==NULL)
+ if((buf=realloc(buf,l+msg.dfield[i].length+1))==NULL)
return(buf);
l+=fread(buf+l,1,length,smb.sdt_fp);
buf[l]=0;
@@ -138,7 +138,7 @@ void gettag(smbmsg_t msg, char *tag)
p+=16;
while(*p && *p<=' ') p++;
strcpy(tag,p);
- FREE(buf);
+ free(buf);
}
@@ -333,7 +333,7 @@ int main(int argc, char **argv)
break;
if(l==total_crcs) {
total_crcs++;
- if((crc=(ulong *)REALLOC(crc
+ if((crc=(ulong *)realloc(crc
,sizeof(ulong)*total_crcs))==NULL) {
printf("Error allocating %lu bytes\n"
,sizeof(ulong)*total_crcs);
diff --git a/src/sbbs3/qwktomsg.cpp b/src/sbbs3/qwktomsg.cpp
index 68294ca86e..c0978dae5c 100644
--- a/src/sbbs3/qwktomsg.cpp
+++ b/src/sbbs3/qwktomsg.cpp
@@ -149,17 +149,17 @@ bool sbbs_t::qwktomsg(FILE *qwk_fp, char *hdrblk, char fromhub, uint subnum
}
bodylen=0;
- if((body=(char *)LMALLOC((blocks-1L)*QWK_BLOCK_LEN*2L))==NULL) {
- LFREE(header);
+ if((body=(char *)malloc((blocks-1L)*QWK_BLOCK_LEN*2L))==NULL) {
+ free(header);
smb_freemsgmem(&msg);
errormsg(WHERE,ERR_ALLOC,"QWK msg body",(blocks-1L)*QWK_BLOCK_LEN*2L);
return(false);
}
taillen=0;
- if((tail=(char *)LMALLOC((blocks-1L)*QWK_BLOCK_LEN*2L))==NULL) {
- LFREE(header);
- LFREE(body);
+ if((tail=(char *)malloc((blocks-1L)*QWK_BLOCK_LEN*2L))==NULL) {
+ free(header);
+ free(body);
smb_freemsgmem(&msg);
errormsg(WHERE,ERR_ALLOC,"QWK msg tail",(blocks-1L)*QWK_BLOCK_LEN*2L);
return(false);
@@ -380,8 +380,8 @@ bool sbbs_t::qwktomsg(FILE *qwk_fp, char *hdrblk, char fromhub, uint subnum
smb_freemsgmem(&msg);
- LFREE(body);
- LFREE(tail);
+ free(body);
+ free(tail);
return(success);
}
diff --git a/src/sbbs3/readmail.cpp b/src/sbbs3/readmail.cpp
index d021e4a62b..fb14378a0b 100644
--- a/src/sbbs3/readmail.cpp
+++ b/src/sbbs3/readmail.cpp
@@ -131,7 +131,7 @@ void sbbs_t::readmail(uint usernumber, int which)
if((long)(smb.curmsg=getnum(smb.msgs))>0)
smb.curmsg--;
else if((long)smb.curmsg==-1) {
- FREE(mail);
+ free(mail);
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
return; } }
@@ -179,7 +179,7 @@ void sbbs_t::readmail(uint usernumber, int which)
if(smb.status.last_msg!=last) { /* New messages */
last=smb.status.last_msg;
- FREE(mail);
+ free(mail);
mail=loadmail(&smb,&smb.msgs,usernumber,which,lm_mode); /* So re-load */
if(!smb.msgs)
break;
@@ -194,7 +194,7 @@ void sbbs_t::readmail(uint usernumber, int which)
if(mismatches>5) { /* We can't do this too many times in a row */
errormsg(WHERE,ERR_CHK,"message number",mail[smb.curmsg].number);
break; }
- FREE(mail);
+ free(mail);
mail=loadmail(&smb,&smb.msgs,usernumber,which,lm_mode);
if(!smb.msgs)
break;
@@ -688,7 +688,7 @@ void sbbs_t::readmail(uint usernumber, int which)
smb_freemsgmem(&msg);
if(smb.msgs)
- FREE(mail);
+ free(mail);
/***************************************/
/* Delete messages marked for deletion */
diff --git a/src/sbbs3/readmsgs.cpp b/src/sbbs3/readmsgs.cpp
index a1cc7730cf..668c221e7c 100644
--- a/src/sbbs3/readmsgs.cpp
+++ b/src/sbbs3/readmsgs.cpp
@@ -43,7 +43,7 @@ int sbbs_t::sub_op(uint subnum)
}
-void sbbs_t::listmsgs(int subnum, post_t HUGE16 *post, long i, long posts)
+void sbbs_t::listmsgs(int subnum, post_t *post, long i, long posts)
{
char ch;
smbmsg_t msg;
@@ -161,7 +161,7 @@ void sbbs_t::msghdr(smbmsg_t* msg)
/****************************************************************************/
/****************************************************************************/
-post_t HUGE16 * sbbs_t::loadposts(long *posts, uint subnum, ulong ptr, long mode)
+post_t * sbbs_t::loadposts(long *posts, uint subnum, ulong ptr, long mode)
{
char name[128];
ushort aliascrc,namecrc,sysop;
@@ -169,7 +169,7 @@ post_t HUGE16 * sbbs_t::loadposts(long *posts, uint subnum, ulong ptr, long mode
ulong l=0,total,alloc_len;
smbmsg_t msg;
idxrec_t idx;
- post_t HUGE16 *post;
+ post_t *post;
if(posts==NULL)
return(NULL);
@@ -203,7 +203,7 @@ post_t HUGE16 * sbbs_t::loadposts(long *posts, uint subnum, ulong ptr, long mode
while(alloc_len%4096)
alloc_len++;
#endif
- if((post=(post_t HUGE16 *)LMALLOC(alloc_len))==NULL) { /* alloc for max */
+ if((post=(post_t *)malloc(alloc_len))==NULL) { /* alloc for max */
smb_unlocksmbhdr(&smb);
errormsg(WHERE,ERR_ALLOC,smb.file,sizeof(post_t *)*cfg.sub[subnum]->maxmsgs);
return(NULL);
@@ -333,7 +333,7 @@ static int get_start_msg(sbbs_t* sbbs, smb_t* smb)
int sbbs_t::scanposts(uint subnum, long mode, char *find)
{
char str[256],str2[256],do_find=true,mismatches=0
- ,done=0,domsg=1,HUGE16 *buf,*p;
+ ,done=0,domsg=1,*buf,*p;
char find_buf[128];
char tmp[128];
int i;
@@ -341,7 +341,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
uint lp=0;
long org_mode=mode;
ulong msgs,last,l;
- post_t HUGE16 *post;
+ post_t *post;
smbmsg_t msg;
cursubnum=subnum; /* for ARS */
@@ -403,7 +403,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
if(smb.curmsg==smb.msgs) { /* no new messages */
if(!(mode&SCAN_BACK)) {
if(post)
- LFREE(post);
+ free(post);
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
return(0);
@@ -512,7 +512,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
if(smb.status.last_msg!=last) { /* New messages */
last=smb.status.last_msg;
if(post) {
- LFREE((void *)post);
+ free((void *)post);
}
post=loadposts(&smb.msgs,subnum,0,lp); /* So re-load */
if(!smb.msgs)
@@ -535,7 +535,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
break;
}
if(post)
- LFREE(post);
+ free(post);
post=loadposts(&smb.msgs,subnum,0,lp);
if(!smb.msgs)
break;
@@ -563,7 +563,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
}
strupr((char *)buf);
if(!strstr((char *)buf,find) && !strstr(msg.subj,find)) {
- FREE(buf);
+ free(buf);
if(smb.curmsg<smb.msgs-1)
smb.curmsg++;
else if(org_mode&SCAN_FIND)
@@ -572,7 +572,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
domsg=0;
continue;
}
- FREE(buf);
+ free(buf);
}
if(mode&SCAN_CONST)
@@ -640,7 +640,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
if(msg.total_hfields)
smb_freemsgmem(&msg);
if(post)
- LFREE(post);
+ free(post);
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
return(1);
@@ -674,7 +674,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
if(msg.total_hfields)
smb_freemsgmem(&msg);
if(post)
- LFREE(post);
+ free(post);
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
return(0);
@@ -852,7 +852,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
if(msg.total_hfields)
smb_freemsgmem(&msg);
if(post)
- LFREE(post);
+ free(post);
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
return(1);
@@ -1079,7 +1079,7 @@ int sbbs_t::scanposts(uint subnum, long mode, char *find)
if(msg.total_hfields)
smb_freemsgmem(&msg);
if(post)
- LFREE(post);
+ free(post);
if(!(org_mode&(SCAN_CONST|SCAN_TOYOU|SCAN_FIND)) && !(cfg.sub[subnum]->misc&SUB_PONLY)
&& reads && chk_ar(cfg.sub[subnum]->post_ar,&useron)
&& !(useron.rest&FLAG('P'))) {
@@ -1103,7 +1103,7 @@ int sbbs_t::searchsub(uint subnum, char *search)
int i,found;
long posts;
ulong total;
- post_t HUGE16 *post;
+ post_t *post;
if((i=smb_stack(&smb,SMB_STACK_PUSH))!=0) {
errormsg(WHERE,ERR_OPEN,cfg.sub[subnum]->code,i);
@@ -1123,7 +1123,7 @@ int sbbs_t::searchsub(uint subnum, char *search)
,cfg.grp[cfg.sub[subnum]->grp]->sname,cfg.sub[subnum]->lname,posts,total);
found=searchposts(subnum,post,0,posts,search);
if(posts)
- LFREE(post);
+ free(post);
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
return(found);
@@ -1135,10 +1135,10 @@ int sbbs_t::searchsub(uint subnum, char *search)
/* title). 'msgs' is the total number of valid messages. */
/* Returns number of messages found. */
/****************************************************************************/
-int sbbs_t::searchposts(uint subnum, post_t HUGE16 *post, long start, long posts
+int sbbs_t::searchposts(uint subnum, post_t *post, long start, long posts
, char *search)
{
- char HUGE16 *buf,ch;
+ char *buf,ch;
long l,found=0;
smbmsg_t msg;
@@ -1174,7 +1174,7 @@ int sbbs_t::searchposts(uint subnum, post_t HUGE16 *post, long start, long posts
,msg.subj);
found++;
}
- FREE(buf);
+ free(buf);
smb_freemsgmem(&msg);
}
@@ -1185,7 +1185,7 @@ int sbbs_t::searchposts(uint subnum, post_t HUGE16 *post, long start, long posts
/* Will search the messages pointed to by 'msg' for message to the user on */
/* Returns number of messages found. */
/****************************************************************************/
-void sbbs_t::showposts_toyou(post_t HUGE16 *post, ulong start, long posts)
+void sbbs_t::showposts_toyou(post_t *post, ulong start, long posts)
{
char str[128];
ushort namecrc,aliascrc,sysop;
@@ -1241,7 +1241,7 @@ int sbbs_t::searchsub_toyou(uint subnum)
int i;
long posts;
ulong total;
- post_t HUGE16 *post;
+ post_t *post;
if((i=smb_stack(&smb,SMB_STACK_PUSH))!=0) {
errormsg(WHERE,ERR_OPEN,cfg.sub[subnum]->code,i);
@@ -1261,12 +1261,12 @@ int sbbs_t::searchsub_toyou(uint subnum)
,cfg.grp[cfg.sub[subnum]->grp]->sname,cfg.sub[subnum]->lname,total);
if(posts) {
if(post)
- LFREE(post);
+ free(post);
post=loadposts(&posts,subnum,0,LP_BYSELF|LP_OTHERS);
showposts_toyou(post,0,posts);
}
if(post)
- LFREE(post);
+ free(post);
smb_close(&smb);
smb_stack(&smb,SMB_STACK_POP);
return(posts);
diff --git a/src/sbbs3/rechocfg.c b/src/sbbs3/rechocfg.c
index 7e897c977e..31fc95ea41 100644
--- a/src/sbbs3/rechocfg.c
+++ b/src/sbbs3/rechocfg.c
@@ -223,7 +223,7 @@ void read_echo_cfg()
while(*p && *p<=' ') p++; /* Skip white space */
if(!stricmp(tmp,"PACKER")) { /* Archive Definition */
- if((cfg.arcdef=(arcdef_t *)REALLOC(cfg.arcdef
+ if((cfg.arcdef=(arcdef_t *)realloc(cfg.arcdef
,sizeof(arcdef_t)*(cfg.arcdefs+1)))==NULL) {
printf("\nError allocating %u bytes of memory for arcdef #%u.\n"
,sizeof(arcdef_t)*(cfg.arcdefs+1),cfg.arcdefs+1);
@@ -384,7 +384,7 @@ void read_echo_cfg()
j=matchnode(addr,1);
if(j==cfg.nodecfgs) {
cfg.nodecfgs++;
- if((cfg.nodecfg=(nodecfg_t *)REALLOC(cfg.nodecfg
+ if((cfg.nodecfg=(nodecfg_t *)realloc(cfg.nodecfg
,sizeof(nodecfg_t)*(j+1)))==NULL) {
printf("\nError allocating memory for nodecfg #%u.\n"
,j+1);
@@ -402,7 +402,7 @@ void read_echo_cfg()
j=matchnode(addr,1);
if(j==cfg.nodecfgs) {
cfg.nodecfgs++;
- if((cfg.nodecfg=(nodecfg_t *)REALLOC(cfg.nodecfg
+ if((cfg.nodecfg=(nodecfg_t *)realloc(cfg.nodecfg
,sizeof(nodecfg_t)*(j+1)))==NULL) {
printf("\nError allocating memory for nodecfg #%u.\n"
,j+1);
@@ -428,7 +428,7 @@ void read_echo_cfg()
j=matchnode(addr,1);
if(j==cfg.nodecfgs) {
cfg.nodecfgs++;
- if((cfg.nodecfg=(nodecfg_t *)REALLOC(cfg.nodecfg
+ if((cfg.nodecfg=(nodecfg_t *)realloc(cfg.nodecfg
,sizeof(nodecfg_t)*(j+1)))==NULL) {
printf("\nError allocating memory for nodecfg #%u.\n"
,j+1);
@@ -452,7 +452,7 @@ void read_echo_cfg()
j=matchnode(addr,1);
if(j==cfg.nodecfgs) {
cfg.nodecfgs++;
- if((cfg.nodecfg=(nodecfg_t *)REALLOC(cfg.nodecfg
+ if((cfg.nodecfg=(nodecfg_t *)realloc(cfg.nodecfg
,sizeof(nodecfg_t)*(j+1)))==NULL) {
printf("\nError allocating memory for nodecfg #%u.\n"
,j+1);
@@ -482,7 +482,7 @@ void read_echo_cfg()
j=matchnode(addr,1);
if(j==cfg.nodecfgs) {
cfg.nodecfgs++;
- if((cfg.nodecfg=(nodecfg_t *)REALLOC(cfg.nodecfg
+ if((cfg.nodecfg=(nodecfg_t *)realloc(cfg.nodecfg
,sizeof(nodecfg_t)*(j+1)))==NULL) {
printf("\nError allocating memory for nodecfg #%u.\n"
,j+1);
@@ -505,7 +505,7 @@ void read_echo_cfg()
j=matchnode(addr,1);
if(j==cfg.nodecfgs) {
cfg.nodecfgs++;
- if((cfg.nodecfg=(nodecfg_t *)REALLOC(cfg.nodecfg
+ if((cfg.nodecfg=(nodecfg_t *)realloc(cfg.nodecfg
,sizeof(nodecfg_t)*(j+1)))==NULL) {
printf("\nError allocating memory for nodecfg #%u.\n"
,j+1);
@@ -521,7 +521,7 @@ void read_echo_cfg()
i=matchnode(addr,1);
if(i==cfg.nodecfgs) {
cfg.nodecfgs++;
- if((cfg.nodecfg=(nodecfg_t *)REALLOC(cfg.nodecfg
+ if((cfg.nodecfg=(nodecfg_t *)realloc(cfg.nodecfg
,sizeof(nodecfg_t)*(i+1)))==NULL) {
printf("\nError allocating memory for nodecfg #%u.\n"
,i+1);
@@ -550,7 +550,7 @@ void read_echo_cfg()
break;
if(j==cfg.nodecfg[i].numflags) {
if((cfg.nodecfg[i].flag=
- (flag_t *)REALLOC(cfg.nodecfg[i].flag
+ (flag_t *)realloc(cfg.nodecfg[i].flag
,sizeof(flag_t)*(j+1)))==NULL) {
printf("\nError allocating memory for nodecfg #%u "
"flag #%u.\n",cfg.nodecfgs,j+1);
@@ -560,7 +560,7 @@ void read_echo_cfg()
while(*p && *p<=' ') p++; } }
if(!stricmp(tmp,"ECHOLIST")) { /* Echolists go here */
- if((cfg.listcfg=(echolist_t *)REALLOC(cfg.listcfg
+ if((cfg.listcfg=(echolist_t *)realloc(cfg.listcfg
,sizeof(echolist_t)*(cfg.listcfgs+1)))==NULL) {
printf("\nError allocating memory for echolist cfg #%u.\n"
,cfg.listcfgs+1);
@@ -608,7 +608,7 @@ void read_echo_cfg()
break;
if(j==cfg.listcfg[cfg.listcfgs-1].numflags) {
if((cfg.listcfg[cfg.listcfgs-1].flag=
- (flag_t *)REALLOC(cfg.listcfg[cfg.listcfgs-1].flag
+ (flag_t *)realloc(cfg.listcfg[cfg.listcfgs-1].flag
,sizeof(flag_t)*(j+1)))==NULL) {
printf("\nError allocating memory for listcfg #%u "
"flag #%u.\n",cfg.listcfgs,j+1);
diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index b3bf846c5c..2c8d127c77 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -435,7 +435,7 @@ public:
void automsg(void);
bool writemsg(char *str, char *top, char *title, long mode, int subnum
,char *dest);
- char putmsg(char HUGE16 *str, long mode);
+ char putmsg(char *str, long mode);
bool msgabort(void);
bool email(int usernumber, char *top, char *title, long mode);
void forwardmail(smbmsg_t* msg, int usernum);
@@ -618,11 +618,11 @@ public:
bool addtobatdl(file_t* f);
/* listfile.cpp */
- bool listfile(char *fname, char HUGE16 *buf, uint dirnum
+ bool listfile(char *fname, char *buf, uint dirnum
,char *search, char letter, ulong datoffset);
int listfiles(uint dirnum, char *filespec, int tofile, long mode);
int listfileinfo(uint dirnum, char *filespec, long mode);
- void listfiletofile(char *fname, char HUGE16 *buf, uint dirnum, int file);
+ void listfiletofile(char *fname, char *buf, uint dirnum, int file);
int batchflagprompt(uint dirnum, file_t bf[], uint total, long totalfiles);
/* bat_xfer.cpp */
diff --git a/src/sbbs3/sbbsecho.c b/src/sbbs3/sbbsecho.c
index b32c8f4027..b4967f826e 100644
--- a/src/sbbs3/sbbsecho.c
+++ b/src/sbbs3/sbbsecho.c
@@ -528,7 +528,7 @@ void file_to_netmail(FILE *infile,char *title,faddr_t addr,char *to)
if(len>8192L)
len=8192L;
rewind(infile);
- if((buf=(char *)MALLOC(len+1))==NULL) {
+ if((buf=(char *)malloc(len+1))==NULL) {
printf("ERROR allocating %lu bytes for file to netmail buffer.\n",len);
logprintf("ERROR line %d allocating %lu for file to netmail buf",__LINE__
,len);
@@ -548,7 +548,7 @@ void file_to_netmail(FILE *infile,char *title,faddr_t addr,char *to)
strcat(buf,"\r\nContinued in next message...\r\n");
create_netmail(to,title,buf,addr,FALSE);
}
- FREE(buf);
+ free(buf);
}
/******************************************************************************
This function sends a notify list to applicable nodes, this list includes the
@@ -842,7 +842,7 @@ void alter_areas(area_t* add_area,area_t* del_area,faddr_t addr)
FREE_AND_NULL(cfg.area[i].uplink);
} else
if((cfg.area[i].uplink=(faddr_t *)
- REALLOC(cfg.area[i].uplink,sizeof(faddr_t)
+ realloc(cfg.area[i].uplink,sizeof(faddr_t)
*(cfg.area[i].uplinks)))==NULL) {
printf("ERROR allocating memory for area #%u "
"uplinks.\n",i+1);
@@ -894,7 +894,7 @@ void alter_areas(area_t* add_area,area_t* del_area,faddr_t addr)
++cfg.area[i].uplinks;
if((cfg.area[i].uplink=(faddr_t *)
- REALLOC(cfg.area[i].uplink,sizeof(faddr_t)
+ realloc(cfg.area[i].uplink,sizeof(faddr_t)
*(cfg.area[i].uplinks)))==NULL) {
printf("ERROR allocating memory for area #%u "
"uplinks.\n",i+1);
@@ -1271,7 +1271,7 @@ void command(char *instr,faddr_t addr)
if((p=strstr(instr,"FROM"))!=NULL);
if((p=strstr(instr,"+ALL"))!=NULL) {
- if((add_area.tag=(char **)REALLOC(add_area.tag
+ if((add_area.tag=(char **)realloc(add_area.tag
,sizeof(char *)*add_area.tags+1))==NULL) {
printf("ERROR allocating memory for add area tag #%u.\n"
,add_area.tags+1);
@@ -1294,7 +1294,7 @@ void command(char *instr,faddr_t addr)
}
if((p=strstr(instr,"-ALL"))!=NULL) {
- if((del_area.tag=(char **)REALLOC(del_area.tag
+ if((del_area.tag=(char **)realloc(del_area.tag
,sizeof(char *)*del_area.tags+1))==NULL) {
printf("ERROR allocating memory for del area tag #%u.\n"
,del_area.tags+1);
@@ -1390,7 +1390,7 @@ char *process_areafix(faddr_t addr,char* inbuf,char *password)
truncstr(str,"\r\n");
switch(action) {
case '+': /* Add Area */
- if((add_area.tag=(char **)REALLOC(add_area.tag
+ if((add_area.tag=(char **)realloc(add_area.tag
,sizeof(char *)*add_area.tags+1))==NULL) {
printf("ERROR allocating memory for add area tag #%u.\n"
,add_area.tags+1);
@@ -1408,7 +1408,7 @@ char *process_areafix(faddr_t addr,char* inbuf,char *password)
add_area.tags++;
break;
case '-': /* Remove Area */
- if((del_area.tag=(char **)REALLOC(del_area.tag
+ if((del_area.tag=(char **)realloc(del_area.tag
,sizeof(char *)*del_area.tags+1))==NULL) {
printf("ERROR allocating memory for del area tag #%u.\n"
,del_area.tags+1);
@@ -1607,7 +1607,7 @@ int attachment(char *bundlename,faddr_t dest, int mode)
continue;
num_mfncrc++;
p=getfname(hdr.subj);
- if((mfncrc=(long *)REALLOC(mfncrc,num_mfncrc*sizeof(long)))==NULL) {
+ if((mfncrc=(long *)realloc(mfncrc,num_mfncrc*sizeof(long)))==NULL) {
printf("ERROR allocating %lu bytes for bundle name crc.\n"
,num_mfncrc*sizeof(long));
logprintf("ERROR line %d allocating %lu for bundle name crc"
@@ -1638,7 +1638,7 @@ int attachment(char *bundlename,faddr_t dest, int mode)
if(!error) /* remove bundles.sbe if no error occurred */
remove(fname); /* used to truncate here, August-20-2002 */
if(num_mfncrc)
- FREE(mfncrc);
+ free(mfncrc);
return(0);
}
@@ -2068,7 +2068,7 @@ ulong matchname(char *inname)
last_user=filelength(userdat)/U_LEN;
for(total_users=0;total_users<last_user;total_users++) {
printf("%5ld\b\b\b\b\b",total_users);
- if((username=(username_t *)REALLOC(username
+ if((username=(username_t *)realloc(username
,(total_users+1L)*sizeof(username_t)))==NULL)
break;
username[total_users].alias=0;
@@ -2861,7 +2861,7 @@ void gen_psb(addrlist_t *seenbys,addrlist_t *paths,char *inbuf
if(!fbuf)
fbuf=inbuf;
if(seenbys->addr) {
- FREE(seenbys->addr);
+ free(seenbys->addr);
seenbys->addr=0;
seenbys->addrs=0; }
addr.zone=addr.net=addr.node=addr.point=seenbys->addrs=0;
@@ -2895,7 +2895,7 @@ void gen_psb(addrlist_t *seenbys,addrlist_t *paths,char *inbuf
addr.point=atoi(p2+1);
if(!addr.zone)
addr.zone=zone; /* Was 1 */
- if((seenbys->addr=(faddr_t *)REALLOC(seenbys->addr
+ if((seenbys->addr=(faddr_t *)realloc(seenbys->addr
,sizeof(faddr_t)*(seenbys->addrs+1)))==NULL) {
printf("ERROR allocating memory for seenbys\n");
logprintf("ERROR line %d allocating memory for message "
@@ -2911,7 +2911,7 @@ void gen_psb(addrlist_t *seenbys,addrlist_t *paths,char *inbuf
break;
p=p1; } }
else {
- if((seenbys->addr=(faddr_t *)REALLOC(seenbys->addr
+ if((seenbys->addr=(faddr_t *)realloc(seenbys->addr
,sizeof(faddr_t)))==NULL) {
printf("ERROR allocating memory for seenbys\n");
logprintf("ERROR line %d allocating memory for message seenbys."
@@ -2920,7 +2920,7 @@ void gen_psb(addrlist_t *seenbys,addrlist_t *paths,char *inbuf
memset(&seenbys->addr[0],0,sizeof(faddr_t)); }
if(paths->addr) {
- FREE(paths->addr);
+ free(paths->addr);
paths->addr=0;
paths->addrs=0; }
addr.zone=addr.net=addr.node=addr.point=paths->addrs=0;
@@ -2952,7 +2952,7 @@ void gen_psb(addrlist_t *seenbys,addrlist_t *paths,char *inbuf
addr.point=atoi(p2+1);
if(!addr.zone)
addr.zone=zone; /* Was 1 */
- if((paths->addr=(faddr_t *)REALLOC(paths->addr
+ if((paths->addr=(faddr_t *)realloc(paths->addr
,sizeof(faddr_t)*(paths->addrs+1)))==NULL) {
printf("ERROR allocating memory for paths\n");
logprintf("ERROR line %d allocating memory for message "
@@ -2965,7 +2965,7 @@ void gen_psb(addrlist_t *seenbys,addrlist_t *paths,char *inbuf
break;
p=p1; } }
else {
- if((paths->addr=(faddr_t *)REALLOC(paths->addr
+ if((paths->addr=(faddr_t *)realloc(paths->addr
,sizeof(faddr_t)))==NULL) {
printf("ERROR allocating memory for paths\n");
logprintf("ERROR line %d allocating memory for message paths."
@@ -3310,7 +3310,7 @@ int pkt_to_msg(FILE* fidomsg, fmsghdr_t* hdr, char* info)
printf("%s", path);
logprintf("%s Exported to %s",info,path);
}
- FREE(fmsgbuf);
+ free(fmsgbuf);
return(0);
}
@@ -3439,7 +3439,7 @@ int import_netmail(char *path,fmsghdr_t hdr, FILE *fidomsg)
putsmsg(&scfg,cfg.notify,str);
}
if(fmsgbuf)
- FREE(fmsgbuf);
+ free(fmsgbuf);
if(cfg.log&LOG_AREAFIX)
logprintf(info);
return(-2);
@@ -3492,7 +3492,7 @@ int import_netmail(char *path,fmsghdr_t hdr, FILE *fidomsg)
}
if(i) {
if(fmsgbuf)
- FREE(fmsgbuf);
+ free(fmsgbuf);
return(0);
}
@@ -3527,7 +3527,7 @@ int import_netmail(char *path,fmsghdr_t hdr, FILE *fidomsg)
netmail++;
if(fmsgbuf)
- FREE(fmsgbuf);
+ free(fmsgbuf);
/***************************/
/* Updating message header */
@@ -3720,7 +3720,7 @@ void export_echomail(char *sub_code,faddr_t addr)
continue;
}
fmsgbuflen=strlen((char *)buf)+4096; /* over alloc for kludge lines */
- fmsgbuf=MALLOC(fmsgbuflen);
+ fmsgbuf=malloc(fmsgbuflen);
if(!fmsgbuf) {
printf("ERROR allocating %lu bytes for fmsgbuf\n",fmsgbuflen);
logprintf("ERROR line %d allocating %lu bytes for fmsgbuf"
@@ -3953,11 +3953,11 @@ int main(int argc, char **argv)
"s: import private echomail override (strip private status)\n"
"!: notify users of received echomail @: prompt for key upon exiting (debug)\n";
- if((email=(smb_t *)MALLOC(sizeof(smb_t)))==NULL) {
+ if((email=(smb_t *)malloc(sizeof(smb_t)))==NULL) {
printf("ERROR allocating memory for email.\n");
bail(1); }
memset(email,0,sizeof(smb_t));
- if((smb=(smb_t *)MALLOC(MAX_OPEN_SMBS*sizeof(smb_t)))==NULL) {
+ if((smb=(smb_t *)malloc(MAX_OPEN_SMBS*sizeof(smb_t)))==NULL) {
printf("ERROR allocating memory for smbs.\n");
bail(1); }
for(i=0;i<MAX_OPEN_SMBS;i++)
@@ -4149,7 +4149,7 @@ int main(int argc, char **argv)
SKIP_WHITESPACE(p); /* Find first printable char */
if(*p==';' || !*p) /* Ignore blank lines or start with ; */
continue;
- if((cfg.area=(areasbbs_t *)REALLOC(cfg.area,sizeof(areasbbs_t)*
+ if((cfg.area=(areasbbs_t *)realloc(cfg.area,sizeof(areasbbs_t)*
(cfg.areas+1)))==NULL) {
printf("ERROR allocating memory for area #%u.\n",cfg.areas+1);
bail(1); }
@@ -4177,7 +4177,7 @@ int main(int argc, char **argv)
strupr(tmp);
if(tmp[0]=='*') /* UNKNOWN-ECHO area */
cfg.badecho=cfg.areas;
- if((cfg.area[cfg.areas].name=(char *)MALLOC(strlen(tmp)+1))==NULL) {
+ if((cfg.area[cfg.areas].name=(char *)malloc(strlen(tmp)+1))==NULL) {
printf("ERROR allocating memory for area #%u tag name.\n"
,cfg.areas+1);
bail(1); }
@@ -4190,7 +4190,7 @@ int main(int argc, char **argv)
while(*p && *p!=';') {
if((cfg.area[cfg.areas].uplink=(faddr_t *)
- REALLOC(cfg.area[cfg.areas].uplink
+ realloc(cfg.area[cfg.areas].uplink
,sizeof(faddr_t)*(cfg.area[cfg.areas].uplinks+1)))==NULL) {
printf("ERROR allocating memory for area #%u uplinks.\n"
,cfg.areas+1);
@@ -4413,7 +4413,7 @@ int main(int argc, char **argv)
start_tick=msclock();
if(fmsgbuf) {
- FREE(fmsgbuf);
+ free(fmsgbuf);
fmsgbuf=0;
}
@@ -4769,7 +4769,7 @@ int main(int argc, char **argv)
printf("(%.1f/min) ",(float)echomail/(import_time/60.0));
printf("(%.1f/sec)\n",(float)echomail/import_time); }
if(fmsgbuf) {
- FREE(fmsgbuf);
+ free(fmsgbuf);
fmsgbuf=0; }
}
@@ -4995,7 +4995,7 @@ int main(int argc, char **argv)
putfmsg(stream,fmsgbuf,hdr,fakearea,msg_seen,msg_path);
- FREE(fmsgbuf);
+ free(fmsgbuf);
fclose(stream);
/**************************************/
/* Delete source netmail if specified */
@@ -5063,8 +5063,8 @@ int main(int argc, char **argv)
if(email->shd_fp)
smb_close(email);
- FREE(smb);
- FREE(email);
+ free(smb);
+ free(email);
bail(0);
return(0);
diff --git a/src/sbbs3/scfg/scfg.c b/src/sbbs3/scfg/scfg.c
index 0c4eb14437..88cb558cee 100644
--- a/src/sbbs3/scfg/scfg.c
+++ b/src/sbbs3/scfg/scfg.c
@@ -239,16 +239,16 @@ if(i!=0) {
exit(1);
}
-if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
-if((mopt=(char **)MALLOC(sizeof(char *)*14))==NULL)
+if((mopt=(char **)malloc(sizeof(char *)*14))==NULL)
allocfail(sizeof(char *)*14);
for(i=0;i<14;i++)
- if((mopt[i]=(char *)MALLOC(64))==NULL)
+ if((mopt[i]=(char *)malloc(64))==NULL)
allocfail(64);
if((p=getenv("SBBSEXEC"))!=NULL)
@@ -686,7 +686,7 @@ abreviation of the name.
uifc.msg("Invalid Code");
uifc.helpbuf=0;
continue; }
- if((cfg.txtsec=(txtsec_t **)REALLOC(cfg.txtsec
+ if((cfg.txtsec=(txtsec_t **)realloc(cfg.txtsec
,sizeof(txtsec_t *)*(cfg.total_txtsecs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_txtsecs+1);
cfg.total_txtsecs=0;
@@ -695,7 +695,7 @@ abreviation of the name.
if(cfg.total_txtsecs)
for(j=cfg.total_txtsecs;j>i;j--)
cfg.txtsec[j]=cfg.txtsec[j-1];
- if((cfg.txtsec[i]=(txtsec_t *)MALLOC(sizeof(txtsec_t)))==NULL) {
+ if((cfg.txtsec[i]=(txtsec_t *)malloc(sizeof(txtsec_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(txtsec_t));
continue; }
memset((txtsec_t *)cfg.txtsec[i],0,sizeof(txtsec_t));
@@ -706,7 +706,7 @@ abreviation of the name.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.txtsec[i]);
+ free(cfg.txtsec[i]);
cfg.total_txtsecs--;
for(j=i;j<cfg.total_txtsecs;j++)
cfg.txtsec[j]=cfg.txtsec[j+1];
@@ -856,7 +856,7 @@ indicate a Baja shell file named MYBBS.BIN in your EXEC directory.
uifc.msg("Invalid Code");
uifc.helpbuf=0;
continue; }
- if((cfg.shell=(shell_t **)REALLOC(cfg.shell
+ if((cfg.shell=(shell_t **)realloc(cfg.shell
,sizeof(shell_t *)*(cfg.total_shells+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_shells+1);
cfg.total_shells=0;
@@ -865,7 +865,7 @@ indicate a Baja shell file named MYBBS.BIN in your EXEC directory.
if(cfg.total_shells)
for(j=cfg.total_shells;j>i;j--)
cfg.shell[j]=cfg.shell[j-1];
- if((cfg.shell[i]=(shell_t *)MALLOC(sizeof(shell_t)))==NULL) {
+ if((cfg.shell[i]=(shell_t *)malloc(sizeof(shell_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(shell_t));
continue; }
memset((shell_t *)cfg.shell[i],0,sizeof(shell_t));
@@ -876,7 +876,7 @@ indicate a Baja shell file named MYBBS.BIN in your EXEC directory.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.shell[i]);
+ free(cfg.shell[i]);
cfg.total_shells--;
for(j=i;j<cfg.total_shells;j++)
cfg.shell[j]=cfg.shell[j+1];
diff --git a/src/sbbs3/scfg/scfgchat.c b/src/sbbs3/scfg/scfgchat.c
index 219eba7b8f..6792d5d214 100644
--- a/src/sbbs3/scfg/scfgchat.c
+++ b/src/sbbs3/scfg/scfgchat.c
@@ -82,7 +82,7 @@ This is the command line to execute for this external chat pager.
if(uifc.input(WIN_MID|WIN_SAV,0,0,"Command Line",str,50
,K_EDIT)<1)
continue;
- if((cfg.page=(page_t **)REALLOC(cfg.page,sizeof(page_t *)*(cfg.total_pages+1)))
+ if((cfg.page=(page_t **)realloc(cfg.page,sizeof(page_t *)*(cfg.total_pages+1)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_pages+1);
cfg.total_pages=0;
@@ -91,7 +91,7 @@ This is the command line to execute for this external chat pager.
if(cfg.total_pages)
for(j=cfg.total_pages;j>i;j--)
cfg.page[j]=cfg.page[j-1];
- if((cfg.page[i]=(page_t *)MALLOC(sizeof(page_t)))==NULL) {
+ if((cfg.page[i]=(page_t *)malloc(sizeof(page_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(page_t));
continue; }
memset((page_t *)cfg.page[i],0,sizeof(page_t));
@@ -101,7 +101,7 @@ This is the command line to execute for this external chat pager.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.page[i]);
+ free(cfg.page[i]);
cfg.total_pages--;
for(j=i;j<cfg.total_pages;j++)
cfg.page[j]=cfg.page[j+1];
@@ -241,7 +241,7 @@ channel name.
uifc.msg("Invalid Code");
uifc.helpbuf=0;
continue; }
- if((cfg.chan=(chan_t **)REALLOC(cfg.chan,sizeof(chan_t *)*(cfg.total_chans+1)))
+ if((cfg.chan=(chan_t **)realloc(cfg.chan,sizeof(chan_t *)*(cfg.total_chans+1)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_chans+1);
cfg.total_chans=0;
@@ -250,7 +250,7 @@ channel name.
if(cfg.total_chans)
for(j=cfg.total_chans;j>i;j--)
cfg.chan[j]=cfg.chan[j-1];
- if((cfg.chan[i]=(chan_t *)MALLOC(sizeof(chan_t)))==NULL) {
+ if((cfg.chan[i]=(chan_t *)malloc(sizeof(chan_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(chan_t));
continue; }
memset((chan_t *)cfg.chan[i],0,sizeof(chan_t));
@@ -261,7 +261,7 @@ channel name.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.chan[i]);
+ free(cfg.chan[i]);
cfg.total_chans--;
for(j=i;j<cfg.total_chans;j++)
cfg.chan[j]=cfg.chan[j+1];
@@ -512,7 +512,7 @@ This is the output string displayed with this action output.
if(uifc.input(WIN_MID|WIN_SAV,0,0,"",out,LEN_CHATACTOUT
,K_MSG)<1)
continue;
- if((cfg.chatact=(chatact_t **)REALLOC(cfg.chatact
+ if((cfg.chatact=(chatact_t **)realloc(cfg.chatact
,sizeof(chatact_t *)*(cfg.total_chatacts+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_chatacts+1);
cfg.total_chatacts=0;
@@ -521,7 +521,7 @@ This is the output string displayed with this action output.
if(j)
for(n=cfg.total_chatacts;n>chatnum[i];n--)
cfg.chatact[n]=cfg.chatact[n-1];
- if((cfg.chatact[chatnum[i]]=(chatact_t *)MALLOC(sizeof(chatact_t)))==NULL) {
+ if((cfg.chatact[chatnum[i]]=(chatact_t *)malloc(sizeof(chatact_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(chatact_t));
continue; }
memset((chatact_t *)cfg.chatact[chatnum[i]],0,sizeof(chatact_t));
@@ -533,7 +533,7 @@ This is the output string displayed with this action output.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.chatact[chatnum[i]]);
+ free(cfg.chatact[chatnum[i]]);
cfg.total_chatacts--;
for(j=chatnum[i];j<cfg.total_chatacts && j<MAX_OPTS;j++)
cfg.chatact[j]=cfg.chatact[j+1];
@@ -638,7 +638,7 @@ it internally. This code is usually an abreviation of the Guru name.
uifc.msg("Invalid Code");
uifc.helpbuf=0;
continue; }
- if((cfg.guru=(guru_t **)REALLOC(cfg.guru,sizeof(guru_t *)*(cfg.total_gurus+1)))
+ if((cfg.guru=(guru_t **)realloc(cfg.guru,sizeof(guru_t *)*(cfg.total_gurus+1)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_gurus+1);
cfg.total_gurus=0;
@@ -647,7 +647,7 @@ it internally. This code is usually an abreviation of the Guru name.
if(cfg.total_gurus)
for(j=cfg.total_gurus;j>i;j--)
cfg.guru[j]=cfg.guru[j-1];
- if((cfg.guru[i]=(guru_t *)MALLOC(sizeof(guru_t)))==NULL) {
+ if((cfg.guru[i]=(guru_t *)malloc(sizeof(guru_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(guru_t));
continue; }
memset((guru_t *)cfg.guru[i],0,sizeof(guru_t));
@@ -658,7 +658,7 @@ it internally. This code is usually an abreviation of the Guru name.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.guru[i]);
+ free(cfg.guru[i]);
cfg.total_gurus--;
for(j=i;j<cfg.total_gurus;j++)
cfg.guru[j]=cfg.guru[j+1];
@@ -778,7 +778,7 @@ This is the name of the selected chat action set.
if(uifc.input(WIN_MID|WIN_SAV,0,0,"Chat Action Set Name",str,25
,0)<1)
continue;
- if((cfg.actset=(actset_t **)REALLOC(cfg.actset,sizeof(actset_t *)*(cfg.total_actsets+1)))
+ if((cfg.actset=(actset_t **)realloc(cfg.actset,sizeof(actset_t *)*(cfg.total_actsets+1)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_actsets+1);
cfg.total_actsets=0;
@@ -787,7 +787,7 @@ This is the name of the selected chat action set.
if(cfg.total_actsets)
for(j=cfg.total_actsets;j>i;j--)
cfg.actset[j]=cfg.actset[j-1];
- if((cfg.actset[i]=(actset_t *)MALLOC(sizeof(actset_t)))==NULL) {
+ if((cfg.actset[i]=(actset_t *)malloc(sizeof(actset_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(actset_t));
continue; }
memset((actset_t *)cfg.actset[i],0,sizeof(actset_t));
@@ -797,7 +797,7 @@ This is the name of the selected chat action set.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.actset[i]);
+ free(cfg.actset[i]);
cfg.total_actsets--;
for(j=i;j<cfg.total_actsets;j++)
cfg.actset[j]=cfg.actset[j+1];
diff --git a/src/sbbs3/scfg/scfgmdm.c b/src/sbbs3/scfg/scfgmdm.c
index d603585cb9..428848b149 100644
--- a/src/sbbs3/scfg/scfgmdm.c
+++ b/src/sbbs3/scfg/scfgmdm.c
@@ -40,7 +40,7 @@ int exec_mdm(char *fname);
void mdm_cfg(int mdmnum)
{
-FREE(cfg.mdm_result);
+free(cfg.mdm_result);
cfg.mdm_result=NULL;
/*
@@ -246,7 +246,7 @@ while(!feof(stream)) {
if(cfg.mdm_result[j].code==i)
break;
if(j>=cfg.mdm_results) {
- if((cfg.mdm_result=(mdm_result_t *)REALLOC(
+ if((cfg.mdm_result=(mdm_result_t *)realloc(
cfg.mdm_result,sizeof(mdm_result_t)
*(cfg.mdm_results+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,p,cfg.mdm_results+1);
@@ -307,16 +307,16 @@ while(!feof(stream)) {
if(!fgets(fname,120,stream))
break;
truncsp(fname);
- if((mdm_type=REALLOC(mdm_type,sizeof(char *)*(mdm_types+1)))==NULL) {
+ if((mdm_type=realloc(mdm_type,sizeof(char *)*(mdm_types+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,"Modem Type",sizeof(char *)*(mdm_types+1));
break; }
- if((mdm_file=REALLOC(mdm_file,sizeof(char *)*(mdm_types+1)))==NULL) {
+ if((mdm_file=realloc(mdm_file,sizeof(char *)*(mdm_types+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,"Modem File",sizeof(char *)*(mdm_types+1));
break; }
- if((mdm_type[mdm_types]=MALLOC(strlen(str)+1))==NULL) {
+ if((mdm_type[mdm_types]=malloc(strlen(str)+1))==NULL) {
errormsg(WHERE,ERR_ALLOC,"Modem Typename",sizeof(char *)*(mdm_types+1));
break; }
- if((mdm_file[mdm_types]=MALLOC(9))==NULL) {
+ if((mdm_file[mdm_types]=malloc(9))==NULL) {
errormsg(WHERE,ERR_ALLOC,"Modem Filename",sizeof(char *)*(mdm_types+1));
break; }
strcpy(mdm_type[mdm_types],str);
diff --git a/src/sbbs3/scfg/scfgmsg.c b/src/sbbs3/scfg/scfgmsg.c
index 573f6c3c85..03636c4873 100644
--- a/src/sbbs3/scfg/scfgmsg.c
+++ b/src/sbbs3/scfg/scfgmsg.c
@@ -195,7 +195,7 @@ main menu and reading message prompts.
sprintf(str2,"%.*s",LEN_GSNAME,str);
if(uifc.input(WIN_MID,0,0,"Group Short Name",str2,LEN_GSNAME,K_EDIT)<1)
continue;
- if((cfg.grp=(grp_t **)REALLOC(cfg.grp,sizeof(grp_t *)*(cfg.total_grps+1)))==NULL) {
+ if((cfg.grp=(grp_t **)realloc(cfg.grp,sizeof(grp_t *)*(cfg.total_grps+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_grps+1);
cfg.total_grps=0;
bail(1);
@@ -208,7 +208,7 @@ main menu and reading message prompts.
if(cfg.sub[j]->grp>=i)
cfg.sub[j]->grp++; }
- if((cfg.grp[i]=(grp_t *)MALLOC(sizeof(grp_t)))==NULL) {
+ if((cfg.grp[i]=(grp_t *)malloc(sizeof(grp_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(grp_t));
continue; }
memset((grp_t *)cfg.grp[i],0,sizeof(grp_t));
@@ -246,10 +246,10 @@ select Yes.
strcpy(tmp,cfg.sub[j]->data_dir);
delfiles(tmp,str);
clearptrs(j); }
- FREE(cfg.grp[i]);
+ free(cfg.grp[i]);
for(j=0;j<cfg.total_subs;) {
if(cfg.sub[j]->grp==i) { /* delete subs of this group */
- FREE(cfg.sub[j]);
+ free(cfg.sub[j]);
cfg.total_subs--;
k=j;
while(k<cfg.total_subs) { /* move all subs down */
@@ -685,7 +685,7 @@ import into the current message group.
break; }
if(j==cfg.total_subs) {
- if((cfg.sub=(sub_t **)REALLOC(cfg.sub
+ if((cfg.sub=(sub_t **)realloc(cfg.sub
,sizeof(sub_t *)*(cfg.total_subs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_subs+1);
cfg.total_subs=0;
@@ -693,7 +693,7 @@ import into the current message group.
break;
}
- if((cfg.sub[j]=(sub_t *)MALLOC(sizeof(sub_t)))
+ if((cfg.sub[j]=(sub_t *)malloc(sizeof(sub_t)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(sub_t));
break;
diff --git a/src/sbbs3/scfg/scfgnet.c b/src/sbbs3/scfg/scfgnet.c
index 76b07739e0..da8e371150 100644
--- a/src/sbbs3/scfg/scfgnet.c
+++ b/src/sbbs3/scfg/scfgnet.c
@@ -189,7 +189,7 @@ To configure a hub, select it and hit ENTER .
break;
if((i&MSK_ON)==MSK_INS) {
i&=MSK_OFF;
- if((cfg.qhub=(qhub_t **)REALLOC(cfg.qhub
+ if((cfg.qhub=(qhub_t **)realloc(cfg.qhub
,sizeof(qhub_t *)*(cfg.total_qhubs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr
,sizeof(qhub_t *)*(cfg.total_qhubs+1));
@@ -211,7 +211,7 @@ outgoing network packets and must be accurate.
for(j=cfg.total_qhubs;j>i;j--)
cfg.qhub[j]=cfg.qhub[j-1];
- if((cfg.qhub[i]=(qhub_t *)MALLOC(sizeof(qhub_t)))
+ if((cfg.qhub[i]=(qhub_t *)malloc(sizeof(qhub_t)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr
,sizeof(qhub_t));
@@ -228,10 +228,10 @@ outgoing network packets and must be accurate.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.qhub[i]->mode);
- FREE(cfg.qhub[i]->conf);
- FREE(cfg.qhub[i]->sub);
- FREE(cfg.qhub[i]);
+ free(cfg.qhub[i]->mode);
+ free(cfg.qhub[i]->conf);
+ free(cfg.qhub[i]->sub);
+ free(cfg.qhub[i]);
cfg.total_qhubs--;
while(i<cfg.total_qhubs) {
cfg.qhub[i]=cfg.qhub[i+1];
@@ -342,7 +342,7 @@ Format: Zone:Net/Node[.Point]
,str,25,K_EDIT|K_UPPER))
continue;
- if((cfg.faddr=(faddr_t *)REALLOC(cfg.faddr
+ if((cfg.faddr=(faddr_t *)realloc(cfg.faddr
,sizeof(faddr_t)*(cfg.total_faddrs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr
,sizeof(faddr_t)*cfg.total_faddrs+1);
@@ -725,7 +725,7 @@ To configure a hub, select it and hit ENTER .
break;
if((i&MSK_ON)==MSK_INS) {
i&=MSK_OFF;
- if((cfg.phub=(phub_t **)REALLOC(cfg.phub
+ if((cfg.phub=(phub_t **)realloc(cfg.phub
,sizeof(phub_t *)*(cfg.total_phubs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr
,sizeof(phub_t *)*(cfg.total_phubs+1));
@@ -747,7 +747,7 @@ This is the Site Name of this hub. It is used for only for reference.
for(j=cfg.total_phubs;j>i;j--)
cfg.phub[j]=cfg.phub[j-1];
- if((cfg.phub[i]=(phub_t *)MALLOC(sizeof(phub_t)))
+ if((cfg.phub[i]=(phub_t *)malloc(sizeof(phub_t)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr
,sizeof(phub_t));
@@ -762,7 +762,7 @@ This is the Site Name of this hub. It is used for only for reference.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.phub[i]);
+ free(cfg.phub[i]);
cfg.total_phubs--;
while(i<cfg.total_phubs) {
cfg.phub[i]=cfg.phub[i+1];
@@ -1198,11 +1198,11 @@ this option to Strip out.
if((m=uifc.list(WIN_MID|WIN_SAV,0,0,0,&m,0
,"Ctrl-A Codes",opt))==-1)
continue;
- if((cfg.qhub[num]->sub=(ushort *)REALLOC(cfg.qhub[num]->sub
+ if((cfg.qhub[num]->sub=(ushort *)realloc(cfg.qhub[num]->sub
,sizeof(ushort *)*(cfg.qhub[num]->subs+1)))==NULL
- || (cfg.qhub[num]->conf=(ushort *)REALLOC(cfg.qhub[num]->conf
+ || (cfg.qhub[num]->conf=(ushort *)realloc(cfg.qhub[num]->conf
,sizeof(ushort *)*(cfg.qhub[num]->subs+1)))==NULL
- || (cfg.qhub[num]->mode=(uchar *)REALLOC(cfg.qhub[num]->mode
+ || (cfg.qhub[num]->mode=(uchar *)realloc(cfg.qhub[num]->mode
,sizeof(uchar *)*(cfg.qhub[num]->subs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.qhub[num]->subs+1);
continue; }
diff --git a/src/sbbs3/scfg/scfgnode.c b/src/sbbs3/scfg/scfgnode.c
index e6a40f7d06..1d37f486f2 100644
--- a/src/sbbs3/scfg/scfgnode.c
+++ b/src/sbbs3/scfg/scfgnode.c
@@ -92,7 +92,7 @@ select No or hit ESC .
i=uifc.list(WIN_MID,0,0,0,&i,0,str,opt);
if(!i) {
--cfg.sys_nodes;
-/* FREE(cfg.node_path[cfg.sys_nodes]); */
+/* free(cfg.node_path[cfg.sys_nodes]); */
cfg.new_install=new_install;
write_main_cfg(&cfg,backup_level);
refresh_cfg(&cfg);
diff --git a/src/sbbs3/scfg/scfgsub.c b/src/sbbs3/scfg/scfgsub.c
index e1c40a2864..517b127e1d 100644
--- a/src/sbbs3/scfg/scfgsub.c
+++ b/src/sbbs3/scfg/scfgsub.c
@@ -142,7 +142,7 @@ usually an abreviation of the sub-board's name.
continue;
}
- if((cfg.sub=(sub_t **)REALLOC(cfg.sub,sizeof(sub_t *)*(cfg.total_subs+1)))==NULL) {
+ if((cfg.sub=(sub_t **)realloc(cfg.sub,sizeof(sub_t *)*(cfg.total_subs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_subs+1);
cfg.total_subs=0;
bail(1);
@@ -163,7 +163,7 @@ usually an abreviation of the sub-board's name.
if(cfg.qhub[q]->sub[s]>=subnum[i])
cfg.qhub[q]->sub[s]++; }
- if((cfg.sub[subnum[i]]=(sub_t *)MALLOC(sizeof(sub_t)))==NULL) {
+ if((cfg.sub[subnum[i]]=(sub_t *)malloc(sizeof(sub_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(sub_t));
continue; }
memset((sub_t *)cfg.sub[subnum[i]],0,sizeof(sub_t));
@@ -213,7 +213,7 @@ If you want to delete all the messages for this sub-board, select Yes.
delfiles(tmp,str);
clearptrs(subnum[i]);
}
- FREE(cfg.sub[subnum[i]]);
+ free(cfg.sub[subnum[i]]);
cfg.total_subs--;
for(j=subnum[i];j<cfg.total_subs;j++)
cfg.sub[j]=cfg.sub[j+1];
diff --git a/src/sbbs3/scfg/scfgxfr1.c b/src/sbbs3/scfg/scfgxfr1.c
index a1be618b0b..a377f4ec47 100644
--- a/src/sbbs3/scfg/scfgxfr1.c
+++ b/src/sbbs3/scfg/scfgxfr1.c
@@ -268,7 +268,7 @@ command line examples for a few file types.
break;
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.fview[i]);
+ free(cfg.fview[i]);
cfg.total_fviews--;
while(i<cfg.total_fviews) {
cfg.fview[i]=cfg.fview[i+1];
@@ -277,14 +277,14 @@ command line examples for a few file types.
continue; }
if((i&MSK_ON)==MSK_INS) {
i&=MSK_OFF;
- if((cfg.fview=(fview_t **)REALLOC(cfg.fview
+ if((cfg.fview=(fview_t **)realloc(cfg.fview
,sizeof(fview_t *)*(cfg.total_fviews+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_fviews+1);
cfg.total_fviews=0;
bail(1);
continue; }
if(!cfg.total_fviews) {
- if((cfg.fview[0]=(fview_t *)MALLOC(
+ if((cfg.fview[0]=(fview_t *)malloc(
sizeof(fview_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(fview_t));
continue; }
@@ -294,7 +294,7 @@ command line examples for a few file types.
else {
for(j=cfg.total_fviews;j>i;j--)
cfg.fview[j]=cfg.fview[j-1];
- if((cfg.fview[i]=(fview_t *)MALLOC(
+ if((cfg.fview[i]=(fview_t *)malloc(
sizeof(fview_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(fview_t));
continue; }
@@ -383,7 +383,7 @@ listed.
break;
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.ftest[i]);
+ free(cfg.ftest[i]);
cfg.total_ftests--;
while(i<cfg.total_ftests) {
cfg.ftest[i]=cfg.ftest[i+1];
@@ -392,14 +392,14 @@ listed.
continue; }
if((i&MSK_ON)==MSK_INS) {
i&=MSK_OFF;
- if((cfg.ftest=(ftest_t **)REALLOC(cfg.ftest
+ if((cfg.ftest=(ftest_t **)realloc(cfg.ftest
,sizeof(ftest_t *)*(cfg.total_ftests+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_ftests+1);
cfg.total_ftests=0;
bail(1);
continue; }
if(!cfg.total_ftests) {
- if((cfg.ftest[0]=(ftest_t *)MALLOC(
+ if((cfg.ftest[0]=(ftest_t *)malloc(
sizeof(ftest_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(ftest_t));
continue; }
@@ -411,7 +411,7 @@ listed.
for(j=cfg.total_ftests;j>i;j--)
cfg.ftest[j]=cfg.ftest[j-1];
- if((cfg.ftest[i]=(ftest_t *)MALLOC(
+ if((cfg.ftest[i]=(ftest_t *)malloc(
sizeof(ftest_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(ftest_t));
continue; }
@@ -505,7 +505,7 @@ for each file type and command line listed.
break;
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.dlevent[i]);
+ free(cfg.dlevent[i]);
cfg.total_dlevents--;
while(i<cfg.total_dlevents) {
cfg.dlevent[i]=cfg.dlevent[i+1];
@@ -514,14 +514,14 @@ for each file type and command line listed.
continue; }
if((i&MSK_ON)==MSK_INS) {
i&=MSK_OFF;
- if((cfg.dlevent=(dlevent_t **)REALLOC(cfg.dlevent
+ if((cfg.dlevent=(dlevent_t **)realloc(cfg.dlevent
,sizeof(dlevent_t *)*(cfg.total_dlevents+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_dlevents+1);
cfg.total_dlevents=0;
bail(1);
continue; }
if(!cfg.total_dlevents) {
- if((cfg.dlevent[0]=(dlevent_t *)MALLOC(
+ if((cfg.dlevent[0]=(dlevent_t *)malloc(
sizeof(dlevent_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(dlevent_t));
continue; }
@@ -534,7 +534,7 @@ for each file type and command line listed.
for(j=cfg.total_dlevents;j>i;j--)
cfg.dlevent[j]=cfg.dlevent[j-1];
- if((cfg.dlevent[i]=(dlevent_t *)MALLOC(
+ if((cfg.dlevent[i]=(dlevent_t *)malloc(
sizeof(dlevent_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(dlevent_t));
continue; }
@@ -622,7 +622,7 @@ extract the file(s).
break;
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.fextr[i]);
+ free(cfg.fextr[i]);
cfg.total_fextrs--;
while(i<cfg.total_fextrs) {
cfg.fextr[i]=cfg.fextr[i+1];
@@ -631,14 +631,14 @@ extract the file(s).
continue; }
if((i&MSK_ON)==MSK_INS) {
i&=MSK_OFF;
- if((cfg.fextr=(fextr_t **)REALLOC(cfg.fextr
+ if((cfg.fextr=(fextr_t **)realloc(cfg.fextr
,sizeof(fextr_t *)*(cfg.total_fextrs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_fextrs+1);
cfg.total_fextrs=0;
bail(1);
continue; }
if(!cfg.total_fextrs) {
- if((cfg.fextr[0]=(fextr_t *)MALLOC(
+ if((cfg.fextr[0]=(fextr_t *)malloc(
sizeof(fextr_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(fextr_t));
continue; }
@@ -649,7 +649,7 @@ extract the file(s).
for(j=cfg.total_fextrs;j>i;j--)
cfg.fextr[j]=cfg.fextr[j-1];
- if((cfg.fextr[i]=(fextr_t *)MALLOC(
+ if((cfg.fextr[i]=(fextr_t *)malloc(
sizeof(fextr_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(fextr_t));
continue; }
@@ -729,7 +729,7 @@ files from the transfer section, and more.
break;
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.fcomp[i]);
+ free(cfg.fcomp[i]);
cfg.total_fcomps--;
while(i<cfg.total_fcomps) {
cfg.fcomp[i]=cfg.fcomp[i+1];
@@ -738,14 +738,14 @@ files from the transfer section, and more.
continue; }
if((i&MSK_ON)==MSK_INS) {
i&=MSK_OFF;
- if((cfg.fcomp=(fcomp_t **)REALLOC(cfg.fcomp
+ if((cfg.fcomp=(fcomp_t **)realloc(cfg.fcomp
,sizeof(fcomp_t *)*(cfg.total_fcomps+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_fcomps+1);
cfg.total_fcomps=0;
bail(1);
continue; }
if(!cfg.total_fcomps) {
- if((cfg.fcomp[0]=(fcomp_t *)MALLOC(
+ if((cfg.fcomp[0]=(fcomp_t *)malloc(
sizeof(fcomp_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(fcomp_t));
continue; }
@@ -755,7 +755,7 @@ files from the transfer section, and more.
else {
for(j=cfg.total_fcomps;j>i;j--)
cfg.fcomp[j]=cfg.fcomp[j-1];
- if((cfg.fcomp[i]=(fcomp_t *)MALLOC(
+ if((cfg.fcomp[i]=(fcomp_t *)malloc(
sizeof(fcomp_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(fcomp_t));
continue; }
@@ -841,7 +841,7 @@ command line for that method blank.
break;
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.prot[i]);
+ free(cfg.prot[i]);
cfg.total_prots--;
while(i<cfg.total_prots) {
cfg.prot[i]=cfg.prot[i+1];
@@ -850,14 +850,14 @@ command line for that method blank.
continue; }
if((i&MSK_ON)==MSK_INS) {
i&=MSK_OFF;
- if((cfg.prot=(prot_t **)REALLOC(cfg.prot
+ if((cfg.prot=(prot_t **)realloc(cfg.prot
,sizeof(prot_t *)*(cfg.total_prots+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_prots+1);
cfg.total_prots=0;
bail(1);
continue; }
if(!cfg.total_prots) {
- if((cfg.prot[0]=(prot_t *)MALLOC(
+ if((cfg.prot[0]=(prot_t *)malloc(
sizeof(prot_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(prot_t));
continue; }
@@ -866,7 +866,7 @@ command line for that method blank.
} else {
for(j=cfg.total_prots;j>i;j--)
cfg.prot[j]=cfg.prot[j-1];
- if((cfg.prot[i]=(prot_t *)MALLOC(
+ if((cfg.prot[i]=(prot_t *)malloc(
sizeof(prot_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(prot_t));
continue; }
@@ -1021,7 +1021,7 @@ multiple CD-ROMs or hard disks.
break;
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.altpath[i]);
+ free(cfg.altpath[i]);
cfg.altpaths--;
while(i<cfg.altpaths) {
cfg.altpath[i]=cfg.altpath[i+1];
@@ -1030,21 +1030,21 @@ multiple CD-ROMs or hard disks.
continue; }
if((i&MSK_ON)==MSK_INS) {
i&=MSK_OFF;
- if((cfg.altpath=(char **)REALLOC(cfg.altpath
+ if((cfg.altpath=(char **)realloc(cfg.altpath
,sizeof(char *)*(cfg.altpaths+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.altpaths+1);
cfg.altpaths=0;
bail(1);
continue; }
if(!cfg.altpaths) {
- if((cfg.altpath[0]=(char *)MALLOC(LEN_DIR+1))==NULL) {
+ if((cfg.altpath[0]=(char *)malloc(LEN_DIR+1))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,LEN_DIR+1);
continue; }
memset(cfg.altpath[0],0,LEN_DIR+1); }
else {
for(j=cfg.altpaths;j>i;j--)
cfg.altpath[j]=cfg.altpath[j-1];
- if((cfg.altpath[i]=(char *)MALLOC(LEN_DIR+1))==NULL) {
+ if((cfg.altpath[i]=(char *)malloc(LEN_DIR+1))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,LEN_DIR+1);
continue; }
if(i>=cfg.altpaths)
diff --git a/src/sbbs3/scfg/scfgxfr2.c b/src/sbbs3/scfg/scfgxfr2.c
index 9c6045537e..f3e9fdd69f 100644
--- a/src/sbbs3/scfg/scfgxfr2.c
+++ b/src/sbbs3/scfg/scfgxfr2.c
@@ -111,7 +111,7 @@ file transfer menu prompt.
if(uifc.input(WIN_MID|WIN_SAV,0,0,"Library Short Name",str2,LEN_GSNAME
,K_EDIT)<1)
continue;
- if((cfg.lib=(lib_t **)REALLOC(cfg.lib,sizeof(lib_t *)*(cfg.total_libs+1)))==NULL) {
+ if((cfg.lib=(lib_t **)realloc(cfg.lib,sizeof(lib_t *)*(cfg.total_libs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_libs+1);
cfg.total_libs=0;
bail(1);
@@ -123,7 +123,7 @@ file transfer menu prompt.
for(j=0;j<cfg.total_dirs;j++)
if(cfg.dir[j]->lib>=i)
cfg.dir[j]->lib++; }
- if((cfg.lib[i]=(lib_t *)MALLOC(sizeof(lib_t)))==NULL) {
+ if((cfg.lib[i]=(lib_t *)malloc(sizeof(lib_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(lib_t));
continue; }
memset((lib_t *)cfg.lib[i],0,sizeof(lib_t));
@@ -161,10 +161,10 @@ library, select Yes.
else
strcpy(tmp,cfg.dir[j]->data_dir);
delfiles(tmp,str); }
- FREE(cfg.lib[i]);
+ free(cfg.lib[i]);
for(j=0;j<cfg.total_dirs;) {
if(cfg.dir[j]->lib==i) {
- FREE(cfg.dir[j]);
+ free(cfg.dir[j]);
cfg.total_dirs--;
k=j;
while(k<cfg.total_dirs) {
@@ -557,14 +557,14 @@ command: DIR /ON /AD /B > DIRS.RAW
break; }
if(j==cfg.total_dirs) {
- if((cfg.dir=(dir_t **)REALLOC(cfg.dir
+ if((cfg.dir=(dir_t **)realloc(cfg.dir
,sizeof(dir_t *)*(cfg.total_dirs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,"dir",cfg.total_dirs+1);
cfg.total_dirs=0;
bail(1);
break; }
- if((cfg.dir[j]=(dir_t *)MALLOC(sizeof(dir_t)))
+ if((cfg.dir[j]=(dir_t *)malloc(sizeof(dir_t)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,"dir",sizeof(dir_t));
break; }
@@ -699,7 +699,7 @@ this directory will be stored. Example: C:\XFER\GAMES
if(uifc.input(WIN_MID|WIN_SAV,0,0,"Directory File Path",path,50
,K_EDIT)<1)
continue;
- if((cfg.dir=(dir_t **)REALLOC(cfg.dir,sizeof(dir_t *)*(cfg.total_dirs+1)))==NULL) {
+ if((cfg.dir=(dir_t **)realloc(cfg.dir,sizeof(dir_t *)*(cfg.total_dirs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_dirs+1);
cfg.total_dirs=0;
bail(1);
@@ -708,7 +708,7 @@ this directory will be stored. Example: C:\XFER\GAMES
if(j)
for(n=cfg.total_dirs;n>dirnum[i];n--)
cfg.dir[n]=cfg.dir[n-1];
- if((cfg.dir[dirnum[i]]=(dir_t *)MALLOC(sizeof(dir_t)))==NULL) {
+ if((cfg.dir[dirnum[i]]=(dir_t *)malloc(sizeof(dir_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(dir_t));
continue; }
memset((dir_t *)cfg.dir[dirnum[i]],0,sizeof(dir_t));
@@ -752,7 +752,7 @@ select Yes.
else
strcpy(tmp,cfg.dir[dirnum[i]]->data_dir);
delfiles(tmp,str); }
- FREE(cfg.dir[dirnum[i]]);
+ free(cfg.dir[dirnum[i]]);
cfg.total_dirs--;
for(j=dirnum[i];j<cfg.total_dirs;j++)
cfg.dir[j]=cfg.dir[j+1];
diff --git a/src/sbbs3/scfg/scfgxtrn.c b/src/sbbs3/scfg/scfgxtrn.c
index b5e32c23ae..4806ac37ae 100644
--- a/src/sbbs3/scfg/scfgxtrn.c
+++ b/src/sbbs3/scfg/scfgxtrn.c
@@ -322,13 +322,13 @@ This is the internal code for the timed event.
if(uifc.input(WIN_MID|WIN_SAV,0,0,"Event Internal Code",str,LEN_CODE
,K_UPPER)<1)
continue;
- if((cfg.event=(event_t **)REALLOC(cfg.event
+ if((cfg.event=(event_t **)realloc(cfg.event
,sizeof(event_t *)*(cfg.total_events+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_events+1);
cfg.total_events=0;
bail(1);
continue; }
- if((cfg.event[i]=(event_t *)MALLOC(sizeof(event_t)))==NULL) {
+ if((cfg.event[i]=(event_t *)malloc(sizeof(event_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(event_t));
continue; }
memset((event_t *)cfg.event[i],0,sizeof(event_t));
@@ -340,7 +340,7 @@ This is the internal code for the timed event.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.event[i]);
+ free(cfg.event[i]);
cfg.total_events--;
for(j=i;j<cfg.total_events;j++)
cfg.event[j]=cfg.event[j+1];
@@ -818,7 +818,7 @@ online program name.
uifc.msg("Invalid Code");
uifc.helpbuf=0;
continue; }
- if((cfg.xtrn=(xtrn_t **)REALLOC(cfg.xtrn,sizeof(xtrn_t *)*(cfg.total_xtrns+1)))
+ if((cfg.xtrn=(xtrn_t **)realloc(cfg.xtrn,sizeof(xtrn_t *)*(cfg.total_xtrns+1)))
==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_xtrns+1);
cfg.total_xtrns=0;
@@ -827,7 +827,7 @@ online program name.
if(j)
for(n=cfg.total_xtrns;n>xtrnnum[i];n--)
cfg.xtrn[n]=cfg.xtrn[n-1];
- if((cfg.xtrn[xtrnnum[i]]=(xtrn_t *)MALLOC(sizeof(xtrn_t)))==NULL) {
+ if((cfg.xtrn[xtrnnum[i]]=(xtrn_t *)malloc(sizeof(xtrn_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(xtrn_t));
continue; }
memset((xtrn_t *)cfg.xtrn[xtrnnum[i]],0,sizeof(xtrn_t));
@@ -839,7 +839,7 @@ online program name.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.xtrn[xtrnnum[i]]);
+ free(cfg.xtrn[xtrnnum[i]]);
cfg.total_xtrns--;
for(j=xtrnnum[i];j<cfg.total_xtrns;j++)
cfg.xtrn[j]=cfg.xtrn[j+1];
@@ -1526,7 +1526,7 @@ This is the internal code for the external editor.
uifc.helpbuf=0;
continue; }
- if((cfg.xedit=(xedit_t **)REALLOC(cfg.xedit
+ if((cfg.xedit=(xedit_t **)realloc(cfg.xedit
,sizeof(xedit_t *)*(cfg.total_xedits+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_xedits+1);
cfg.total_xedits=0;
@@ -1535,7 +1535,7 @@ This is the internal code for the external editor.
if(cfg.total_xedits)
for(j=cfg.total_xedits;j>i;j--)
cfg.xedit[j]=cfg.xedit[j-1];
- if((cfg.xedit[i]=(xedit_t *)MALLOC(sizeof(xedit_t)))==NULL) {
+ if((cfg.xedit[i]=(xedit_t *)malloc(sizeof(xedit_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(xedit_t));
continue; }
memset((xedit_t *)cfg.xedit[i],0,sizeof(xedit_t));
@@ -1546,7 +1546,7 @@ This is the internal code for the external editor.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.xedit[i]);
+ free(cfg.xedit[i]);
cfg.total_xedits--;
for(j=i;j<cfg.total_xedits;j++)
cfg.xedit[j]=cfg.xedit[j+1];
@@ -1939,7 +1939,7 @@ This is the executable filename of the native external program.
if(uifc.input(WIN_MID|WIN_SAV,0,0,"Native Program Name",str,12
,0)<1)
continue;
- if((cfg.natvpgm=(natvpgm_t **)REALLOC(cfg.natvpgm
+ if((cfg.natvpgm=(natvpgm_t **)realloc(cfg.natvpgm
,sizeof(natvpgm_t *)*(cfg.total_natvpgms+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_natvpgms+1);
cfg.total_natvpgms=0;
@@ -1948,7 +1948,7 @@ This is the executable filename of the native external program.
if(cfg.total_natvpgms)
for(j=cfg.total_natvpgms;j>i;j--)
cfg.natvpgm[j]=cfg.natvpgm[j-1];
- if((cfg.natvpgm[i]=(natvpgm_t *)MALLOC(sizeof(natvpgm_t)))==NULL) {
+ if((cfg.natvpgm[i]=(natvpgm_t *)malloc(sizeof(natvpgm_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(natvpgm_t));
continue; }
memset((natvpgm_t *)cfg.natvpgm[i],0,sizeof(natvpgm_t));
@@ -1958,7 +1958,7 @@ This is the executable filename of the native external program.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.natvpgm[i]);
+ free(cfg.natvpgm[i]);
cfg.total_natvpgms--;
for(j=i;j<cfg.total_natvpgms;j++)
cfg.natvpgm[j]=cfg.natvpgm[j+1];
@@ -2046,7 +2046,7 @@ abreviation of the name.
uifc.msg("Invalid Code");
uifc.helpbuf=0;
continue; }
- if((cfg.xtrnsec=(xtrnsec_t **)REALLOC(cfg.xtrnsec
+ if((cfg.xtrnsec=(xtrnsec_t **)realloc(cfg.xtrnsec
,sizeof(xtrnsec_t *)*(cfg.total_xtrnsecs+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_xtrnsecs+1);
cfg.total_xtrnsecs=0;
@@ -2060,7 +2060,7 @@ abreviation of the name.
cfg.xtrn[j]->sec++; }
- if((cfg.xtrnsec[i]=(xtrnsec_t *)MALLOC(sizeof(xtrnsec_t)))==NULL) {
+ if((cfg.xtrnsec[i]=(xtrnsec_t *)malloc(sizeof(xtrnsec_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(xtrnsec_t));
continue; }
memset((xtrnsec_t *)cfg.xtrnsec[i],0,sizeof(xtrnsec_t));
@@ -2071,10 +2071,10 @@ abreviation of the name.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.xtrnsec[i]);
+ free(cfg.xtrnsec[i]);
for(j=0;j<cfg.total_xtrns;) {
if(cfg.xtrn[j]->sec==i) { /* delete xtrns of this group */
- FREE(cfg.xtrn[j]);
+ free(cfg.xtrn[j]);
cfg.total_xtrns--;
k=j;
while(k<cfg.total_xtrns) { /* move all xtrns down */
@@ -2210,7 +2210,7 @@ indicates a Ctrl-A hot key event.
,K_UPPER)<1)
continue;
- if((cfg.hotkey=(hotkey_t **)REALLOC(cfg.hotkey
+ if((cfg.hotkey=(hotkey_t **)realloc(cfg.hotkey
,sizeof(hotkey_t *)*(cfg.total_hotkeys+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_hotkeys+1);
cfg.total_hotkeys=0;
@@ -2219,7 +2219,7 @@ indicates a Ctrl-A hot key event.
if(cfg.total_hotkeys)
for(j=cfg.total_hotkeys;j>i;j--)
cfg.hotkey[j]=cfg.hotkey[j-1];
- if((cfg.hotkey[i]=(hotkey_t *)MALLOC(sizeof(hotkey_t)))==NULL) {
+ if((cfg.hotkey[i]=(hotkey_t *)malloc(sizeof(hotkey_t)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,sizeof(hotkey_t));
continue; }
memset((hotkey_t *)cfg.hotkey[i],0,sizeof(hotkey_t));
@@ -2229,7 +2229,7 @@ indicates a Ctrl-A hot key event.
continue; }
if((i&MSK_ON)==MSK_DEL) {
i&=MSK_OFF;
- FREE(cfg.hotkey[i]);
+ free(cfg.hotkey[i]);
cfg.total_hotkeys--;
for(j=i;j<cfg.total_hotkeys;j++)
cfg.hotkey[j]=cfg.hotkey[j+1];
diff --git a/src/sbbs3/scfglib1.c b/src/sbbs3/scfglib1.c
index db2ddae02c..58f8d6c1f4 100644
--- a/src/sbbs3/scfglib1.c
+++ b/src/sbbs3/scfglib1.c
@@ -159,7 +159,7 @@ BOOL read_node_cfg(scfg_t* cfg, char* error)
get_int(cfg->mdm_results,instream);
if(cfg->mdm_results) {
- if((cfg->mdm_result=(mdm_result_t *)MALLOC(sizeof(mdm_result_t)*cfg->mdm_results))
+ if((cfg->mdm_result=(mdm_result_t *)malloc(sizeof(mdm_result_t)*cfg->mdm_results))
==NULL)
return allocerr(instream,error,offset,fname,sizeof(mdm_result_t *)*cfg->mdm_results);
} else
@@ -377,14 +377,14 @@ BOOL read_main_cfg(scfg_t* cfg, char* error)
#endif
if(cfg->total_shells) {
- if((cfg->shell=(shell_t **)MALLOC(sizeof(shell_t *)*cfg->total_shells))==NULL)
+ if((cfg->shell=(shell_t **)malloc(sizeof(shell_t *)*cfg->total_shells))==NULL)
return allocerr(instream,error,offset,fname,sizeof(shell_t *)*cfg->total_shells);
} else
cfg->shell=NULL;
for(i=0;i<cfg->total_shells;i++) {
if(feof(instream)) break;
- if((cfg->shell[i]=(shell_t *)MALLOC(sizeof(shell_t)))==NULL)
+ if((cfg->shell[i]=(shell_t *)malloc(sizeof(shell_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(shell_t));
memset(cfg->shell[i],0,sizeof(shell_t));
@@ -449,7 +449,7 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_grps,instream);
if(cfg->total_grps) {
- if((cfg->grp=(grp_t **)MALLOC(sizeof(grp_t *)*cfg->total_grps))==NULL)
+ if((cfg->grp=(grp_t **)malloc(sizeof(grp_t *)*cfg->total_grps))==NULL)
return allocerr(instream,error,offset,fname,sizeof(grp_t *)*cfg->total_grps);
} else
cfg->grp=NULL;
@@ -457,7 +457,7 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
for(i=0;i<cfg->total_grps;i++) {
if(feof(instream)) break;
- if((cfg->grp[i]=(grp_t *)MALLOC(sizeof(grp_t)))==NULL)
+ if((cfg->grp[i]=(grp_t *)malloc(sizeof(grp_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(grp_t));
memset(cfg->grp[i],0,sizeof(grp_t));
@@ -482,14 +482,14 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_subs,instream);
if(cfg->total_subs) {
- if((cfg->sub=(sub_t **)MALLOC(sizeof(sub_t *)*cfg->total_subs))==NULL)
+ if((cfg->sub=(sub_t **)malloc(sizeof(sub_t *)*cfg->total_subs))==NULL)
return allocerr(instream,error,offset,fname,sizeof(sub_t *)*cfg->total_subs);
} else
cfg->sub=NULL;
for(i=0;i<cfg->total_subs;i++) {
if(feof(instream)) break;
- if((cfg->sub[i]=(sub_t *)MALLOC(sizeof(sub_t)))==NULL)
+ if((cfg->sub[i]=(sub_t *)malloc(sizeof(sub_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(sub_t));
memset(cfg->sub[i],0,sizeof(sub_t));
@@ -567,7 +567,7 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_faddrs,instream);
if(cfg->total_faddrs) {
- if((cfg->faddr=(faddr_t *)MALLOC(sizeof(faddr_t)*cfg->total_faddrs))==NULL)
+ if((cfg->faddr=(faddr_t *)malloc(sizeof(faddr_t)*cfg->total_faddrs))==NULL)
return allocerr(instream,error,offset,fname,sizeof(faddr_t)*cfg->total_faddrs);
} else
cfg->faddr=NULL;
@@ -596,14 +596,14 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_qhubs,instream);
if(cfg->total_qhubs) {
- if((cfg->qhub=(qhub_t **)MALLOC(sizeof(qhub_t *)*cfg->total_qhubs))==NULL)
+ if((cfg->qhub=(qhub_t **)malloc(sizeof(qhub_t *)*cfg->total_qhubs))==NULL)
return allocerr(instream,error,offset,fname,sizeof(qhub_t*)*cfg->total_qhubs);
} else
cfg->qhub=NULL;
for(i=0;i<cfg->total_qhubs;i++) {
if(feof(instream)) break;
- if((cfg->qhub[i]=(qhub_t *)MALLOC(sizeof(qhub_t)))==NULL)
+ if((cfg->qhub[i]=(qhub_t *)malloc(sizeof(qhub_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(qhub_t));
memset(cfg->qhub[i],0,sizeof(qhub_t));
@@ -618,11 +618,11 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
get_int(k,instream);
if(k) {
- if((cfg->qhub[i]->sub=(ushort *)MALLOC(sizeof(ushort)*k))==NULL)
+ if((cfg->qhub[i]->sub=(ushort *)malloc(sizeof(ushort)*k))==NULL)
return allocerr(instream,error,offset,fname,sizeof(uint)*k);
- if((cfg->qhub[i]->conf=(ushort *)MALLOC(sizeof(ushort)*k))==NULL)
+ if((cfg->qhub[i]->conf=(ushort *)malloc(sizeof(ushort)*k))==NULL)
return allocerr(instream,error,offset,fname,sizeof(ushort)*k);
- if((cfg->qhub[i]->mode=(char *)MALLOC(sizeof(char)*k))==NULL)
+ if((cfg->qhub[i]->mode=(char *)malloc(sizeof(char)*k))==NULL)
return allocerr(instream,error,offset,fname,sizeof(uchar)*k);
}
@@ -656,14 +656,14 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_phubs,instream);
if(cfg->total_phubs) {
- if((cfg->phub=(phub_t **)MALLOC(sizeof(phub_t *)*cfg->total_phubs))==NULL)
+ if((cfg->phub=(phub_t **)malloc(sizeof(phub_t *)*cfg->total_phubs))==NULL)
return allocerr(instream,error,offset,fname,sizeof(phub_t*)*cfg->total_phubs);
} else
cfg->phub=NULL;
for(i=0;i<cfg->total_phubs;i++) {
if(feof(instream)) break;
- if((cfg->phub[i]=(phub_t *)MALLOC(sizeof(phub_t)))==NULL)
+ if((cfg->phub[i]=(phub_t *)malloc(sizeof(phub_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(phub_t));
memset(cfg->phub[i],0,sizeof(phub_t));
diff --git a/src/sbbs3/scfglib2.c b/src/sbbs3/scfglib2.c
index de494610ba..c6d356fd61 100644
--- a/src/sbbs3/scfglib2.c
+++ b/src/sbbs3/scfglib2.c
@@ -81,7 +81,7 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_fextrs,instream);
if(cfg->total_fextrs) {
- if((cfg->fextr=(fextr_t **)MALLOC(sizeof(fextr_t *)*cfg->total_fextrs))==NULL)
+ if((cfg->fextr=(fextr_t **)malloc(sizeof(fextr_t *)*cfg->total_fextrs))==NULL)
return allocerr(instream,error,offset,fname,sizeof(fextr_t*)*cfg->total_fextrs);
} else
cfg->fextr=NULL;
@@ -89,7 +89,7 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
for(i=0; i<cfg->total_fextrs; i++) {
if(feof(instream))
break;
- if((cfg->fextr[i]=(fextr_t *)MALLOC(sizeof(fextr_t)))==NULL)
+ if((cfg->fextr[i]=(fextr_t *)malloc(sizeof(fextr_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(fextr_t));
memset(cfg->fextr[i],0,sizeof(fextr_t));
get_str(cfg->fextr[i]->ext,instream);
@@ -109,7 +109,7 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_fcomps,instream);
if(cfg->total_fcomps) {
- if((cfg->fcomp=(fcomp_t **)MALLOC(sizeof(fcomp_t *)*cfg->total_fcomps))==NULL)
+ if((cfg->fcomp=(fcomp_t **)malloc(sizeof(fcomp_t *)*cfg->total_fcomps))==NULL)
return allocerr(instream,error,offset,fname,sizeof(fcomp_t*)*cfg->total_fcomps);
} else
cfg->fcomp=NULL;
@@ -117,7 +117,7 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
for(i=0; i<cfg->total_fcomps; i++) {
if(feof(instream))
break;
- if((cfg->fcomp[i]=(fcomp_t *)MALLOC(sizeof(fcomp_t)))==NULL)
+ if((cfg->fcomp[i]=(fcomp_t *)malloc(sizeof(fcomp_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(fcomp_t));
memset(cfg->fcomp[i],0,sizeof(fcomp_t));
get_str(cfg->fcomp[i]->ext,instream);
@@ -137,14 +137,14 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_fviews,instream);
if(cfg->total_fviews) {
- if((cfg->fview=(fview_t **)MALLOC(sizeof(fview_t *)*cfg->total_fviews))==NULL)
+ if((cfg->fview=(fview_t **)malloc(sizeof(fview_t *)*cfg->total_fviews))==NULL)
return allocerr(instream,error,offset,fname,sizeof(fview_t*)*cfg->total_fviews);
} else
cfg->fview=NULL;
for(i=0; i<cfg->total_fviews; i++) {
if(feof(instream)) break;
- if((cfg->fview[i]=(fview_t *)MALLOC(sizeof(fview_t)))==NULL)
+ if((cfg->fview[i]=(fview_t *)malloc(sizeof(fview_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(fview_t));
memset(cfg->fview[i],0,sizeof(fview_t));
get_str(cfg->fview[i]->ext,instream);
@@ -164,14 +164,14 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_ftests,instream);
if(cfg->total_ftests) {
- if((cfg->ftest=(ftest_t **)MALLOC(sizeof(ftest_t *)*cfg->total_ftests))==NULL)
+ if((cfg->ftest=(ftest_t **)malloc(sizeof(ftest_t *)*cfg->total_ftests))==NULL)
return allocerr(instream,error,offset,fname,sizeof(ftest_t*)*cfg->total_ftests);
} else
cfg->ftest=NULL;
for(i=0; i<cfg->total_ftests; i++) {
if(feof(instream)) break;
- if((cfg->ftest[i]=(ftest_t *)MALLOC(sizeof(ftest_t)))==NULL)
+ if((cfg->ftest[i]=(ftest_t *)malloc(sizeof(ftest_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(ftest_t));
memset(cfg->ftest[i],0,sizeof(ftest_t));
get_str(cfg->ftest[i]->ext,instream);
@@ -192,7 +192,7 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_dlevents,instream);
if(cfg->total_dlevents) {
- if((cfg->dlevent=(dlevent_t **)MALLOC(sizeof(dlevent_t *)*cfg->total_dlevents))
+ if((cfg->dlevent=(dlevent_t **)malloc(sizeof(dlevent_t *)*cfg->total_dlevents))
==NULL)
return allocerr(instream,error,offset,fname,sizeof(dlevent_t*)*cfg->total_dlevents);
} else
@@ -200,7 +200,7 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
for(i=0; i<cfg->total_dlevents; i++) {
if(feof(instream)) break;
- if((cfg->dlevent[i]=(dlevent_t *)MALLOC(sizeof(dlevent_t)))==NULL)
+ if((cfg->dlevent[i]=(dlevent_t *)malloc(sizeof(dlevent_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(dlevent_t));
memset(cfg->dlevent[i],0,sizeof(dlevent_t));
get_str(cfg->dlevent[i]->ext,instream);
@@ -222,14 +222,14 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_prots,instream);
if(cfg->total_prots) {
- if((cfg->prot=(prot_t **)MALLOC(sizeof(prot_t *)*cfg->total_prots))==NULL)
+ if((cfg->prot=(prot_t **)malloc(sizeof(prot_t *)*cfg->total_prots))==NULL)
return allocerr(instream,error,offset,fname,sizeof(prot_t*)*cfg->total_prots);
} else
cfg->prot=NULL;
for(i=0;i<cfg->total_prots;i++) {
if(feof(instream)) break;
- if((cfg->prot[i]=(prot_t *)MALLOC(sizeof(prot_t)))==NULL)
+ if((cfg->prot[i]=(prot_t *)malloc(sizeof(prot_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(prot_t));
memset(cfg->prot[i],0,sizeof(prot_t));
@@ -257,7 +257,7 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
get_int(cfg->altpaths,instream);
if(cfg->altpaths) {
- if((cfg->altpath=(char **)MALLOC(sizeof(char *)*cfg->altpaths))==NULL)
+ if((cfg->altpath=(char **)malloc(sizeof(char *)*cfg->altpaths))==NULL)
return allocerr(instream,error,offset,fname,sizeof(char *)*cfg->altpaths);
} else
cfg->altpath=NULL;
@@ -268,7 +268,7 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
offset+=LEN_DIR+1;
backslash(str);
j=LEN_DIR+1;
- if((cfg->altpath[i]=(char *)MALLOC(j))==NULL)
+ if((cfg->altpath[i]=(char *)malloc(j))==NULL)
return allocerr(instream,error,offset,fname,j);
memset(cfg->altpath[i],0,j);
strcpy(cfg->altpath[i],str);
@@ -285,14 +285,14 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_libs,instream);
if(cfg->total_libs) {
- if((cfg->lib=(lib_t **)MALLOC(sizeof(lib_t *)*cfg->total_libs))==NULL)
+ if((cfg->lib=(lib_t **)malloc(sizeof(lib_t *)*cfg->total_libs))==NULL)
return allocerr(instream,error,offset,fname,sizeof(lib_t *)*cfg->total_libs);
} else
cfg->lib=NULL;
for(i=0;i<cfg->total_libs;i++) {
if(feof(instream)) break;
- if((cfg->lib[i]=(lib_t *)MALLOC(sizeof(lib_t)))==NULL)
+ if((cfg->lib[i]=(lib_t *)malloc(sizeof(lib_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(lib_t));
memset(cfg->lib[i],0,sizeof(lib_t));
cfg->lib[i]->offline_dir=INVALID_DIR;
@@ -325,14 +325,14 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_dirs,instream);
if(cfg->total_dirs) {
- if((cfg->dir=(dir_t **)MALLOC(sizeof(dir_t *)*(cfg->total_dirs+1)))==NULL)
+ if((cfg->dir=(dir_t **)malloc(sizeof(dir_t *)*(cfg->total_dirs+1)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(dir_t *)*(cfg->total_dirs+1));
} else
cfg->dir=NULL;
for(i=0;i<cfg->total_dirs;i++) {
if(feof(instream)) break;
- if((cfg->dir[i]=(dir_t *)MALLOC(sizeof(dir_t)))==NULL)
+ if((cfg->dir[i]=(dir_t *)malloc(sizeof(dir_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(dir_t));
memset(cfg->dir[i],0,sizeof(dir_t));
@@ -395,14 +395,14 @@ BOOL read_file_cfg(scfg_t* cfg, char* error)
if(cfg->total_txtsecs) {
- if((cfg->txtsec=(txtsec_t **)MALLOC(sizeof(txtsec_t *)*cfg->total_txtsecs))==NULL)
+ if((cfg->txtsec=(txtsec_t **)malloc(sizeof(txtsec_t *)*cfg->total_txtsecs))==NULL)
return allocerr(instream,error,offset,fname,sizeof(txtsec_t *)*cfg->total_txtsecs);
} else
cfg->txtsec=NULL;
for(i=0;i<cfg->total_txtsecs;i++) {
if(feof(instream)) break;
- if((cfg->txtsec[i]=(txtsec_t *)MALLOC(sizeof(txtsec_t)))==NULL)
+ if((cfg->txtsec[i]=(txtsec_t *)malloc(sizeof(txtsec_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(txtsec_t));
memset(cfg->txtsec[i],0,sizeof(txtsec_t));
@@ -444,14 +444,14 @@ BOOL read_xtrn_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_swaps,instream);
if(cfg->total_swaps) {
- if((cfg->swap=(swap_t **)MALLOC(sizeof(swap_t *)*cfg->total_swaps))==NULL)
+ if((cfg->swap=(swap_t **)malloc(sizeof(swap_t *)*cfg->total_swaps))==NULL)
return allocerr(instream,error,offset,fname,sizeof(swap_t *)*cfg->total_swaps);
} else
cfg->swap=NULL;
for(i=0;i<cfg->total_swaps;i++) {
if(feof(instream)) break;
- if((cfg->swap[i]=(swap_t *)MALLOC(sizeof(swap_t)))==NULL)
+ if((cfg->swap[i]=(swap_t *)malloc(sizeof(swap_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(swap_t));
get_str(cfg->swap[i]->cmd,instream);
}
@@ -464,14 +464,14 @@ BOOL read_xtrn_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_xedits,instream);
if(cfg->total_xedits) {
- if((cfg->xedit=(xedit_t **)MALLOC(sizeof(xedit_t *)*cfg->total_xedits))==NULL)
+ if((cfg->xedit=(xedit_t **)malloc(sizeof(xedit_t *)*cfg->total_xedits))==NULL)
return allocerr(instream,error,offset,fname,sizeof(xedit_t *)*cfg->total_xedits);
} else
cfg->xedit=NULL;
for(i=0;i<cfg->total_xedits;i++) {
if(feof(instream)) break;
- if((cfg->xedit[i]=(xedit_t *)MALLOC(sizeof(xedit_t)))==NULL)
+ if((cfg->xedit[i]=(xedit_t *)malloc(sizeof(xedit_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(xedit_t));
memset(cfg->xedit[i],0,sizeof(xedit_t));
@@ -499,7 +499,7 @@ BOOL read_xtrn_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_xtrnsecs,instream);
if(cfg->total_xtrnsecs) {
- if((cfg->xtrnsec=(xtrnsec_t **)MALLOC(sizeof(xtrnsec_t *)*cfg->total_xtrnsecs))
+ if((cfg->xtrnsec=(xtrnsec_t **)malloc(sizeof(xtrnsec_t *)*cfg->total_xtrnsecs))
==NULL)
return allocerr(instream,error,offset,fname,sizeof(xtrnsec_t *)*cfg->total_xtrnsecs);
} else
@@ -507,7 +507,7 @@ BOOL read_xtrn_cfg(scfg_t* cfg, char* error)
for(i=0;i<cfg->total_xtrnsecs;i++) {
if(feof(instream)) break;
- if((cfg->xtrnsec[i]=(xtrnsec_t *)MALLOC(sizeof(xtrnsec_t)))==NULL)
+ if((cfg->xtrnsec[i]=(xtrnsec_t *)malloc(sizeof(xtrnsec_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(xtrnsec_t));
memset(cfg->xtrnsec[i],0,sizeof(xtrnsec_t));
@@ -529,14 +529,14 @@ BOOL read_xtrn_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_xtrns,instream);
if(cfg->total_xtrns) {
- if((cfg->xtrn=(xtrn_t **)MALLOC(sizeof(xtrn_t *)*cfg->total_xtrns))==NULL)
+ if((cfg->xtrn=(xtrn_t **)malloc(sizeof(xtrn_t *)*cfg->total_xtrns))==NULL)
return allocerr(instream,error,offset,fname,sizeof(xtrn_t *)*cfg->total_xtrns);
} else
cfg->xtrn=NULL;
for(i=0;i<cfg->total_xtrns;i++) {
if(feof(instream)) break;
- if((cfg->xtrn[i]=(xtrn_t *)MALLOC(sizeof(xtrn_t)))==NULL)
+ if((cfg->xtrn[i]=(xtrn_t *)malloc(sizeof(xtrn_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(xtrn_t));
memset(cfg->xtrn[i],0,sizeof(xtrn_t));
@@ -570,14 +570,14 @@ BOOL read_xtrn_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_events,instream);
if(cfg->total_events) {
- if((cfg->event=(event_t **)MALLOC(sizeof(event_t *)*cfg->total_events))==NULL)
+ if((cfg->event=(event_t **)malloc(sizeof(event_t *)*cfg->total_events))==NULL)
return allocerr(instream,error,offset,fname,sizeof(event_t *)*cfg->total_events);
} else
cfg->event=NULL;
for(i=0;i<cfg->total_events;i++) {
if(feof(instream)) break;
- if((cfg->event[i]=(event_t *)MALLOC(sizeof(event_t)))==NULL)
+ if((cfg->event[i]=(event_t *)malloc(sizeof(event_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(event_t));
memset(cfg->event[i],0,sizeof(event_t));
@@ -603,14 +603,14 @@ BOOL read_xtrn_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_natvpgms,instream);
if(cfg->total_natvpgms) {
- if((cfg->natvpgm=(natvpgm_t **)MALLOC(sizeof(natvpgm_t *)*cfg->total_natvpgms))==NULL)
+ if((cfg->natvpgm=(natvpgm_t **)malloc(sizeof(natvpgm_t *)*cfg->total_natvpgms))==NULL)
return allocerr(instream,error,offset,fname,sizeof(natvpgm_t *)*cfg->total_natvpgms);
} else
cfg->natvpgm=NULL;
for(i=0;i<cfg->total_natvpgms;i++) {
if(feof(instream)) break;
- if((cfg->natvpgm[i]=(natvpgm_t *)MALLOC(sizeof(natvpgm_t)))==NULL)
+ if((cfg->natvpgm[i]=(natvpgm_t *)malloc(sizeof(natvpgm_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(natvpgm_t));
get_str(cfg->natvpgm[i]->name,instream);
cfg->natvpgm[i]->misc=0;
@@ -628,14 +628,14 @@ BOOL read_xtrn_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_hotkeys,instream);
if(cfg->total_hotkeys) {
- if((cfg->hotkey=(hotkey_t **)MALLOC(sizeof(hotkey_t *)*cfg->total_hotkeys))==NULL)
+ if((cfg->hotkey=(hotkey_t **)malloc(sizeof(hotkey_t *)*cfg->total_hotkeys))==NULL)
return allocerr(instream,error,offset,fname,sizeof(hotkey_t *)*cfg->total_hotkeys);
} else
cfg->hotkey=NULL;
for(i=0;i<cfg->total_hotkeys;i++) {
if(feof(instream)) break;
- if((cfg->hotkey[i]=(hotkey_t *)MALLOC(sizeof(hotkey_t)))==NULL)
+ if((cfg->hotkey[i]=(hotkey_t *)malloc(sizeof(hotkey_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(hotkey_t));
memset(cfg->hotkey[i],0,sizeof(hotkey_t));
@@ -680,14 +680,14 @@ BOOL read_chat_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_gurus,instream);
if(cfg->total_gurus) {
- if((cfg->guru=(guru_t **)MALLOC(sizeof(guru_t *)*cfg->total_gurus))==NULL)
+ if((cfg->guru=(guru_t **)malloc(sizeof(guru_t *)*cfg->total_gurus))==NULL)
return allocerr(instream,error,offset,fname,sizeof(guru_t *)*cfg->total_gurus);
} else
cfg->guru=NULL;
for(i=0;i<cfg->total_gurus;i++) {
if(feof(instream)) break;
- if((cfg->guru[i]=(guru_t *)MALLOC(sizeof(guru_t)))==NULL)
+ if((cfg->guru[i]=(guru_t *)malloc(sizeof(guru_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(guru_t));
memset(cfg->guru[i],0,sizeof(guru_t));
@@ -710,14 +710,14 @@ BOOL read_chat_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_actsets,instream);
if(cfg->total_actsets) {
- if((cfg->actset=(actset_t **)MALLOC(sizeof(actset_t *)*cfg->total_actsets))==NULL)
+ if((cfg->actset=(actset_t **)malloc(sizeof(actset_t *)*cfg->total_actsets))==NULL)
return allocerr(instream,error,offset,fname,sizeof(actset_t *)*cfg->total_actsets);
} else
cfg->actset=NULL;
for(i=0;i<cfg->total_actsets;i++) {
if(feof(instream)) break;
- if((cfg->actset[i]=(actset_t *)MALLOC(sizeof(actset_t)))==NULL)
+ if((cfg->actset[i]=(actset_t *)malloc(sizeof(actset_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(actset_t));
get_str(cfg->actset[i]->name,instream);
}
@@ -731,7 +731,7 @@ BOOL read_chat_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_chatacts,instream);
if(cfg->total_chatacts) {
- if((cfg->chatact=(chatact_t **)MALLOC(sizeof(chatact_t *)*cfg->total_chatacts))
+ if((cfg->chatact=(chatact_t **)malloc(sizeof(chatact_t *)*cfg->total_chatacts))
==NULL)
return allocerr(instream,error,offset,fname,sizeof(chatact_t *)*cfg->total_chatacts);
} else
@@ -739,7 +739,7 @@ BOOL read_chat_cfg(scfg_t* cfg, char* error)
for(i=0;i<cfg->total_chatacts;i++) {
if(feof(instream)) break;
- if((cfg->chatact[i]=(chatact_t *)MALLOC(sizeof(chatact_t)))==NULL)
+ if((cfg->chatact[i]=(chatact_t *)malloc(sizeof(chatact_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(chatact_t));
memset(cfg->chatact[i],0,sizeof(chatact_t));
@@ -760,14 +760,14 @@ BOOL read_chat_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_chans,instream);
if(cfg->total_chans) {
- if((cfg->chan=(chan_t **)MALLOC(sizeof(chan_t *)*cfg->total_chans))==NULL)
+ if((cfg->chan=(chan_t **)malloc(sizeof(chan_t *)*cfg->total_chans))==NULL)
return allocerr(instream,error,offset,fname,sizeof(chan_t *)*cfg->total_chans);
} else
cfg->chan=NULL;
for(i=0;i<cfg->total_chans;i++) {
if(feof(instream)) break;
- if((cfg->chan[i]=(chan_t *)MALLOC(sizeof(chan_t)))==NULL)
+ if((cfg->chan[i]=(chan_t *)malloc(sizeof(chan_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(chan_t));
memset(cfg->chan[i],0,sizeof(chan_t));
@@ -795,14 +795,14 @@ BOOL read_chat_cfg(scfg_t* cfg, char* error)
get_int(cfg->total_pages,instream);
if(cfg->total_pages) {
- if((cfg->page=(page_t **)MALLOC(sizeof(page_t *)*cfg->total_pages))==NULL)
+ if((cfg->page=(page_t **)malloc(sizeof(page_t *)*cfg->total_pages))==NULL)
return allocerr(instream,error,offset,fname,sizeof(page_t *)*cfg->total_pages);
} else
cfg->page=NULL;
for(i=0;i<cfg->total_pages;i++) {
if(feof(instream)) break;
- if((cfg->page[i]=(page_t *)MALLOC(sizeof(page_t)))==NULL)
+ if((cfg->page[i]=(page_t *)malloc(sizeof(page_t)))==NULL)
return allocerr(instream,error,offset,fname,sizeof(page_t));
memset(cfg->page[i],0,sizeof(page_t));
diff --git a/src/sbbs3/smbactiv.c b/src/sbbs3/smbactiv.c
index 775594f6d9..33bcf81960 100644
--- a/src/sbbs3/smbactiv.c
+++ b/src/sbbs3/smbactiv.c
@@ -24,7 +24,7 @@ if(smb_getmsgidx(&smb,&msg)) /* Get first message index */
return(msg.idx.number);
}
-long lputs(char FAR16 *str)
+long lputs(char *str)
{
char tmp[256];
int i,j,k;
@@ -127,7 +127,7 @@ fprintf(stderr,"\nSMBACTIV Version %s (%s) - Synchronet Message Base Activity "
if(glob(str, GLOB_MARK, NULL, &gl)) {
lprintf("Unable to find any user pointer files.\n");
globfree(&gl);
- FREE(sub_status);
+ free(sub_status);
return(1); }
j=0;
diff --git a/src/sbbs3/smbutil.c b/src/sbbs3/smbutil.c
index 617c477604..36185d32ef 100644
--- a/src/sbbs3/smbutil.c
+++ b/src/sbbs3/smbutil.c
@@ -624,7 +624,7 @@ void maint(void)
ulong l,m,n,f,flagged=0;
time_t now;
smbmsg_t msg;
- idxrec_t HUGE16 *idx;
+ idxrec_t *idx;
printf("Maintaining %s\r\n",smb.file);
now=time(NULL);
@@ -647,7 +647,7 @@ void maint(void)
return;
}
printf("Loading index...\n");
- if((idx=(idxrec_t *)LMALLOC(sizeof(idxrec_t)*smb.status.total_msgs))
+ if((idx=(idxrec_t *)malloc(sizeof(idxrec_t)*smb.status.total_msgs))
==NULL) {
smb_unlocksmbhdr(&smb);
fprintf(errfp,"\n%s!Error allocating %lu bytes of memory\n"
@@ -714,7 +714,7 @@ void maint(void)
}
if(!flagged) { /* No messages to delete */
- LFREE(idx);
+ free(idx);
smb_unlocksmbhdr(&smb);
return;
}
@@ -798,7 +798,7 @@ void maint(void)
printf("\nDone.\n\n");
fflush(smb.sid_fp);
- LFREE(idx);
+ free(idx);
smb.status.total_msgs-=flagged;
smb_putstatus(&smb);
smb_unlocksmbhdr(&smb);
@@ -1000,7 +1000,7 @@ void packmsgs(ulong packable)
setvbuf(tmp_shd,NULL,_IOFBF,2*1024);
setvbuf(tmp_sid,NULL,_IOFBF,2*1024);
if(!(smb.status.attr&SMB_HYPERALLOC)
- && (datoffset=(datoffset_t *)LMALLOC(sizeof(datoffset_t)*smb.status.total_msgs))
+ && (datoffset=(datoffset_t *)malloc(sizeof(datoffset_t)*smb.status.total_msgs))
==NULL) {
smb_unlocksmbhdr(&smb);
smb_close_ha(&smb);
@@ -1147,7 +1147,7 @@ void packmsgs(ulong packable)
}
if(datoffset)
- LFREE(datoffset);
+ free(datoffset);
if(!(smb.status.attr&SMB_HYPERALLOC)) {
smb_close_ha(&smb);
smb_close_da(&smb);
@@ -1277,7 +1277,7 @@ void delmsgs(void)
/****************************************************************************/
void readmsgs(ulong start)
{
- char HUGE16 *inbuf;
+ char *inbuf;
int i,done=0,domsg=1;
smbmsg_t msg;
@@ -1319,7 +1319,7 @@ void readmsgs(ulong start)
if((inbuf=smb_getmsgtxt(&smb,&msg,GETMSGTXT_ALL))!=NULL) {
printf("%s",inbuf);
- FREE(inbuf);
+ free(inbuf);
}
i=smb_unlockmsghdr(&smb,&msg);
diff --git a/src/sbbs3/sortdir.cpp b/src/sbbs3/sortdir.cpp
index 70ca52becd..d7cc1089f7 100644
--- a/src/sbbs3/sortdir.cpp
+++ b/src/sbbs3/sortdir.cpp
@@ -74,42 +74,42 @@ void sbbs_t::resort(uint dirnum)
return; }
ixblen=filelength(ixbfile);
datlen=filelength(datfile);
- if((ixbbuf=(uchar *)MALLOC(ixblen))==NULL) {
+ if((ixbbuf=(uchar *)malloc(ixblen))==NULL) {
close(ixbfile);
close(datfile);
errormsg(WHERE,ERR_ALLOC,ixbfname,ixblen);
return; }
- if((datbuf=(uchar *)MALLOC(datlen))==NULL) {
+ if((datbuf=(uchar *)malloc(datlen))==NULL) {
close(ixbfile);
close(datfile);
- FREE((char *)ixbbuf);
+ free((char *)ixbbuf);
errormsg(WHERE,ERR_ALLOC,datfname,datlen);
return; }
if(lread(ixbfile,ixbbuf,ixblen)!=ixblen) {
close(ixbfile);
close(datfile);
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
errormsg(WHERE,ERR_READ,ixbfname,ixblen);
return; }
if(lread(datfile,datbuf,datlen)!=datlen) {
close(ixbfile);
close(datfile);
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
errormsg(WHERE,ERR_READ,datfname,datlen);
return; }
close(ixbfile);
close(datfile);
if((ixbfile=nopen(ixbfname,O_WRONLY|O_TRUNC))==-1) {
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
errormsg(WHERE,ERR_OPEN,ixbfname,O_WRONLY|O_TRUNC);
return; }
if((datfile=nopen(datfname,O_WRONLY|O_TRUNC))==-1) {
close(ixbfile);
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
errormsg(WHERE,ERR_OPEN,datfname,O_WRONLY|O_TRUNC);
return; }
for(l=0,i=0;l<ixblen && i<MAX_FILES;l+=F_IXBSIZE,i++)
@@ -135,16 +135,16 @@ void sbbs_t::resort(uint dirnum)
if((exbfile=nopen(exbfname,O_RDWR|O_CREAT))==-1) {
close(ixbfile);
close(datfile);
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
errormsg(WHERE,ERR_OPEN,exbfname,O_RDWR|O_CREAT);
return; }
if((txbfile=nopen(txbfname,O_RDWR|O_CREAT))==-1) {
close(exbfile);
close(datfile);
close(exbfile);
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
errormsg(WHERE,ERR_OPEN,txbfname,O_RDWR|O_CREAT);
return; }
@@ -180,8 +180,8 @@ void sbbs_t::resort(uint dirnum)
rename(txbfname,exbfname);
if(!flength(exbfname))
remove(exbfname);
- FREE((char *)ixbbuf);
- FREE((char *)datbuf);
+ free((char *)ixbbuf);
+ free((char *)datbuf);
if(ixblen/F_IXBSIZE==datlen/F_LEN)
bputs(text[Sorted]);
else
diff --git a/src/sbbs3/str.cpp b/src/sbbs3/str.cpp
index 77a4b3f462..cd8fb79c6e 100644
--- a/src/sbbs3/str.cpp
+++ b/src/sbbs3/str.cpp
@@ -87,10 +87,10 @@ void sbbs_t::userlist(long mode)
continue;
}
if(sort) {
- if((line[j]=(char *)MALLOC(128))==0) {
+ if((line[j]=(char *)malloc(128))==0) {
errormsg(WHERE,ERR_ALLOC,nulstr,83);
for(i=0;i<j;i++)
- FREE(line[i]);
+ free(line[i]);
return;
}
sprintf(name,"%s #%d",user.alias,i);
@@ -111,7 +111,7 @@ void sbbs_t::userlist(long mode)
if(i<=k) { /* aborted */
if(sort)
for(i=0;i<j;i++)
- FREE(line[i]);
+ free(line[i]);
return;
}
if(!sort) {
@@ -130,7 +130,7 @@ void sbbs_t::userlist(long mode)
for(i=0;i<j && !msgabort();i++)
bputs(line[i]);
for(i=0;i<j;i++)
- FREE(line[i]);
+ free(line[i]);
}
/****************************************************************************/
@@ -138,7 +138,7 @@ void sbbs_t::userlist(long mode)
/****************************************************************************/
void sbbs_t::sif(char *fname, char *answers, long len)
{
- char str[256],tmplt[256],HUGE16 *buf;
+ char str[256],tmplt[256],*buf;
uint t,max,min,mode,cr;
int file;
long length,l=0,m,top,a=0;
@@ -150,7 +150,7 @@ void sbbs_t::sif(char *fname, char *answers, long len)
return;
}
length=filelength(file);
- if((buf=(char *)MALLOC(length))==0) {
+ if((buf=(char *)malloc(length))==0) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,length);
answers[0]=0;
@@ -298,7 +298,7 @@ void sbbs_t::sif(char *fname, char *answers, long len)
}
}
answers[a]=0;
- FREE((char *)buf);
+ free((char *)buf);
}
/****************************************************************************/
@@ -306,7 +306,7 @@ void sbbs_t::sif(char *fname, char *answers, long len)
/****************************************************************************/
void sbbs_t::sof(char *fname, char *answers, long len)
{
- char str[256],HUGE16 *buf,max,min,cr;
+ char str[256],*buf,max,min,cr;
int file;
long length,l=0,m,a=0;
@@ -317,7 +317,7 @@ void sbbs_t::sof(char *fname, char *answers, long len)
return;
}
length=filelength(file);
- if((buf=(char *)MALLOC(length))==0) {
+ if((buf=(char *)malloc(length))==0) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,length);
answers[0]=0;
@@ -425,7 +425,7 @@ void sbbs_t::sof(char *fname, char *answers, long len)
a+=max+2;
}
}
- FREE((char *)buf);
+ free((char *)buf);
}
/****************************************************************************/
@@ -436,20 +436,20 @@ void sbbs_t::create_sif_dat(char *siffile, char *datfile)
char *buf;
int file;
- if((buf=(char *)MALLOC(SIF_MAXBUF))==NULL) {
+ if((buf=(char *)malloc(SIF_MAXBUF))==NULL) {
errormsg(WHERE,ERR_ALLOC,siffile,SIF_MAXBUF);
return;
}
memset(buf,SIF_MAXBUF,0); /* initialize to null */
sif(siffile,buf,SIF_MAXBUF);
if((file=nopen(datfile,O_WRONLY|O_TRUNC|O_CREAT))==-1) {
- FREE(buf);
+ free(buf);
errormsg(WHERE,ERR_OPEN,datfile,O_WRONLY|O_TRUNC|O_CREAT);
return;
}
write(file,buf,strlen(buf));
close(file);
- FREE(buf);
+ free(buf);
}
/****************************************************************************/
@@ -470,7 +470,7 @@ void sbbs_t::read_sif_dat(char *siffile, char *datfile)
close(file);
return;
}
- if((buf=(char *)MALLOC(length))==NULL) {
+ if((buf=(char *)malloc(length))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,datfile,length);
return;
@@ -478,7 +478,7 @@ void sbbs_t::read_sif_dat(char *siffile, char *datfile)
read(file,buf,length);
close(file);
sof(siffile,buf,length);
- FREE(buf);
+ free(buf);
}
/****************************************************************************/
diff --git a/src/sbbs3/text_sec.cpp b/src/sbbs3/text_sec.cpp
index 577766b1b9..88d4ab2469 100644
--- a/src/sbbs3/text_sec.cpp
+++ b/src/sbbs3/text_sec.cpp
@@ -97,7 +97,7 @@ int sbbs_t::text_sec()
if(!fgets(str,81,stream))
break;
str[strlen(str)-2]=0; /* chop off CRLF */
- if((file[j]=(char *)MALLOC(strlen(str)+1))==NULL) {
+ if((file[j]=(char *)malloc(strlen(str)+1))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,strlen(str)+1);
continue; }
strcpy(file[j],str);
@@ -115,14 +115,14 @@ int sbbs_t::text_sec()
i=getkeys(str,j);
if(!(i&0x80000000L)) { /* no file number */
for(l=0;l<j;l++)
- FREE(file[l]);
+ free(file[l]);
if((i=='E' || i=='R') && !j)
continue; }
if(i=='Q' || !i)
break;
if(i==-1) { /* ctrl-c */
for(i=0;i<j;i++)
- FREE(file[i]);
+ free(file[i]);
return(0); }
if(i=='?') /* ? means re-list */
continue;
@@ -163,7 +163,7 @@ int sbbs_t::text_sec()
fgets(tmp,81,stream);
fgets(tmp,81,stream); }
l=ftell(stream);
- if((buf=(char *)MALLOC(length-l))==NULL) {
+ if((buf=(char *)malloc(length-l))==NULL) {
fclose(stream);
errormsg(WHERE,ERR_ALLOC,str,length-l);
return(0); }
@@ -173,7 +173,7 @@ int sbbs_t::text_sec()
fputs(addstr,stream);
fwrite(buf,1,length-l,stream);
fclose(stream);
- FREE(buf);
+ free(buf);
continue; }
if(i=='R' || i=='E') { /* Remove or Edit text file */
ch=(char)i;
@@ -227,7 +227,7 @@ int sbbs_t::text_sec()
pause();
sys_status&=~SS_ABORT;
for(i=0;i<j;i++)
- FREE(file[i]); } }
+ free(file[i]); } }
return(0);
}
diff --git a/src/sbbs3/tmp_xfer.cpp b/src/sbbs3/tmp_xfer.cpp
index 07d17b688b..c7cba82f2d 100644
--- a/src/sbbs3/tmp_xfer.cpp
+++ b/src/sbbs3/tmp_xfer.cpp
@@ -62,7 +62,7 @@ void sbbs_t::temp_xfer()
/*************************************/
/* Create TEMP directory information */
/*************************************/
- if((cfg.dir[dirnum]=(dir_t *)MALLOC(sizeof(dir_t)))==0) {
+ if((cfg.dir[dirnum]=(dir_t *)malloc(sizeof(dir_t)))==0) {
errormsg(WHERE,ERR_ALLOC,"temp_dir",sizeof(dir_t));
return; }
memset(cfg.dir[dirnum],0,sizeof(dir_t));
@@ -261,7 +261,7 @@ void sbbs_t::temp_xfer()
break; }
if(sys_status&SS_ABORT)
break; }
- FREE(cfg.dir[dirnum]);
+ free(cfg.dir[dirnum]);
cfg.total_dirs--;
}
diff --git a/src/sbbs3/uedit/uedit.c b/src/sbbs3/uedit/uedit.c
index bd1e6b8f37..74e565c3a0 100644
--- a/src/sbbs3/uedit/uedit.c
+++ b/src/sbbs3/uedit/uedit.c
@@ -240,10 +240,10 @@ int edit_terminal(scfg_t *cfg, user_t *user)
char **opt;
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -339,10 +339,10 @@ int edit_logon(scfg_t *cfg, user_t *user)
char **opt;
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -403,10 +403,10 @@ int edit_chat(scfg_t *cfg, user_t *user)
char **opt;
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -461,7 +461,7 @@ int edit_shell(scfg_t *cfg, user_t *user)
int i,j;
char **opt;
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
@@ -494,10 +494,10 @@ int edit_cmd(scfg_t *cfg, user_t *user)
char **opt;
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -533,7 +533,7 @@ int edit_xedit(scfg_t *cfg, user_t *user)
int i,j;
char **opt;
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
getuserdat(cfg,user);
@@ -571,10 +571,10 @@ int edit_msgopts(scfg_t *cfg, user_t *user)
char **opt;
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -616,7 +616,7 @@ int edit_tmpqwktype(scfg_t *cfg, user_t *user)
int j=0;
char **opt;
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
getuserdat(cfg,user);
@@ -659,10 +659,10 @@ int edit_qwk(scfg_t *cfg, user_t *user)
char **opt;
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -777,7 +777,7 @@ int edit_proto(scfg_t *cfg, user_t *user)
int j=0;
char **opt;
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
getuserdat(cfg,user);
@@ -822,10 +822,10 @@ int edit_fileopts(scfg_t *cfg, user_t *user)
char **opt;
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -997,10 +997,10 @@ int edit_stats(scfg_t *cfg, user_t *user)
char str[256];
time_t temptime,temptime2;
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -1281,10 +1281,10 @@ int edit_security(scfg_t *cfg, user_t *user)
char **opt;
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -1450,10 +1450,10 @@ int edit_personal(scfg_t *cfg, user_t *user)
char onech[2];
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
j=0;
@@ -1609,10 +1609,10 @@ int edit_user(scfg_t *cfg, int usernum)
user_t user;
char str[256];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
user.number=usernum;
@@ -1694,7 +1694,7 @@ int finduser(scfg_t *cfg, user_t *user)
struct user_list **opt;
int done=0;
- if((opt=(struct user_list **)MALLOC(sizeof(struct user_list *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(struct user_list **)malloc(sizeof(struct user_list *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(struct user_list *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
opt[i]=NULL;
@@ -1744,7 +1744,7 @@ int getuser(scfg_t *cfg, user_t *user, char* str)
struct user_list **opt;
int done=0;
- if((opt=(struct user_list **)MALLOC(sizeof(struct user_list *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(struct user_list **)malloc(sizeof(struct user_list *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(struct user_list *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
opt[i]=NULL;
@@ -2047,16 +2047,16 @@ int main(int argc, char** argv) {
exit(1);
}
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
- if((mopt=(char **)MALLOC(sizeof(char *)*MAX_OPTS))==NULL)
+ if((mopt=(char **)malloc(sizeof(char *)*MAX_OPTS))==NULL)
allocfail(sizeof(char *)*MAX_OPTS);
for(i=0;i<MAX_OPTS;i++)
- if((mopt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((mopt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
sprintf(title,"Synchronet User Editor %s-%s",revision,PLATFORM_DESC);
diff --git a/src/sbbs3/umonitor/chat.c b/src/sbbs3/umonitor/chat.c
index e606c2b20d..3af08b8df0 100644
--- a/src/sbbs3/umonitor/chat.c
+++ b/src/sbbs3/umonitor/chat.c
@@ -167,7 +167,7 @@ int chat(scfg_t *cfg, int nodenum, node_t *node, box_t *boxch, void(*timecallbac
return(-1);
}
- if((p=(char *)MALLOC(PCHAT_LEN))==NULL) {
+ if((p=(char *)malloc(PCHAT_LEN))==NULL) {
close(in);
close(out);
free(buf);
@@ -176,7 +176,7 @@ int chat(scfg_t *cfg, int nodenum, node_t *node, box_t *boxch, void(*timecallbac
memset(p,0,PCHAT_LEN);
write(in,p,PCHAT_LEN);
write(out,p,PCHAT_LEN);
- FREE(p);
+ free(p);
lseek(in,0,SEEK_SET);
lseek(out,0,SEEK_SET);
diff --git a/src/sbbs3/umonitor/umonitor.c b/src/sbbs3/umonitor/umonitor.c
index fc349e0020..b89023c69f 100644
--- a/src/sbbs3/umonitor/umonitor.c
+++ b/src/sbbs3/umonitor/umonitor.c
@@ -119,10 +119,10 @@ void node_toggles(scfg_t *cfg,int nodenum) {
node_t node;
int save=0;
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
i=0;
@@ -425,7 +425,7 @@ int view_log(char *filename, char *title)
if(fexist(filename)) {
if((buffile=sopen(filename,O_RDONLY,SH_DENYWR))>=0) {
j=filelength(buffile);
- if((buf=(char *)MALLOC(j+1))!=NULL) {
+ if((buf=(char *)malloc(j+1))!=NULL) {
read(buffile,buf,j);
close(buffile);
*(buf+j)=0;
@@ -459,10 +459,10 @@ int view_logs(scfg_t *cfg)
localtime_r(&now,&tm);
now -= 60*60*24;
localtime_r(&now,&tm_yest);
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
i=0;
@@ -564,10 +564,10 @@ int qwk_callouts(scfg_t *cfg)
return(1);
}
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
@@ -604,10 +604,10 @@ int run_events(scfg_t *cfg)
int i,j;
char str[1024];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
if(cfg->total_events<1) {
@@ -647,10 +647,10 @@ int recycle_servers(scfg_t *cfg)
char **opt;
int i=0;
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
i=0;
@@ -720,10 +720,10 @@ int edit_cfg(scfg_t *cfg)
char cmd[1024];
char editcmd[1024];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
i=0;
@@ -769,10 +769,10 @@ int edit_can(scfg_t *cfg)
char cmd[1024];
char editcmd[1024];
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
i=0;
@@ -969,16 +969,16 @@ int main(int argc, char** argv) {
exit(1);
}
- if((opt=(char **)MALLOC(sizeof(char *)*(MAX_OPTS+1)))==NULL)
+ if((opt=(char **)malloc(sizeof(char *)*(MAX_OPTS+1)))==NULL)
allocfail(sizeof(char *)*(MAX_OPTS+1));
for(i=0;i<(MAX_OPTS+1);i++)
- if((opt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((opt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
- if((mopt=(char **)MALLOC(sizeof(char *)*MAX_OPTS))==NULL)
+ if((mopt=(char **)malloc(sizeof(char *)*MAX_OPTS))==NULL)
allocfail(sizeof(char *)*MAX_OPTS);
for(i=0;i<MAX_OPTS;i++)
- if((mopt[i]=(char *)MALLOC(MAX_OPLN))==NULL)
+ if((mopt[i]=(char *)malloc(MAX_OPLN))==NULL)
allocfail(MAX_OPLN);
sprintf(title,"Synchronet UNIX Monitor %s-%s",revision,PLATFORM_DESC);
diff --git a/src/sbbs3/userdat.c b/src/sbbs3/userdat.c
index 3e48827cb3..361c60cbc3 100644
--- a/src/sbbs3/userdat.c
+++ b/src/sbbs3/userdat.c
@@ -1125,7 +1125,7 @@ int DLLCALL putsmsg(scfg_t* cfg, int usernumber, char *strin)
/****************************************************************************/
char* DLLCALL getsmsg(scfg_t* cfg, int usernumber)
{
- char str[MAX_PATH+1], HUGE16 *buf;
+ char str[MAX_PATH+1], *buf;
int i;
int file;
long length;
diff --git a/src/sbbs3/writemsg.cpp b/src/sbbs3/writemsg.cpp
index 998968e379..d3b4115b62 100644
--- a/src/sbbs3/writemsg.cpp
+++ b/src/sbbs3/writemsg.cpp
@@ -528,7 +528,7 @@ void sbbs_t::removeline(char *str, char *str2, char num, char skip)
}
flen=filelength(file);
slen=strlen(str2);
- if((buf=(char *)MALLOC(flen))==NULL) {
+ if((buf=(char *)malloc(flen))==NULL) {
close(file);
errormsg(WHERE,ERR_ALLOC,str,flen);
return;
@@ -586,7 +586,7 @@ ulong sbbs_t::msgeditor(char *buf, char *top, char *title)
maxlines=cfg.level_linespermsg[useron.level];
- if((str=(char **)MALLOC(sizeof(char *)*(maxlines+1)))==NULL) {
+ if((str=(char **)malloc(sizeof(char *)*(maxlines+1)))==NULL) {
errormsg(WHERE,ERR_ALLOC,"msgeditor",sizeof(char *)*(maxlines+1));
return(0);
}
@@ -594,7 +594,7 @@ ulong sbbs_t::msgeditor(char *buf, char *top, char *title)
l=0;
while(l<m && lines<maxlines) {
msgabort(); /* to allow pausing */
- if((str[lines]=(char *)MALLOC(MAX_LINE_LEN))==NULL) {
+ if((str[lines]=(char *)malloc(MAX_LINE_LEN))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,MAX_LINE_LEN);
for(i=0;i<lines;i++)
free(str[i]);
@@ -654,7 +654,7 @@ ulong sbbs_t::msgeditor(char *buf, char *top, char *title)
while(online && !done) {
checkline();
if(line==lines) {
- if((str[line]=(char *)MALLOC(MAX_LINE_LEN))==NULL) {
+ if((str[line]=(char *)malloc(MAX_LINE_LEN))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,MAX_LINE_LEN);
for(i=0;i<lines;i++)
free(str[i]);
@@ -731,7 +731,7 @@ ulong sbbs_t::msgeditor(char *buf, char *top, char *title)
else {
for(line=lines;line>i;line--) /* move the pointers */
str[line]=str[line-1];
- if((str[i]=(char *)MALLOC(MAX_LINE_LEN))==NULL) {
+ if((str[i]=(char *)malloc(MAX_LINE_LEN))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,MAX_LINE_LEN);
for(i=0;i<lines;i++)
free(str[i]);
@@ -905,7 +905,7 @@ void sbbs_t::editfile(char *str)
}
return;
}
- if((buf=(char *)MALLOC(maxlines*MAX_LINE_LEN))==NULL) {
+ if((buf=(char *)malloc(maxlines*MAX_LINE_LEN))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,maxlines*MAX_LINE_LEN);
return;
}
@@ -1281,7 +1281,7 @@ bool sbbs_t::movemsg(smbmsg_t* msg, uint subnum)
newsub=usrsub[newgrp][newsub];
length=smb_getmsgdatlen(msg);
- if((buf=(char *)MALLOC(length))==NULL) {
+ if((buf=(char *)malloc(length))==NULL) {
errormsg(WHERE,ERR_ALLOC,smb.file,length);
return(false);
}
diff --git a/src/sbbs3/xtrn_sec.cpp b/src/sbbs3/xtrn_sec.cpp
index 27575faf17..0fdbfa5801 100644
--- a/src/sbbs3/xtrn_sec.cpp
+++ b/src/sbbs3/xtrn_sec.cpp
@@ -58,13 +58,13 @@ int sbbs_t::xtrn_sec()
return(1);
}
- if((usrxtrn=(uint *)MALLOC(cfg.total_xtrns*sizeof(int)))==NULL) {
+ if((usrxtrn=(uint *)malloc(cfg.total_xtrns*sizeof(int)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_xtrns);
return(1);
}
- if((usrxsec=(uint *)MALLOC(cfg.total_xtrnsecs*sizeof(int)))==NULL) {
+ if((usrxsec=(uint *)malloc(cfg.total_xtrnsecs*sizeof(int)))==NULL) {
errormsg(WHERE,ERR_ALLOC,nulstr,cfg.total_xtrnsecs);
- FREE(usrxtrn);
+ free(usrxtrn);
return(1);
}
@@ -74,8 +74,8 @@ int sbbs_t::xtrn_sec()
usrxsec[usrxsecs++]=i;
if(!usrxsecs) {
bputs(text[NoXtrnPrograms]);
- FREE(usrxtrn);
- FREE(usrxsec);
+ free(usrxtrn);
+ free(usrxsec);
return(1);
}
if(usrxsecs>1) {
@@ -105,8 +105,8 @@ int sbbs_t::xtrn_sec()
if(xsec>=cfg.total_xtrnsecs) {
bputs(text[NoXtrnPrograms]);
- FREE(usrxtrn);
- FREE(usrxsec);
+ free(usrxtrn);
+ free(usrxsec);
return(1);
}
@@ -187,8 +187,8 @@ int sbbs_t::xtrn_sec()
if(usrxsecs<2)
break;
}
- FREE(usrxtrn);
- FREE(usrxsec);
+ free(usrxtrn);
+ free(usrxsec);
return(0);
}
--
GitLab