Namespace madness to get it to compile with gcc 3.0. Ah, 2.95 works too ;)

This commit is contained in:
Jacobo Tarrío
2001-07-16 20:35:42 +00:00
parent 2f1bb70e33
commit 8c47abb153
111 changed files with 437 additions and 431 deletions

View File

@@ -254,7 +254,7 @@ void gareafile::GetAreasBBS(char* name, char* origin, char* options) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << areafile << endl;
std::cout << "* Reading " << areafile << std::endl;
bool firstline = true;

View File

@@ -110,7 +110,7 @@ public:
byte pmscanexcl : 1; // TRUE if listed with AREAPMSCANEXCL
byte pmscanincl : 1; // TRUE if listed with AREAPMSCANINCL
int setorigin(string& origin);
int setorigin(std::string& origin);
bool isfts1() const { return !!(msgbase & GMB_FTS1); }
bool isopus() const { return !!(msgbase & GMB_OPUS); }
@@ -146,10 +146,10 @@ public:
static int autoid;
Echo echoid; // Echo tag
Desc desc; // Area description
Path path; // Path to message area
string origin; // Origin
Echo echoid; // Echo tag
Desc desc; // Area description
Path path; // Path to message area
std::string origin; // Origin
AreaCfg() { reset(); }
~AreaCfg() { }
@@ -265,7 +265,7 @@ protected:
void ReadFMail116(FILE* fp, char* path, char* file, char* options);
#endif
#ifndef GCFG_NOFIDOCONF
bool ReadHPTLine(FILE* f, string* s, bool add=false, int state=0);
bool ReadHPTLine(FILE* f, std::string* s, bool add=false, int state=0);
void ReadHPTFile(char* path, char* file, char* options, char* origin, int group);
#endif
#ifndef GCFG_NOIMAIL

View File

