ModemClass->ModemGroup patch - Robert Colquhoun(rjc@trump.net.au)

First attempt at replacing ModemClass with ModemGroup.
(have not fixed man page yet)

diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in
index 83ff8ca600188dfa324d18cadd721dce10296ca1..4356785c9511de2b2f44490383e0e010a3eaaa30 100644 (file)
--- a/etc/faxaddmodem.sh.in
+++ b/etc/faxaddmodem.sh.in
@@ -1786,7 +1786,7 @@ OptionalSchedulerParameters="
     MaxDials
     MaxSendPages
     MaxTries
-    ModemClass
+    ModemGroup
     PostScriptTimeout
     PS2FaxCmd
     SendFaxCmd
@@ -1803,7 +1803,7 @@ defaultMaxConcurrentJobs=1
 defaultMaxDials=12
 defaultMaxSendPages=0xffffffff
 defaultMaxTries=3
-defaultModemClass=
+defaultModemGroup=
 defaultPostScriptTimeout=180
 defaultPS2FaxCmd=\"bin/ps2fax\"
 defaultSendFaxCmd=\"bin/faxsend\"
@@ -1968,7 +1968,7 @@ C#        PostScriptTimeout       \
        Timeout when converting PostScript documents (secs)
 C#     MaxConcurrentJobs       \
        Maximum number of concurrent jobs to a destination
-S      ModemClass              Define a class of modems
+S      ModemGroup              Define a group of modems
 S      TimeOfDay               Time of day restrictions for outbound jobs
 S      DestControls            \
        Pathname of destination controls file (relative to $SPOOL)

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index 2f7ea9e24dc9f1c4e44252a7fb6257ee962564a9..8135fb32e3fac2f67600097332133d7758de1b33 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -660,7 +660,7 @@ EOF
     defaultMaxDials=12
     defaultMaxSendPages=0xffffffff
     defaultMaxTries=3
-    defaultModemClass=
+    defaultModemGroup=
     defaultPostScriptTimeout=180
     defaultPS2FaxCmd=\"bin/ps2fax\"
     defaultSendFaxCmd=\"bin/faxsend\"
@@ -1860,7 +1860,7 @@ OptionalSchedulerParameters="
     MaxDials
     MaxSendPages
     MaxTries
-    ModemClass
+    ModemGroup
     PostScriptTimeout
     PS2FaxCmd
     SendFaxCmd
@@ -1982,7 +1982,7 @@ C#        PostScriptTimeout       \
        Timeout when converting PostScript documents (secs)
 C#     MaxConcurrentJobs       \
        Maximum number of concurrent jobs to a destination
-S      ModemClass              Define a class of modems
+S      ModemGroup              Define a group of modems
 S      TimeOfDay               Time of day restrictions for outbound jobs
 S      DestControls            \
        Pathname of destination controls file (relative to $DIR_SPOOL)

diff --git a/faxd/Modem.c++ b/faxd/Modem.c++
index 5b1978341475e47f1c0b6e3edd9d7a41ba276033..94df82127d36be971fc31236ad483c175b9aad7e 100644 (file)
--- a/faxd/Modem.c++
+++ b/faxd/Modem.c++
@@ -34,10 +34,10 @@
 #include "Dispatcher.h"
 #include "config.h"
 
-RegExDict* ModemClass::classes =  NULL;        // modem classes
+RegExDict* ModemGroup::classes =  NULL;        // modem classes
 
 RegEx*
-ModemClass::find(const char* name)
+ModemGroup::find(const char* name)
 {
     if (classes == NULL)
        return (NULL);
@@ -46,13 +46,13 @@ ModemClass::find(const char* name)
 }
 
 void
-ModemClass::reset()
+ModemGroup::reset()
 {
     delete classes, classes = NULL;
 }
 
 void
-ModemClass::set(const fxStr& name, RegEx* re)
+ModemGroup::set(const fxStr& name, RegEx* re)
 {
     if (classes == NULL)
        classes = new RegExDict;
@@ -138,7 +138,7 @@ Modem::isCapable(const Job& job) const
 Modem*
 Modem::findModem(const Job& job)
 {
-    RegEx* c = ModemClass::find(job.device);
+    RegEx* c = ModemGroup::find(job.device);
     if (c) {
        /*
         * Job is assigned to a class of modems; search

diff --git a/faxd/Modem.h b/faxd/Modem.h
index 148d7399ce0360697a595343adf583e1b1aa6506..47a63e438b08d9696dbb130fe6aae7429102a284 100644 (file)
--- a/faxd/Modem.h
+++ b/faxd/Modem.h
@@ -40,7 +40,7 @@ class RegExDict;
 class fxStackBuffer;
 class Modem;
 
-class ModemClass {
+class ModemGroup {
 private:
     static RegExDict* classes; // registered modem classes
 public:

diff --git a/faxd/faxQueueApp.c++ b/faxd/faxQueueApp.c++
index 4e95fec206292f1224b34e1235dbf61cb69a1b42..5346ddc67a9ea17c1d75a179d658071bce5f2858 100644 (file)
--- a/faxd/faxQueueApp.c++
+++ b/faxd/faxQueueApp.c++
@@ -1590,7 +1590,7 @@ faxQueueApp::submitJob(Job& job, FaxRequest& req, fxBool checkState)
        timeoutJob(job, req);
        return (FALSE);
     }
-    if (!Modem::modemExists(req.modem) && !ModemClass::find(req.modem)) {
+    if (!Modem::modemExists(req.modem) && !ModemGroup::find(req.modem)) {
        rejectSubmission(job, req,
            "REJECT: Requested modem " | req.modem | " is not registered");
        return (FALSE);
@@ -2675,8 +2675,8 @@ faxQueueApp::setupConfig()
     use2D = TRUE;                      // ok to use 2D data
     uucpLockMode = UUCP_LOCKMODE;
     delete dialRules, dialRules = NULL;
-    ModemClass::reset();               // clear+add ``any modem'' class
-    ModemClass::set(MODEM_ANY, new RegEx(".*"));
+    ModemGroup::reset();               // clear+add ``any modem'' class
+    ModemGroup::set(MODEM_ANY, new RegEx(".*"));
     pageChop = FaxRequest::chop_last;
     pageChopThreshold = 3.0;           // minimum of 3" of white space
 }
@@ -2781,7 +2781,7 @@ faxQueueApp::setConfigItem(const char* tag, const char* value)
        use2D = getBoolean(value);
     else if (streq(tag, "uucplockmode"))
        uucpLockMode = (mode_t) strtol(value, 0, 8);
-    else if (streq(tag, "modemclass")) {
+    else if (streq(tag, "modemgroup")) {
        const char* cp;
        for (cp = value; *cp && *cp != ':'; cp++)
            ;
@@ -2797,7 +2797,7 @@ faxQueueApp::setConfigItem(const char* tag, const char* value)
                    configError("Bad pattern for modem class \"%s\": %s: " | emsg,
                        (const char*) name, re->pattern());
                } else
-                   ModemClass::set(name, re);
+                   ModemGroup::set(name, re);
            } else
                configError("No regular expression for modem class");
        } else