bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply changes to MS Visual C build. Patch from Ianos Gnatiuc 2:469/335.155

Browse Source
This commit is contained in:
Stas Degteff
2005-08-26 23:14:24 +00:00
parent 12c860a28c
commit 4a77b5a598
30 changed files with 273 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
goldlib/gcfg/gxfm116.cpp
View File

@@ -153,7 +153,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
aa.setdesc("FMail Personal Mail");
aa.setautoid("ECHO_PERSONAL");
AddNewArea(aa);
}
}
headerType hdr;
@@ -232,7 +232,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
fclose(fp);
}
throw_delete(cfg);
}
@@ -278,7 +278,7 @@ void gareafile::ReadFMail(char* tag) {
rewind(fp);
uint fmver = (_rev.vmajor << 8) | _rev.vminor;
if(fmver < 94)
ReadFMail092(fp, path, file, options);
else {
@@ -297,8 +297,12 @@ void gareafile::ReadFMail(char* tag) {
ReadFMail098(fp, path, file, options);
else if((ar_rev >= 0x0110) and (ar_rev < 0x0200))
ReadFMail116(fp, path, file, options);
else
std::cout << "* Error: Unknown FMail config revision " << std::setfill('0') << std::setw(4) << std::hex << ar_rev << "h - Skipping." << std::endl;
else {
char buff[56+sizeof(uint)*2];
sprintf(buff, "* Error: Unknown FMail config revision %04Xh - Skipping.\n", ar_rev);
std::cout << buff;
// std::cout << "* Error: Unknown FMail config revision " << std::setfill('0') << std::setw(4) << std::hex << ar_rev << "h - Skipping." << std::endl;
}
}
}
}

6
goldlib/gcfg/gximail6.cpp
View File

@@ -218,7 +218,11 @@ void gareafile::ReadIMail(char* tag) {
#endif
}
}
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;
char buff[78];
sprintf(buff, "* Error: IMAIL %c.%02c (structure revision %c.%02c) is not supported - Skipping.\n", imver[0], imver[1], imstructver[0], imstructver[1]);
std::cout << buff;
// 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;
}
}

4
goldlib/gcfg/gxinter.cpp
View File

@@ -216,7 +216,9 @@ void gareafile::ReadInterMail(char* tag) {
}
}
else {
std::cout << "* Error: InterMail revision " << std::setfill('0') << std::setw(4) << std::hex << ctl->sysrev << "h is not supported - Skipping." << std::endl;
char buff[62+sizeof(ctl->sysrev)*2];
sprintf(buff, "* Error: InterMail revision %04Xh is not supported - Skipping.\n", ctl->sysrev);
std::cout << buff;
}
throw_free(ctl);
}