gcc-2.8.x/egcs patch

Patches a number of C++ source files to be more inline with the newer
compilers and C++ standard

diff --git a/hfaxd/FileSystem.c++ b/hfaxd/FileSystem.c++
index f0073045deb8632370ee38921c52555adeb77ba7..d1e2e39c24a3b19132c50d2863a0afedafc49e83 100644 (file)
--- a/hfaxd/FileSystem.c++
+++ b/hfaxd/FileSystem.c++
@@ -139,64 +139,64 @@ HylaFAXServer::mdtmCmd(const char* pathname)
 SpoolDir HylaFAXServer::dirs[] = {
 { "/status/",  FALSE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleTRUE,
-  HylaFAXServer::listStatus,   HylaFAXServer::listStatusFile,
-  HylaFAXServer::nlstStatus,   HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listStatus,  &HylaFAXServer::listStatusFile,
+  &HylaFAXServer::nlstStatus,  &HylaFAXServer::nlstUnixFile, },
 { "/sendq/",   FALSE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleSendQFile,
-  HylaFAXServer::listSendQ,    HylaFAXServer::listSendQFile,
-  HylaFAXServer::nlstSendQ,    HylaFAXServer::nlstSendQFile, },
+  &HylaFAXServer::listSendQ,   &HylaFAXServer::listSendQFile,
+  &HylaFAXServer::nlstSendQ,   &HylaFAXServer::nlstSendQFile, },
 { "/doneq/",   FALSE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleSendQFile,
-  HylaFAXServer::listSendQ,    HylaFAXServer::listSendQFile,
-  HylaFAXServer::nlstSendQ,    HylaFAXServer::nlstSendQFile, },
+  &HylaFAXServer::listSendQ,   &HylaFAXServer::listSendQFile,
+  &HylaFAXServer::nlstSendQ,   &HylaFAXServer::nlstSendQFile, },
 { "/docq/",    FALSE,  TRUE,  TRUE, 0,
   HylaFAXServer::isVisibleDocQFile,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/tmp/",     FALSE,  TRUE,  TRUE, 0,
   HylaFAXServer::isVisibleTRUE,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/log/",     FALSE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleTRUE,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/recvq/",   FALSE, FALSE,  TRUE, 0,
   HylaFAXServer::isVisibleRecvQFile,
-  HylaFAXServer::listRecvQ,    HylaFAXServer::listRecvQFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listRecvQ,   &HylaFAXServer::listRecvQFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/archive/", FALSE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleTRUE,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/pollq/",   FALSE,  TRUE,  TRUE, 0,
   HylaFAXServer::isVisibleRecvQFile,
-  HylaFAXServer::listRecvQ,    HylaFAXServer::listRecvQFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listRecvQ,   &HylaFAXServer::listRecvQFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/",         FALSE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleRootFile,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/etc/",      TRUE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleTRUE,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/info/",    FALSE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleTRUE,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/bin/",      TRUE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleTRUE,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/config/",  FALSE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleTRUE,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 { "/client/",   TRUE, FALSE, FALSE, 0,
   HylaFAXServer::isVisibleTRUE,
-  HylaFAXServer::listDirectory,        HylaFAXServer::listUnixFile,
-  HylaFAXServer::nlstDirectory,        HylaFAXServer::nlstUnixFile, },
+  &HylaFAXServer::listDirectory,       &HylaFAXServer::listUnixFile,
+  &HylaFAXServer::nlstDirectory,       &HylaFAXServer::nlstUnixFile, },
 };
 #define        N(a)    (sizeof (a) / sizeof (a[0]))
 

