[Bug 267] Fix gcc warnings in -Wall mode

Aidan's first warnings kill, re-ordering constructor initializations

diff --git a/faxd/Modem.c++ b/faxd/Modem.c++
index 72c128868c0e4d42addefc893420c99e6ba086b7..e1f3bd8485cf2cf9e2ce25c526a797977a690f81 100644 (file)
--- a/faxd/Modem.c++
+++ b/faxd/Modem.c++
@@ -67,8 +67,8 @@ void ModemLockWaitHandler::timerExpired(long, long)
 QLink Modem::list;                     // master list of known modems
 
 Modem::Modem(const fxStr& id)
-    : devID(id)
-    , fifoName(FAX_FIFO "." | id)
+    : fifoName(FAX_FIFO "." | id)
+    , devID(id)
     , lockHandler(*this)
 {
     state = DOWN;                      // modem down until notified otherwise

diff --git a/faxd/ServerConfig.c++ b/faxd/ServerConfig.c++
index f8eee6ac79dde3bc0d28bd309bea812084132836..f371183cfe42621cb0510722225c3ffd9b588b63 100644 (file)
--- a/faxd/ServerConfig.c++
+++ b/faxd/ServerConfig.c++
@@ -200,7 +200,7 @@ public:
     ~ServerConfigDialStringRules();
 };
 ServerConfigDialStringRules::ServerConfigDialStringRules(ServerConfig& c, const char* f)
-    : config(c), DialStringRules(f)
+    : DialStringRules(f), config(c)
 {}
 ServerConfigDialStringRules::~ServerConfigDialStringRules() {}
 

diff --git a/faxd/faxRequest.h b/faxd/faxRequest.h
index 6c5d6e84979905ec60bf6fe90df3ee44a8d9f96c..70f8ab2c17f4e891ac1468048b8394c53ad93f02 100644 (file)
--- a/faxd/faxRequest.h
+++ b/faxd/faxRequest.h
@@ -42,8 +42,8 @@ typedef unsigned short FaxSendOp;
 struct faxRequest {
     FaxSendOp  op;             // send operation type
     u_short    dirnum;         // directory index for TIFF images
-    fxStr      addr;           // SUB/SEP for transmit/poll
     fxStr      item;           // filename/password for transmit/poll
+    fxStr      addr;           // SUB/SEP for transmit/poll
 
     faxRequest();
     faxRequest(FaxSendOp, u_short dirnum, const fxStr& addr, const fxStr& item);

diff --git a/faxmail/MIMEState.h b/faxmail/MIMEState.h
index d7f52050c702f058bdc9d7b198c0a560098adf07..ebb511ba81780c2d7fb783c308eea57ee6255137 100644 (file)
--- a/faxmail/MIMEState.h
+++ b/faxmail/MIMEState.h
@@ -81,7 +81,7 @@ public:
     MIMEState(const char* type, const char* subtype);
     MIMEState(MIMEState& parent);
     MIMEState(MIMEState& parent, const char* type, const char* subtype);
-    ~MIMEState();
+    virtual ~MIMEState();
 
     u_int      lineno;                 // input line number
     bool parse(const MsgFmt&, fxStr& emsg);

diff --git a/util/FaxRecvInfo.c++ b/util/FaxRecvInfo.c++
index 17f6c909fc941e2db94305966929d87b2266cc36..d2259941f73d887b0e0990c40861bca1b9f69bff 100644 (file)
--- a/util/FaxRecvInfo.c++
+++ b/util/FaxRecvInfo.c++
@@ -34,9 +34,9 @@ FaxRecvInfo::FaxRecvInfo(const FaxRecvInfo& other)
     : fxObj(other)
     , qfile(other.qfile)
     , commid(other.commid)
-    , params(other.params)
     , sender(other.sender)
     , subaddr(other.subaddr)
+    , params(other.params)
     , reason(other.reason)
 {
     npages = other.npages;

diff --git a/util/SendFaxJob.c++ b/util/SendFaxJob.c++
index 60d0ed8becdf5c324dcdd1ef0e8ffccf9132f027..000488d9e37cd74ae9e19d87fe5b41bfe43c754c 100644 (file)
--- a/util/SendFaxJob.c++
+++ b/util/SendFaxJob.c++
@@ -55,19 +55,19 @@ SendFaxJob::SendFaxJob(const SendFaxJob& other)
     , coverFile(other.coverFile)
     , coverTemplate(other.coverTemplate)
     , name(other.name)
+    , voicenumber(other.voicenumber)
     , location(other.location)
     , company(other.company)
     , comments(other.comments)
     , regarding(other.regarding)
-    , voicenumber(other.voicenumber)
-    , killTime(other.killTime)
-    , sendTime(other.sendTime)
-    , tagline(other.tagline)
-    , pageSize(other.pageSize)
     , fromlocation(other.fromlocation)
     , fromfax(other.fromfax)
     , fromvoice(other.fromvoice)
     , fromcompany(other.fromcompany)
+    , killTime(other.killTime)
+    , sendTime(other.sendTime)
+    , tagline(other.tagline)
+    , pageSize(other.pageSize)
 {
     notify = other.notify;
     autoCover = other.autoCover;