[hylafax-commits] hylafax/faxd Class1.c++, 1.48, 1.49 Class1Recv.c++, 1.93, 1.94 Class1Send.c++, 1.
Brought to you by:
faxguy
From: Lee H. <fa...@us...> - 2008-04-26 22:34:35
|
Update of /cvsroot/hylafax/hylafax/faxd In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv4030/faxd Modified Files: Class1.c++ Class1Recv.c++ Class1Send.c++ Class2.c++ FaxAcctInfo.c++ FaxMachineInfo.c++ FaxRecv.c++ FaxRequest.c++ Getty.c++ ModemServer.c++ PCFFont.c++ Trigger.c++ UUCPLock.c++ faxGettyApp.c++ faxQCleanApp.c++ faxQueueApp.c++ Log Message: Numerous adjustments to address build errors and build warnings on Fedora 9. In the case of unused results I named a variable "ignore" for easy grepping should someone want to address all of these in the future. Index: FaxAcctInfo.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/FaxAcctInfo.c++,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FaxAcctInfo.c++ 21 Jun 2007 02:13:06 -0000 1.4 --- FaxAcctInfo.c++ 26 Apr 2008 22:34:28 -0000 1.5 *************** *** 102,106 **** * facility, such as a database. */ ! const char* argv[21]; argv[0] = "FaxAccounting"; argv[1] = timebuf; --- 102,106 ---- * facility, such as a database. */ ! const char* argv[22]; argv[0] = "FaxAccounting"; argv[1] = timebuf; Index: FaxMachineInfo.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/FaxMachineInfo.c++,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FaxMachineInfo.c++ 6 Nov 2007 04:32:35 -0000 1.5 --- FaxMachineInfo.c++ 26 Apr 2008 22:34:28 -0000 1.6 *************** *** 361,365 **** return; } ! (void) ftruncate(fd, cc); Sys::close(fd); } else --- 361,365 ---- return; } ! int ignore = ftruncate(fd, cc); Sys::close(fd); } else Index: Class2.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/Class2.c++,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Class2.c++ 26 Oct 2007 15:45:37 -0000 1.21 --- Class2.c++ 26 Apr 2008 22:34:28 -0000 1.22 *************** *** 178,184 **** * sense of AT+FCQ? and incorporate that in the messages above. */ ! if (serviceType == SERVICE_CLASS2) if (cqCmds == "") modemCQ = 0; ! else { // SERVICE_CLASS20, SERVICE_CLASS21 if (cqCmds == "" && modemCQ) modemCQ = 1; } --- 178,184 ---- * sense of AT+FCQ? and incorporate that in the messages above. */ ! if (serviceType == SERVICE_CLASS2) { if (cqCmds == "") modemCQ = 0; ! } else { // SERVICE_CLASS20, SERVICE_CLASS21 if (cqCmds == "" && modemCQ) modemCQ = 1; } *************** *** 838,844 **** const HangupCode& c = hangupCodes[i]; if ((c.code[1] != NULL && strcasecmp(code, c.code[1]) == 0) || ! (c.code[2] != NULL && strcasecmp(code, c.code[2]) == 0)) ! if (codetocode) return (c.code[3]); ! else return (c.message); } if (codetocode) return ("E210"); --- 838,848 ---- const HangupCode& c = hangupCodes[i]; if ((c.code[1] != NULL && strcasecmp(code, c.code[1]) == 0) || ! (c.code[2] != NULL && strcasecmp(code, c.code[2]) == 0)) { ! if (codetocode) { ! return (c.code[3]); ! } else { ! return (c.message); ! } ! } } if (codetocode) return ("E210"); Index: Getty.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/Getty.c++,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Getty.c++ 26 Apr 2007 21:55:25 -0000 1.4 --- Getty.c++ 26 Apr 2008 22:34:28 -0000 1.5 *************** *** 218,222 **** Sys::fstat(fd, sb); #if HAS_FCHOWN ! (void) fchown(fd, 0, sb.st_gid); #else Sys::chown(getLine(), 0, sb.st_gid); --- 218,222 ---- Sys::fstat(fd, sb); #if HAS_FCHOWN ! int ignore = fchown(fd, 0, sb.st_gid); #else Sys::chown(getLine(), 0, sb.st_gid); Index: FaxRequest.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/FaxRequest.c++,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** FaxRequest.c++ 31 Jan 2008 02:26:35 -0000 1.15 --- FaxRequest.c++ 26 Apr 2008 22:34:28 -0000 1.16 *************** *** 566,570 **** lseek(fd, 0L, SEEK_SET); Sys::write(fd, sb, sb.getLength()); ! (void) ftruncate(fd, sb.getLength()); // XXX maybe should fsync, but not especially portable } --- 566,570 ---- lseek(fd, 0L, SEEK_SET); Sys::write(fd, sb, sb.getLength()); ! int ignore = ftruncate(fd, sb.getLength()); // XXX maybe should fsync, but not especially portable } *************** *** 684,688 **** *cp++ = '\0'; else ! cp = tag, tag = ""; items.append(FaxItem(op, dirnum, tag, cp)); } --- 684,688 ---- *cp++ = '\0'; else ! cp = tag, tag = '\0'; items.append(FaxItem(op, dirnum, tag, cp)); } *************** *** 708,712 **** *cp++ = '\0'; else ! cp = tag, tag = ""; if (!checkDocument(cp)) { error("Rejected document in corrupt job request"); --- 708,712 ---- *cp++ = '\0'; else ! cp = tag, tag = '\0'; if (!checkDocument(cp)) { error("Rejected document in corrupt job request"); Index: Class1Send.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/Class1Send.c++,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Class1Send.c++ 5 Jan 2008 21:43:28 -0000 1.40 --- Class1Send.c++ 26 Apr 2008 22:34:28 -0000 1.41 *************** *** 1232,1236 **** // // We don't use CRP here, because it isn't well-received. ! if (gotppr = recvFrame(pprframe, FCF_SNDR, conf.t4Timer, false, false)) { traceFCF("SEND recv", pprframe.getFCF()); if (pprframe.getFCF() == FCF_CRP) { --- 1232,1237 ---- // // We don't use CRP here, because it isn't well-received. ! gotppr = recvFrame(pprframe, FCF_SNDR, conf.t4Timer, false, false); ! if (gotppr) { traceFCF("SEND recv", pprframe.getFCF()); if (pprframe.getFCF() == FCF_CRP) { *************** *** 1270,1274 **** traceFCF("SEND send", FCF_RR); // T.30 states that we must wait no more than T4 between unanswered RR signals. ! if (gotmsg = recvFrame(pprframe, FCF_SNDR, conf.t4Timer, false, false)) { // no CRP, stick to RR only traceFCF("SEND recv", pprframe.getFCF()); if (pprframe.getFCF() == FCF_CRP) { --- 1271,1276 ---- traceFCF("SEND send", FCF_RR); // T.30 states that we must wait no more than T4 between unanswered RR signals. ! gotmsg = recvFrame(pprframe, FCF_SNDR, conf.t4Timer, false, false); ! if (gotmsg) { // no CRP, stick to RR only traceFCF("SEND recv", pprframe.getFCF()); if (pprframe.getFCF() == FCF_CRP) { *************** *** 1399,1403 **** stopTimeout("sending CTC frame"); traceFCF("SEND send", FCF_CTC); ! if (gotctr = recvFrame(ctrframe, FCF_SNDR, conf.t4Timer)) { traceFCF("SEND recv", ctrframe.getFCF()); if (ctrframe.getFCF() == FCF_CRP) { --- 1401,1406 ---- stopTimeout("sending CTC frame"); traceFCF("SEND send", FCF_CTC); ! gotctr = recvFrame(ctrframe, FCF_SNDR, conf.t4Timer); ! if (gotctr) { traceFCF("SEND recv", ctrframe.getFCF()); if (ctrframe.getFCF() == FCF_CRP) { *************** *** 1452,1456 **** traceFCF("SEND send", FCF_EOR); traceFCF("SEND send", pps[0]); ! if (goterr = recvFrame(errframe, FCF_SNDR, conf.t4Timer)) { traceFCF("SEND recv", errframe.getFCF()); if (errframe.getFCF() == FCF_CRP) { --- 1455,1460 ---- traceFCF("SEND send", FCF_EOR); traceFCF("SEND send", pps[0]); ! goterr = recvFrame(errframe, FCF_SNDR, conf.t4Timer); ! if (goterr) { traceFCF("SEND recv", errframe.getFCF()); if (errframe.getFCF() == FCF_CRP) { *************** *** 1492,1496 **** traceFCF("SEND send", FCF_RR); // T.30 states that we must wait no more than T4 between unanswered RR signals. ! if (gotmsg = recvFrame(errframe, FCF_SNDR, conf.t4Timer, false, false)) { // no CRP, stick to RR only traceFCF("SEND recv", errframe.getFCF()); if (errframe.getFCF() == FCF_CRP) { --- 1496,1501 ---- traceFCF("SEND send", FCF_RR); // T.30 states that we must wait no more than T4 between unanswered RR signals. ! gotmsg = recvFrame(errframe, FCF_SNDR, conf.t4Timer, false, false); ! if (gotmsg) { // no CRP, stick to RR only traceFCF("SEND recv", errframe.getFCF()); if (errframe.getFCF() == FCF_CRP) { Index: ModemServer.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/ModemServer.c++,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ModemServer.c++ 6 Dec 2007 18:19:28 -0000 1.11 --- ModemServer.c++ 26 Apr 2008 22:34:28 -0000 1.12 *************** *** 440,444 **** fprintf(statusFile, "\n"); fflush(statusFile); ! (void) ftruncate(fileno(statusFile), ftell(statusFile)); flock(fileno(statusFile), LOCK_UN); } --- 440,444 ---- fprintf(statusFile, "\n"); fflush(statusFile); ! int ignore = ftruncate(fileno(statusFile), ftell(statusFile)); flock(fileno(statusFile), LOCK_UN); } *************** *** 1421,1425 **** { timer.stopTimeout(); ! if (timeout = timer.wasTimeout()) traceModemOp("TIMEOUT: %s", whichdir); } --- 1421,1426 ---- { timer.stopTimeout(); ! timeout = timer.wasTimeout(); ! if (timeout) traceModemOp("TIMEOUT: %s", whichdir); } Index: Class1Recv.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/Class1Recv.c++,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** Class1Recv.c++ 22 Apr 2008 05:27:12 -0000 1.93 --- Class1Recv.c++ 26 Apr 2008 22:34:28 -0000 1.94 *************** *** 887,891 **** traceFCF("RECV send", params.ec != EC_DISABLE ? FCF_RNR : FCF_CRP); HDLCFrame rrframe(conf.class1FrameOverhead); ! if (gotresponse = recvFrame(rrframe, FCF_RCVR, conf.t2Timer)) { traceFCF("RECV recv", rrframe.getFCF()); if (rrframe.getFCF() == FCF_DCN) { --- 887,892 ---- traceFCF("RECV send", params.ec != EC_DISABLE ? FCF_RNR : FCF_CRP); HDLCFrame rrframe(conf.class1FrameOverhead); ! gotresponse = recvFrame(rrframe, FCF_RCVR, conf.t2Timer); ! if (gotresponse) { traceFCF("RECV recv", rrframe.getFCF()); if (rrframe.getFCF() == FCF_DCN) { *************** *** 1619,1623 **** transmitFrame(FCF_PPR, fxStr(ppr, 32)); traceFCF("RECV send", FCF_PPR); ! if (gotrtnframe = recvFrame(rtnframe, FCF_RCVR, conf.t2Timer)) traceFCF("RECV recv", rtnframe.getFCF()); recvFrameCount++; --- 1620,1625 ---- transmitFrame(FCF_PPR, fxStr(ppr, 32)); traceFCF("RECV send", FCF_PPR); ! gotrtnframe = recvFrame(rtnframe, FCF_RCVR, conf.t2Timer); ! if (gotrtnframe) traceFCF("RECV recv", rtnframe.getFCF()); recvFrameCount++; *************** *** 1816,1820 **** traceFCF("RECV send", FCF_RNR); HDLCFrame rrframe(conf.class1FrameOverhead); ! if (gotresponse = recvFrame(rrframe, FCF_RCVR, conf.t2Timer)) { traceFCF("RECV recv", rrframe.getFCF()); if (rrframe.getFCF() == FCF_DCN) { --- 1818,1823 ---- traceFCF("RECV send", FCF_RNR); HDLCFrame rrframe(conf.class1FrameOverhead); ! gotresponse = recvFrame(rrframe, FCF_RCVR, conf.t2Timer); ! if (gotresponse) { traceFCF("RECV recv", rrframe.getFCF()); if (rrframe.getFCF() == FCF_DCN) { Index: UUCPLock.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/UUCPLock.c++,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UUCPLock.c++ 30 Nov 2006 03:12:40 -0000 1.2 --- UUCPLock.c++ 26 Apr 2008 22:34:28 -0000 1.3 *************** *** 179,183 **** #endif #if HAS_FCHOWN ! (void) fchown(fd, UUCPuid, UUCPgid); #else Sys::chown(buff, UUCPuid, UUCPgid); --- 179,183 ---- #endif #if HAS_FCHOWN ! int ignore = fchown(fd, UUCPuid, UUCPgid); #else Sys::chown(buff, UUCPuid, UUCPgid); Index: Class1.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/Class1.c++,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Class1.c++ 16 Jan 2008 19:03:42 -0000 1.48 --- Class1.c++ 26 Apr 2008 22:34:28 -0000 1.49 *************** *** 390,394 **** u_int n = fxmin(ascii.length(),(u_int) 20); for (i = 0, j = 0; i < n; i++) { ! char c = ascii[i]; if (isprint(c) || c == ' ') buf[j++] = frameRev[c]; --- 390,394 ---- u_int n = fxmin(ascii.length(),(u_int) 20); for (i = 0, j = 0; i < n; i++) { ! int c = ascii[i]; if (isprint(c) || c == ' ') buf[j++] = frameRev[c]; *************** *** 414,418 **** binary.resize(n); for (i = 0, j = 0; i < n; i++) { ! char c = ascii[i]; if (isprint(c) || c == ' ') binary[j++] = frameRev[c]; --- 414,418 ---- binary.resize(n); for (i = 0, j = 0; i < n; i++) { ! int c = ascii[i]; if (isprint(c) || c == ' ') binary[j++] = frameRev[c]; Index: FaxRecv.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/FaxRecv.c++,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FaxRecv.c++ 9 Oct 2007 23:22:15 -0000 1.17 --- FaxRecv.c++ 26 Apr 2008 22:34:28 -0000 1.18 *************** *** 71,75 **** fileStart = pageStart = Sys::now(); ! if (faxRecognized = modem->recvBegin(&setupinfo, emsg)) { /* * If the system is busy then notifyRecvBegun may not return --- 71,76 ---- fileStart = pageStart = Sys::now(); ! faxRecognized = modem->recvBegin(&setupinfo, emsg); ! if (faxRecognized) { /* * If the system is busy then notifyRecvBegun may not return Index: faxQCleanApp.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/faxQCleanApp.c++,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** faxQCleanApp.c++ 30 Nov 2006 03:12:40 -0000 1.7 --- faxQCleanApp.c++ 26 Apr 2008 22:34:28 -0000 1.8 *************** *** 164,169 **** (const char*) filename); collectRefs(*req); ! } else if (forceArchiving || archiving && ! strncmp(req->doneop, "archive", 7) == 0) { /* * Job should be archived, pass the jobid --- 164,168 ---- (const char*) filename); collectRefs(*req); ! } else if (forceArchiving || (archiving && strncmp(req->doneop, "archive", 7) == 0)) { /* * Job should be archived, pass the jobid Index: faxQueueApp.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/faxQueueApp.c++,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** faxQueueApp.c++ 13 Mar 2008 18:28:43 -0000 1.75 --- faxQueueApp.c++ 26 Apr 2008 22:34:28 -0000 1.76 *************** *** 2602,2606 **** delayJob(job, *req, "Delayed by time-of-day restrictions {E338}", tts); delete req; ! } else if (staggerCalls && lastCall + staggerCalls > now) { /* * This job may not be started now because we last started --- 2602,2606 ---- delayJob(job, *req, "Delayed by time-of-day restrictions {E338}", tts); delete req; ! } else if (staggerCalls && ((u_int) lastCall + staggerCalls) > (u_int) now) { /* * This job may not be started now because we last started *************** *** 3084,3088 **** case 'S': // submit an outbound job traceServer("SUBMIT JOB %s", args); ! if (status = submitJob(args, false, true)) pokeScheduler(); break; --- 3084,3089 ---- case 'S': // submit an outbound job traceServer("SUBMIT JOB %s", args); ! status = submitJob(args, false, true); ! if (status) pokeScheduler(); break; *************** *** 3094,3103 **** case 'X': // suspend job traceServer("SUSPEND JOB %s", args); ! if (status = suspendJob(args, false)) pokeScheduler(); break; case 'Y': // interrupt job traceServer("INTERRUPT JOB %s", args); ! if (status = suspendJob(args, true)) pokeScheduler(); break; --- 3095,3106 ---- case 'X': // suspend job traceServer("SUSPEND JOB %s", args); ! status = suspendJob(args, false); ! if (status) pokeScheduler(); break; case 'Y': // interrupt job traceServer("INTERRUPT JOB %s", args); ! status = suspendJob(args, true); ! if (status) pokeScheduler(); break; Index: PCFFont.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/PCFFont.c++,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PCFFont.c++ 24 Nov 2007 17:20:28 -0000 1.4 --- PCFFont.c++ 26 Apr 2008 22:34:28 -0000 1.5 *************** *** 510,514 **** TIFFSwabArrayOfShort((u_short*) raster, h*rowwords); const char* cp = text; ! for (const char* cp = text; *cp; cp++) { u_int g = (u_int)*cp; if (isutf8 && (g >= 0xC0)) { // first byte in a multibyte character --- 510,514 ---- TIFFSwabArrayOfShort((u_short*) raster, h*rowwords); const char* cp = text; ! for (; *cp; cp++) { u_int g = (u_int)*cp; if (isutf8 && (g >= 0xC0)) { // first byte in a multibyte character Index: faxGettyApp.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/faxGettyApp.c++,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** faxGettyApp.c++ 24 Dec 2007 18:29:25 -0000 1.23 --- faxGettyApp.c++ 26 Apr 2008 22:34:28 -0000 1.24 *************** *** 245,249 **** } } ! if (done || ringsBeforeAnswer && (ringsHeard >= ringsBeforeAnswer)) answerPhone(ClassModem::ANSTYPE_ANY, ctype, received_callid); else if (isModemInput()) --- 245,249 ---- } } ! if (done || (ringsBeforeAnswer && (ringsHeard >= ringsBeforeAnswer))) answerPhone(ClassModem::ANSTYPE_ANY, ctype, received_callid); else if (isModemInput()) Index: Trigger.c++ =================================================================== RCS file: /cvsroot/hylafax/hylafax/faxd/Trigger.c++,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Trigger.c++ 16 Jan 2008 17:38:23 -0000 1.6 --- Trigger.c++ 26 Apr 2008 22:34:28 -0000 1.7 *************** *** 469,472 **** --- 469,473 ---- delete event; hookCmd = prg; + return (true); } |