diff --git a/hfaxd/OldProtocol.c++ b/hfaxd/OldProtocol.c++
index b958128ed399fdbd017c704a53920b56f43cae40..465f21a4974328f545c5515be0e0e5c2c6b6ae5f 100644 (file)
--- a/hfaxd/OldProtocol.c++
+++ b/hfaxd/OldProtocol.c++
@@ -220,38 +220,38 @@ OldProtocolServer::setupNetwork(int fd)
 
 // NB: there is no support for the old style data transfer
 const OldProtocolServer::protoCmd OldProtocolServer::cmds[] = {
-{ "begin",             TRUE,   OldProtocolServer::submitJob },
-{ "checkPerm",         TRUE,   OldProtocolServer::ackPermission },
-{ "tiff",              TRUE,   OldProtocolServer::getTIFFData },
-{ "postscript",                TRUE,   OldProtocolServer::getPostScriptData },
-{ "zpostscript",       TRUE,   OldProtocolServer::getZPostScriptData },
-{ "opaque",            TRUE,   OldProtocolServer::getOpaqueData },
-{ "zopaque",           TRUE,   OldProtocolServer::getZOpaqueData },
-{ "poll",              TRUE,   OldProtocolServer::newPollID },
-{ "userID",            FALSE,  OldProtocolServer::setUserID },
-{ "version",           FALSE,  OldProtocolServer::setProtoVersion },
-{ "serverStatus",      FALSE,  OldProtocolServer::sendServerStatus },
-{ "serverInfo",                FALSE,  OldProtocolServer::sendServerInfo },
-{ "allStatus",         FALSE,  OldProtocolServer::sendAllStatus },
-{ "userStatus",                FALSE,  OldProtocolServer::sendUserStatus },
-{ "jobStatus",         FALSE,  OldProtocolServer::sendJobStatus },
-{ "recvStatus",                FALSE,  OldProtocolServer::sendRecvStatus },
-{ "remove",            TRUE,   OldProtocolServer::removeJob },
-{ "removeGroup",       TRUE,   OldProtocolServer::removeJobGroup },
-{ "kill",              TRUE,   OldProtocolServer::killJob },
-{ "killGroup",         TRUE,   OldProtocolServer::killJobGroup },
-{ "alterTTS",          TRUE,   OldProtocolServer::alterJobTTS },
-{ "alterGroupTTS",     TRUE,   OldProtocolServer::alterJobGroupTTS },
-{ "alterKillTime",     TRUE,   OldProtocolServer::alterJobKillTime },
-{ "alterGroupKillTime",        TRUE,   OldProtocolServer::alterJobGroupKillTime },
-{ "alterMaxDials",     TRUE,   OldProtocolServer::alterJobMaxDials },
-{ "alterGroupMaxDials",        TRUE,   OldProtocolServer::alterJobGroupMaxDials },
-{ "alterNotify",       TRUE,   OldProtocolServer::alterJobNotification },
-{ "alterGroupNotify",  TRUE,   OldProtocolServer::alterJobGroupNotification },
-{ "alterModem",                TRUE,   OldProtocolServer::alterJobModem },
-{ "alterGroupModem",   TRUE,   OldProtocolServer::alterJobGroupModem },
-{ "alterPriority",     TRUE,   OldProtocolServer::alterJobPriority },
-{ "alterGroupPriority",        TRUE,   OldProtocolServer::alterJobGroupPriority },
+{ "begin",             TRUE,   &OldProtocolServer::submitJob },
+{ "checkPerm",         TRUE,   &OldProtocolServer::ackPermission },
+{ "tiff",              TRUE,   &OldProtocolServer::getTIFFData },
+{ "postscript",                TRUE,   &OldProtocolServer::getPostScriptData },
+{ "zpostscript",       TRUE,   &OldProtocolServer::getZPostScriptData },
+{ "opaque",            TRUE,   &OldProtocolServer::getOpaqueData },
+{ "zopaque",           TRUE,   &OldProtocolServer::getZOpaqueData },
+{ "poll",              TRUE,   &OldProtocolServer::newPollID },
+{ "userID",            FALSE,  &OldProtocolServer::setUserID },
+{ "version",           FALSE,  &OldProtocolServer::setProtoVersion },
+{ "serverStatus",      FALSE,  &OldProtocolServer::sendServerStatus },
+{ "serverInfo",                FALSE,  &OldProtocolServer::sendServerInfo },
+{ "allStatus",         FALSE,  &OldProtocolServer::sendAllStatus },
+{ "userStatus",                FALSE,  &OldProtocolServer::sendUserStatus },
+{ "jobStatus",         FALSE,  &OldProtocolServer::sendJobStatus },
+{ "recvStatus",                FALSE,  &OldProtocolServer::sendRecvStatus },
+{ "remove",            TRUE,   &OldProtocolServer::removeJob },
+{ "removeGroup",       TRUE,   &OldProtocolServer::removeJobGroup },
+{ "kill",              TRUE,   &OldProtocolServer::killJob },
+{ "killGroup",         TRUE,   &OldProtocolServer::killJobGroup },
+{ "alterTTS",          TRUE,   &OldProtocolServer::alterJobTTS },
+{ "alterGroupTTS",     TRUE,   &OldProtocolServer::alterJobGroupTTS },
+{ "alterKillTime",     TRUE,   &OldProtocolServer::alterJobKillTime },
+{ "alterGroupKillTime",        TRUE,   &OldProtocolServer::alterJobGroupKillTime },
+{ "alterMaxDials",     TRUE,   &OldProtocolServer::alterJobMaxDials },
+{ "alterGroupMaxDials",        TRUE,   &OldProtocolServer::alterJobGroupMaxDials },
+{ "alterNotify",       TRUE,   &OldProtocolServer::alterJobNotification },
+{ "alterGroupNotify",  TRUE,   &OldProtocolServer::alterJobGroupNotification },
+{ "alterModem",                TRUE,   &OldProtocolServer::alterJobModem },
+{ "alterGroupModem",   TRUE,   &OldProtocolServer::alterJobGroupModem },
+{ "alterPriority",     TRUE,   &OldProtocolServer::alterJobPriority },
+{ "alterGroupPriority",        TRUE,   &OldProtocolServer::alterJobGroupPriority },
 };
 #define        NCMDS   (sizeof (cmds) / sizeof (cmds[0]))
 