@@ -96,7 +96,7 @@ void gareafile::ReadCrashmail(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
char buf[4000];
char key[30];

View File

@@ -51,14 +51,14 @@ void gareafile::ReadDB130(char* tag, char* dbpath) {
setvbuf(fp1, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file1 << endl;
std::cout << "* Reading " << file1 << std::endl;
fp2 = fsopen(file2, "rb", sharemode);
if(fp2) {
setvbuf(fp2, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file2 << endl;
std::cout << "* Reading " << file2 << std::endl;
while(fread(&AA1, sizeof(DB130_AA1), 1, fp1) == 1) {
@@ -122,7 +122,7 @@ void gareafile::ReadDB1046(char* file, char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(ADF, sizeof(DB1046_ADF), 1, fp) == 1) {
if(ADF->allocated and strchr("QFqf", ADF->msgbase)) {
@@ -185,7 +185,7 @@ void gareafile::ReadDB1047A22(char* file, int reclen, char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(ADF, reclen, 1, fp) == 1) {
if(ADF->allocated and strchr("QFqf", ADF->msgbase)) {
@@ -249,7 +249,7 @@ void gareafile::ReadDB2011(char* file, int reclen, char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(ADF, reclen, 1, fp) == 1) {
if(ADF->allocated and strchr("QFqf", ADF->msgbase)) {
@@ -337,7 +337,7 @@ void gareafile::ReadDBridge(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
// Read netmail storage method etc
for(line=1; line <= 2; line++)

View File

@@ -67,7 +67,7 @@ void gareafile::ReadDutchie(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fgets(buf, 255, fp)) {

View File

@@ -51,7 +51,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(constant, sizeof(CONSTANTRECORD), 1, fp);
fclose(fp);
@@ -192,7 +192,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
int record = 1;

View File

@@ -52,7 +52,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(constant, sizeof(CONSTANTRECORD), 1, fp);
fclose(fp);
@@ -193,7 +193,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
int record = 1;
@@ -311,7 +311,7 @@ void gareafile::ReadEzycom(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
char _verstr[9];
fread(_verstr, 9, 1, fp);
@@ -320,7 +320,7 @@ void gareafile::ReadEzycom(char* tag) {
strp2c(_verstr);
if(strnicmp(_verstr, "1.02", 4) < 0) {
cout << "* Error: Ezycom v" << _verstr << " is not supported - Skipping." << endl;
std::cout << "* Error: Ezycom v" << _verstr << " is not supported - Skipping." << std::endl;
return;
}
else if(strnicmp(_verstr, "1.10", 4) >= 0)

View File

@@ -82,7 +82,7 @@ void gareafile::ReadFrontDoor(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(buf, 5, 1, fp);
if(streql(buf, "JoHo")) { // Check to see that it is v1.99b or higher
@@ -121,7 +121,7 @@ void gareafile::ReadFrontDoor(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(folder, sizeof(FD_Folder), 1, fp) == 1) {
behave = folder->behave;

View File

@@ -194,7 +194,7 @@ void gareafile::ReadFastecho(char* tag) {
if(fh != -1) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
read(fh, &revision, sizeof(revision));
lseek(fh, 0L, SEEK_SET); // rewind
@@ -206,7 +206,7 @@ void gareafile::ReadFastecho(char* tag) {
else if(revision == 6)
ReadFastecho142(fh);
else
cout << "* Error: FastEcho system file revision level " << revision << " is not supported - Skipping." << endl;
std::cout << "* Error: FastEcho system file revision level " << revision << " is not supported - Skipping." << std::endl;
close(fh);
}

View File

@@ -89,7 +89,7 @@ void gareafile::ReadFidoPCB(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
int areas = 0;
fparea* area = NULL;

View File

@@ -298,7 +298,7 @@ void gareafile::ReadFMail(char* tag) {
else if((ar_rev >= 0x0110) and (ar_rev < 0x0200))
ReadFMail116(fp, path, file, options);
else
cout << "* Error: Unknown FMail config revision " << setfill('0') << setw(4) << hex << ar_rev << "h - Skipping." << endl;
std::cout << "* Error: Unknown FMail config revision " << std::setfill('0') << std::setw(4) << std::hex << ar_rev << "h - Skipping." << std::endl;
}
}
}

View File

@@ -87,7 +87,7 @@ void gareafile::ReadGEcho(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(&sysrev, sizeof(word), 1, fp);
rewind(fp);
@@ -110,10 +110,10 @@ void gareafile::ReadGEcho(char* tag) {
if(ge_version >= 102) {
_fidomsgtype = (gesetup->extraoptions & OPUSDATES) ? GMB_OPUS : GMB_FTS1;
if((_fidomsgtype == GMB_FTS1) and (fidomsgtype == GMB_OPUS)) {
cout <<
"* Warning - FTS-1 format is used for *.MSG. For better compatibility set this" << endl <<
"* in GSETUP: Miscellanous->GEcho Options->MSG compatibilty = Opus (not Fido)." << endl <<
"* To disable this warning, set FIDOMSGTYPE FTS1 in your GoldED setup." << endl;
std::cout <<
"* Warning - FTS-1 format is used for *.MSG. For better compatibility set this" << std::endl <<
"* in GSETUP: Miscellanous->GEcho Options->MSG compatibilty = Opus (not Fido)." << std::endl <<
"* To disable this warning, set FIDOMSGTYPE FTS1 in your GoldED setup." << std::endl;
}
}
@@ -335,7 +335,7 @@ void gareafile::ReadGEcho(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(&ahdr, sizeof(AREAFILE_HDR), 1, fp);
uint arearecsize = (ahdr.maxconnections * sizeof(CONNECTION)) + ahdr.recsize;
@@ -436,7 +436,7 @@ void gareafile::ReadGEcho(char* tag) {
}
}
else
cout << "* Error: GEcho system file revision level " << sysrev << " is not supported - Skipping." << endl;
std::cout << "* Error: GEcho system file revision level " << sysrev << " is not supported - Skipping." << std::endl;
}
throw_free(gesetup);
}

View File

@@ -39,9 +39,9 @@ static bool comment_char = '#';
// ------------------------------------------------------------------
bool gareafile::ReadHPTLine(FILE* f, string* s, bool add, int state) {
bool gareafile::ReadHPTLine(FILE* f, std::string* s, bool add, int state) {
string str;
std::string str;
char buf[81];
if(fgets(buf, 81, f) == NULL)
@@ -57,7 +57,7 @@ bool gareafile::ReadHPTLine(FILE* f, string* s, bool add, int state) {
}
}
string::iterator ptr = str.begin();
std::string::iterator ptr = str.begin();
// state 0: normal state
// 1: between ""
@@ -99,7 +99,7 @@ bool gareafile::ReadHPTLine(FILE* f, string* s, bool add, int state) {
case ' ':
case '\t':
{
string::iterator i = ptr;
std::string::iterator i = ptr;
while((i != str.end()) and isspace(*i))
++i;
if(*i != '#')
@@ -262,11 +262,11 @@ void gareafile::ReadHPTFile(char* path, char* file, char* options, char* origin,
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
aa.reset();
string s;
std::string s;
while(ReadHPTLine(fp, &s)) {
if(not s.empty()) {
@@ -286,7 +286,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* options, char* origin,
int ver_maj, ver_min;
sscanf(val, "%d.%d", &ver_maj, &ver_min);
if((ver_maj != 0) and (ver_min != 15)) {
cout << "* Error: Unknown fidoconfig version " << ver_maj << '.' << ver_min << " - Skipping." << endl;
std::cout << "* Error: Unknown fidoconfig version " << ver_maj << '.' << ver_min << " - Skipping." << std::endl;
throw_xfree(alptr);
goto skip_config;
}

View File

@@ -47,7 +47,7 @@ void gareafile::ReadIMail160(char* options, char* file, char* impath) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(CF, sizeof(im_config_type), 1, fp);
fclose(fp);
@@ -75,7 +75,7 @@ void gareafile::ReadIMail160(char* options, char* file, char* impath) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(&AR, sizeof(areas_record_type), 1, fp) == 1) {
@@ -105,7 +105,7 @@ void gareafile::ReadIMail160(char* options, char* file, char* impath) {
if((AR.brd >= 1) and (AR.brd <= 200))
aa.board = AR.brd;
else {
cout << "* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping." << endl;
std::cout << "* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping." << std::endl;
continue;
}
break;

View File

@@ -57,7 +57,7 @@ void gareafile::ReadIMail170(char* options, char* file, char* impath) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(CF, sizeof(im_config_type), 1, fp);
fclose(fp);
@@ -85,7 +85,7 @@ void gareafile::ReadIMail170(char* options, char* file, char* impath) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(&AR, sizeof(areas_record_type), 1, fp) == 1) {
@@ -115,7 +115,7 @@ void gareafile::ReadIMail170(char* options, char* file, char* impath) {
if((AR.brd >= 1) and (AR.brd <= 200))
aa.board = AR.brd;
else {
cout << "* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping." << endl;
std::cout << "* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping." << std::endl;
continue;
}
break;

View File

@@ -57,7 +57,7 @@ void gareafile::ReadIMail185(char* options, char* file, char* impath) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(CF, sizeof(im_config_type), 1, fp);
fclose(fp);
@@ -85,7 +85,7 @@ void gareafile::ReadIMail185(char* options, char* file, char* impath) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(&AR, sizeof(mail_area_type), 1, fp) == 1) {
@@ -115,7 +115,7 @@ void gareafile::ReadIMail185(char* options, char* file, char* impath) {
if((AR.brd >= 1) and (AR.brd <= 200))
aa.board = AR.brd;
else {
cout << "* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping." << endl;
std::cout << "* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping." << std::endl;
continue;
}
break;
@@ -218,7 +218,7 @@ void gareafile::ReadIMail(char* tag) {
#endif
}
}
cout << "* Error: IMAIL " << imver[0] << '.' << setfill('0') << setw(2) << imver[1] << " (structure revision " << imstructver[0] << '.' << setfill('0') << setw(2) << imstructver[1] << ") is not supported - Skipping." << endl;
std::cout << "* Error: IMAIL " << imver[0] << '.' << std::setfill('0') << std::setw(2) << imver[1] << " (structure revision " << imstructver[0] << '.' << std::setfill('0') << std::setw(2) << imstructver[1] << ") is not supported - Skipping." << std::endl;
}
}

View File

@@ -68,7 +68,7 @@ void gareafile::ReadInterMail(char* tag) {
_ctl* ctl = (_ctl*)throw_calloc(1, sizeof(_ctl));
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
fp.fread(ctl, sizeof(_ctl));
@@ -135,7 +135,7 @@ void gareafile::ReadInterMail(char* tag) {
if(fp.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
FOLDER* _folder = (FOLDER*)throw_calloc(1, sizeof(FOLDER));
@@ -179,7 +179,7 @@ void gareafile::ReadInterMail(char* tag) {
if(fp.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
OLDFOLDER* _folder = (OLDFOLDER*)throw_calloc(1, sizeof(OLDFOLDER));
@@ -213,7 +213,7 @@ void gareafile::ReadInterMail(char* tag) {
}
}
else {
cout << "* Error: InterMail revision " << setfill('0') << setw(4) << hex << ctl->sysrev << "h is not supported - Skipping." << endl;
std::cout << "* Error: InterMail revision " << std::setfill('0') << std::setw(4) << std::hex << ctl->sysrev << "h is not supported - Skipping." << std::endl;
}
throw_free(ctl);
}

View File

@@ -68,7 +68,7 @@ void gareafile::ReadLoraBBS(char* tag) {
if(fp.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
_configuration* cfg = (_configuration*)throw_calloc(1, sizeof(_configuration));
fp.fread(cfg, sizeof(_configuration));
@@ -135,7 +135,7 @@ void gareafile::ReadLoraBBS(char* tag) {
fp.setvbuf(NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
_sysmsg* sysmsg = (_sysmsg*)throw_calloc(1, sizeof(_sysmsg));

View File

@@ -49,7 +49,7 @@ void gareafile::ReadMaximus3(char* mxpath, char* areafile, char* options) {
if(fp) {
if(not quiet)
cout << "* Reading " << areafile << endl;
std::cout << "* Reading " << areafile << std::endl;
m_pointers* prmp = (m_pointers*)throw_calloc(1, sizeof(m_pointers));
m_pointers& prm = *prmp;
@@ -71,7 +71,7 @@ void gareafile::ReadMaximus3(char* mxpath, char* areafile, char* options) {
setvbuf(fp, NULL, _IOFBF, 32000);
if(not quiet)
cout << "* Reading " << areafile << endl;
std::cout << "* Reading " << areafile << std::endl;
long areasize = fsize(fp)-4;

View File

@@ -60,7 +60,7 @@ void gareafile::ReadME2(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fgets(buf, 255, fp)) {

View File

@@ -79,7 +79,7 @@ void gareafile::ReadOpus(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(&msgsys, sizeof(_msgsys), 1, fp) == 1) {
@@ -135,7 +135,7 @@ void gareafile::ReadOpus(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(&sysdat, sizeof(_systemdat), 1, fp);
if(*sysdat.msgpath and *sysdat.msgtitle) {

View File

@@ -86,7 +86,7 @@ void gareafile::ReadPCBoard(char* tag) {
if(fp.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
int _line = 0;
@@ -117,7 +117,7 @@ void gareafile::ReadPCBoard(char* tag) {
if(fp.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
// Get configuration file version
fp.fread(&fido_version, 2);
@@ -163,7 +163,7 @@ void gareafile::ReadPCBoard(char* tag) {
fp.fopen(_file, "rb");
if(fp.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
word cfgver = 0;
fp.fread(&cfgver, 2);
if(cfgver == 3) {
@@ -179,7 +179,7 @@ void gareafile::ReadPCBoard(char* tag) {
fp.fopen(_file, "rb");
if(fp.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
word cfgver = 0;
fp.fread(&cfgver, 2);
if(cfgver == 3) {
@@ -201,7 +201,7 @@ void gareafile::ReadPCBoard(char* tag) {
fp.fopen(_file, "rb");
if(fp.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
word cfgver = 0;
fp.fread(&cfgver, 2);
if(cfgver == 3) {
@@ -249,7 +249,7 @@ void gareafile::ReadPCBoard(char* tag) {
if(fp.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
gfile fp2;
_file = AddPath(_cnamespath, ".add");
@@ -257,7 +257,7 @@ void gareafile::ReadPCBoard(char* tag) {
if(fp2.isopen()) {
if(not quiet)
cout << "* Reading " << _file << endl;
std::cout << "* Reading " << _file << std::endl;
word _recsize = 0;
fp.fread(&_recsize, 2);

View File

@@ -65,7 +65,7 @@ void gareafile::ReadProBoard(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(cfg, sizeof(Config), 1, fp);
@@ -81,7 +81,7 @@ void gareafile::ReadProBoard(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(aka, akasz, 1, fp);
fclose(fp);
@@ -95,7 +95,7 @@ void gareafile::ReadProBoard(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(area, sizeof(MsgAreas), 1, fp) == 1) {
aa.reset();

View File

@@ -43,7 +43,7 @@ void gareafile::ReadQEchoFile(char* file, char* options, char* origin) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fgets(buf, sizeof(buf), fp)) {

View File

@@ -64,7 +64,7 @@ void gareafile::ReadQFront(char* tag) {
fp = fsopen(file, "rb", sharemode);
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(origin, sizeof(OriginLineRecord), 1, fp);
for(int n=0; n<MaxOrigins; n++)
STRNP2C(origin->OriginLine[n]);
@@ -79,7 +79,7 @@ void gareafile::ReadQFront(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
while(fread(area, sizeof(EchoMailConferenceRecord), 1, fp) == 1) {
if(not area->Deleted) {

View File

@@ -53,7 +53,7 @@ void gareafile::ReadQ260(char* qbpath, char* origin, char* options) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(cfg, sizeof(Q260CfgRecT), 1, fp);
@@ -141,7 +141,7 @@ void gareafile::ReadQ276(char* qbpath, char* origin, char* options) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(cfg, sizeof(Q276CfgRecT), 1, fp);
@@ -157,7 +157,7 @@ void gareafile::ReadQ276(char* qbpath, char* origin, char* options) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
int _recs = (int)(filelength(fileno(fp)) / sizeof(Q276BrdRecT));
int _fmt = (_recs > 200) ? GMB_GOLDBASE : GMB_HUDSON;

View File

@@ -75,7 +75,7 @@ void gareafile::ReadRemoteAccess(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(config, sizeof(CONFIGrecord), 1, fp);
fclose(fp);
@@ -98,7 +98,7 @@ void gareafile::ReadRemoteAccess(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
if(config->VersionID >= 0x200) {
MESSAGErecord* area = new MESSAGErecord; throw_new(area);

View File

@@ -76,7 +76,7 @@ void gareafile::ReadRaEcho(char* tag) {
}
if(raever == 0) {
if(not quiet)
cout << "* Could not determine version of RA-ECHO - skipping." << endl;
std::cout << "* Could not determine version of RA-ECHO - skipping." << std::endl;
return;
}
@@ -86,7 +86,7 @@ void gareafile::ReadRaEcho(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
areano = 1;
while(fread(&area, raever, 1, fp) == 1) {

View File

@@ -54,7 +54,7 @@ void gareafile::ReadSquishFile(char* path, char* file, char* options, char* orig
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
aa.reset();

View File

@@ -76,7 +76,7 @@ void gareafile::ReadSuperBBS(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(config, sizeof(ConfigRecordT), 1, fp);
STRNP2C(config->OriginLine);
@@ -87,7 +87,7 @@ void gareafile::ReadSuperBBS(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(sconfig, sizeof(ExtraConfigT), 1, fp);
fclose(fp);
@@ -103,7 +103,7 @@ void gareafile::ReadSuperBBS(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
for(int n=0; n<200; n++) {
@@ -171,8 +171,8 @@ void gareafile::ReadSuperBBS(char* tag) {
}
}
else {
cout << "* Error: Unsupported version of SuperBBS: " <<
(word)(sconfig->VersionNumber >> 8) << '.' << (word)(sconfig->VersionNumber & 0xFF) << endl;
std::cout << "* Error: Unsupported version of SuperBBS: " <<
(word)(sconfig->VersionNumber >> 8) << '.' << (word)(sconfig->VersionNumber & 0xFF) << std::endl;
}
}
}

View File

@@ -74,7 +74,7 @@ void gareafile::ReadTimedFile(char* path, char* file, char* options, char* origi
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
aa.reset();

View File

@@ -51,7 +51,7 @@ void gareafile::ReadTmailFile(char* file, char* options, char* origin) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
aa.reset();

View File

@@ -81,7 +81,7 @@ void gareafile::ReadTosScan(char* tag) {
if(fp) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(buf, 5, 1, fp);
if(streql(buf, "JoHo")) { // Check to see that it is v1.99b or higher
@@ -115,7 +115,7 @@ void gareafile::ReadTosScan(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fseek(fp, 4L, SEEK_SET); // Skip CRC32

View File

@@ -72,7 +72,7 @@ void gareafile::ReadWMail(char* tag) {
if(fh != -1) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
read(fh, wmprm, sizeof(TWmailPrm));
@@ -127,7 +127,7 @@ void gareafile::ReadWMail(char* tag) {
if(fh != -1) {
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
// All the echomail areas
while(read(fh, arprm, sizeof(TAreasPrm)) == sizeof(TAreasPrm)) {

View File

@@ -108,7 +108,7 @@ void gareafile::ReadWtrGteFile(char* options, FILE* fp) {
char header[26];
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(header, 26, 1, fp2);
strp2c(header);
@@ -145,7 +145,7 @@ void gareafile::ReadWtrGteFile(char* options, FILE* fp) {
throw_delete(ar);
}
else
cout << "* Error: WaterGate Areabase \"" << header << "\" is not supported - Skipping." << endl;
std::cout << "* Error: WaterGate Areabase \"" << header << "\" is not supported - Skipping." << std::endl;
fclose(fp2);
}
@@ -187,13 +187,13 @@ void gareafile::ReadWtrGte(char* tag) {
if(fp) {
char header[26];
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
fread(header, 26, 1, fp); strp2c(header);
if(streql(header, ConfigHeader))
ReadWtrGteFile(options, fp);
else
cout << "* Error: WaterGate \"" << header << "\" is not supported - Skipping." << endl;
std::cout << "* Error: WaterGate \"" << header << "\" is not supported - Skipping." << std::endl;
fclose(fp);
}

View File

@@ -59,7 +59,7 @@ void gareafile::ReadAdeptXbbsFile(char* path, char* file, char* options) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
aa.reset();

View File

@@ -81,7 +81,7 @@ void gareafile::ReadxMailFile(char* file, char* options) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
aa.reset();
@@ -166,7 +166,7 @@ void gareafile::ReadXMail(char* tag) {
setvbuf(fp, NULL, _IOFBF, 8192);
if(not quiet)
cout << "* Reading " << file << endl;
std::cout << "* Reading " << file << std::endl;
areano = 1;
while(fread(&area, sizeof(EchoAreaRec), 1, fp) == 1) {