@@ -604,9 +604,9 @@ OldProtocolServer::applyToJobGroup(const char* tag, const char* op,
 
 #define        DEFINE_Alter(param)                                             \
 void OldProtocolServer::alterJob##param(const char* tag)               \
-    { applyToJob(tag, "alter", OldProtocolServer::reallyAlterJob##param); }\
+    { applyToJob(tag, "alter", &OldProtocolServer::reallyAlterJob##param); }\
 void OldProtocolServer::alterJobGroup##param(const char* tag)          \
-    { applyToJobGroup(tag, "alter", OldProtocolServer::reallyAlterJob##param); }
+    { applyToJobGroup(tag, "alter", &OldProtocolServer::reallyAlterJob##param); }
 
 fxBool
 OldProtocolServer::alterSuspend(Job& job)
@@ -752,9 +752,9 @@ OldProtocolServer::reallyRemoveJob(const char* op, Job& job)
 
 #define        DEFINE_Op(op)                                           \
 void OldProtocolServer::##op##Job(const char* tag)             \
-    { applyToJob(tag, fxQUOTE(op), OldProtocolServer::do##op); }\
+    { applyToJob(tag, fxQUOTE(op), &OldProtocolServer::do##op); }\
 void OldProtocolServer::##op##JobGroup(const char* tag)                \
-    { applyToJobGroup(tag, fxQUOTE(op), OldProtocolServer::do##op); }
+    { applyToJobGroup(tag, fxQUOTE(op), &OldProtocolServer::do##op); }
 void
 OldProtocolServer::doremove(Job& job, const char*)
 {

diff --git a/util/SendFaxClient.c++ b/util/SendFaxClient.c++
index d6043efeed5bbf7217e2ea786300ef2804448a46..97c46600f6fc593bfa54acac519aec52f394ea89 100644 (file)
--- a/util/SendFaxClient.c++
+++ b/util/SendFaxClient.c++
@@ -457,11 +457,11 @@ SendFaxClient::sendDocuments(fxStr& emsg)
        if (info.rule->getResult() == TypeRule::TIFF) {
            fileSent = setFormat(FORM_TIFF)
                    && setType(TYPE_I)
-                   && sendData(fd, FaxClient::storeTemp, info.doc, emsg);
+                   && sendData(fd, &FaxClient::storeTemp, info.doc, emsg);
        } else {
            fileSent = setFormat(FORM_PS)
                    && setType(TYPE_I)          // XXX TYPE_A???
-                   && sendZData(fd, FaxClient::storeTemp, info.doc, emsg);
+                   && sendZData(fd, &FaxClient::storeTemp, info.doc, emsg);
        }
        Sys::close(fd);
        if (!fileSent) {

diff --git a/util/SendFaxJob.c++ b/util/SendFaxJob.c++
index 3569fd78ceeab684a7ee25f32b875611264bdc35..271c37e74937f9b470af441a1f38b0e65036bf17 100644 (file)
--- a/util/SendFaxJob.c++
+++ b/util/SendFaxJob.c++
@@ -496,7 +496,7 @@ SendFaxJob::createJob(SendFaxClient& client, fxStr& emsg)
        fxBool fileSent = 
               client.setFormat(FaxClient::FORM_PS)
            && client.setType(FaxClient::TYPE_I)        // XXX??? TYPE_A
-           && client.sendZData(fd, FaxClient::storeTemp, coverDoc, emsg);
+           && client.sendZData(fd, &FaxClient::storeTemp, coverDoc, emsg);
        Sys::close(fd);
        if (!fileSent) {
            if (emsg == "")

diff --git a/util/faxconfig.c b/util/faxconfig.c
index e64d8f1af57dd2e5daca711f06cb7ca34a42e4dc..8e82caab10e04547fc06e8a5b75f8a264dde3961 100644 (file)
--- a/util/faxconfig.c
+++ b/util/faxconfig.c
@@ -51,7 +51,7 @@ fatal(char* fmt, ...)
 
 extern int cvtFacility(const char*, int*);
 
-void
+int
 main(int argc, char** argv)
 {
     extern int optind;
@@ -123,5 +123,5 @@ main(int argc, char** argv)
        } while ((optind += 2) < argc);
        (void) close(fifo);
     }
-    exit(0);
+   return 0;
 }

diff --git a/util/faxmodem.c b/util/faxmodem.c
index fa4030934b9dea95ddbd87651caf6dc0357e91eb..69007f22f677e205cf10a442c82290f0a4689d54 100644 (file)
--- a/util/faxmodem.c
+++ b/util/faxmodem.c
@@ -186,7 +186,7 @@ parseCapabilities(const char* cp, u_int* caps)
 
 extern int cvtFacility(const char*, int*);
 
-void
+int
 main(int argc, char** argv)
 {
     extern int optind;
@@ -261,5 +261,5 @@ main(int argc, char** argv)
        fatal("%s: FIFO write failed for command (%s)",
            argv[0], strerror(errno));
     (void) close(fifo);
-    exit(0);
+    return 0;
 }

diff --git a/util/faxmsg.c b/util/faxmsg.c
index 0b8926cee37ca6e59111062c0805962d14898e71..d8ba3b2549bb76676604d963feb7ee26c07475de 100644 (file)
--- a/util/faxmsg.c
+++ b/util/faxmsg.c
@@ -50,7 +50,7 @@ fatal(char* fmt, ...)
 
 extern int cvtFacility(const char*, int*);
 
-void
+int
 main(int argc, char** argv)
 {
     extern int optind;
@@ -127,5 +127,5 @@ main(int argc, char** argv)
     if (write(fifo, cmd, strlen(cmd)) != strlen(cmd))
        fatal("FIFO write failed for command (%s)", strerror(errno));
     (void) close(fifo);
-    exit(0);
+    return 0;
 }

diff --git a/util/faxstate.c b/util/faxstate.c
index 845fe710145f674c12ac66e9f6a69cfa1262b1d0..1524004c95f3e9e01ef6b5e29843dfa27e544974 100644 (file)
--- a/util/faxstate.c
+++ b/util/faxstate.c
@@ -72,7 +72,7 @@ modemstate(const char* arg)
     return (NULL);
 }
 
-void
+int
 main(int argc, char** argv)
 {
     extern int optind;
@@ -140,5 +140,5 @@ main(int argc, char** argv)
            fatal("FIFO write failed for command (%s)", strerror(errno));
     }
     (void) close(fifo);
-    exit(0);
+    return 0;
 }