|
Hylafax Developers Mailing List Archives
|
[Date Prev][Date Next][Thread Prev][Thread Next]
[Date Index]
[Thread Index]
[hylafax-devel] Re: CVS brokenness
Hi All,
Maybe someone with eyeballs more open than mine can spot the problem easily
here...I can't figure out what is trying to be done....
tis late...and I'm going to print this out & go home, no point in getting
a bruise.....on my forehead....
So, the code that is causing the problem compiling BoolArray.c++
The only place I can find the "other" that is used here is in the fxObj
class...and there is a fxObj::dec as well, so it would seem to fit..??
----------------------------------------------------------------------
class fxBoolArray Ptr {
protected:
fxBoolArray * p;
void destroy() {
if (p) p->dec();
}
public:
fxBoolArray Ptr () { p = 0; }
fxBoolArray Ptr ( fxBoolArray *tp) {
p = tp ? (tp->inc(),tp) : 0;
}
fxBoolArray Ptr (const fxBoolArray Ptr & other) {
p = other.p ? (other.p->inc(),other.p) : 0;
}
~fxBoolArray Ptr () { destroy(); }
fxBoolArray Ptr & operator=(const fxBoolArray Ptr & other) {
if (p != other.p) {
destroy();
p = other.p ? (other.p->inc(),other.p) : 0;
}
return *this;
}
fxBoolArray Ptr & operator=( fxBoolArray * tp) {
if (p != tp) {
destroy();
p = tp ? (tp->inc(),tp) : 0;
}
return *this;
}
int compare(const fxBoolArray Ptr *other) const {
return int((char *)p - (char *)other->p);
}
operator fxBoolArray *() { return p; }
operator const fxBoolArray *() const { return p; }
fxBoolArray * operator ->() { return p; }
const fxBoolArray * operator ->() const { return p; }
};
----------------------------------------------------------------------
And the error(s) being generated...
I arranged things so that this was exactly the 1200 line in the file,
then cut out the class & modified the line #'s for the errors.
If someone want's the whole file, let me know...
----------------------------------------------------------------------
y.i:02: syntax error before `{'
y.i: In function `void destroy()':
y.i:07: `p' undeclared (first use this function)
y.i:07: (Each undeclared identifier is reported only once
y.i:07: for each function it appears in.)
y.i: At top level:
y.i:10: parse error before `public'
y.i:15: parse error before `&'
y.i: In function `class fxBoolArray Ptr(...)':
y.i:16: `other' undeclared (first use this function)
y.i: At top level:
y.i:18: destructors must be member functions
y.i:18: syntax error before `('
y.i:20: syntax error before `&'
y.i:23: ANSI C++ forbids declaration `p' with no type
y.i:23: `int p' used prior to declaration
y.i:24: parse error before `}'
y.i:27: syntax error before `&'
y.i:30: ANSI C++ forbids declaration `p' with no type
y.i:30: redefinition of `int p'
y.i:23: `int p' previously defined here
y.i:30: `tp' was not declared in this scope
y.i:30: `tp' was not declared in this scope
y.i:30: `tp' was not declared in this scope
y.i:31: parse error before `}'
y.i:34: parse error before `*'
y.i:34: non-member function `compare(...)' cannot have `const' method qualifier
y.i:37: `operator fxBoolArray *()' must be a nonstatic member function
y.i:37: `operator fxBoolArray *()' must take exactly one argument
y.i: In function `operator fxBoolArray *()':
y.i:37: return to `fxBoolArray *' from `int' lacks a cast
y.i: At top level:
y.i:38: non-member function `operator const fxBoolArray *()' cannot have `const' method qualifier
y.i:38: `operator const fxBoolArray *()' must be a nonstatic member function
y.i:38: `operator const fxBoolArray *()' must take exactly one argument
y.i: In function `operator const fxBoolArray *()':
y.i:38: return to `const fxBoolArray *' from `int' lacks a cast
y.i: At top level:
y.i:39: `operator ->()' must be a nonstatic member function
y.i:39: `operator ->()' must take exactly one argument
y.i: In function `class fxBoolArray * operator ->()':
y.i:39: return to `fxBoolArray *' from `int' lacks a cast
y.i: At top level:
y.i:40: non-member function `operator ->()' cannot have `const' method qualifier
y.i:40: `operator ->()' must be a nonstatic member function
y.i:40: `operator ->()' must take exactly one argument
y.i: In function `const class fxBoolArray * operator ->()':
y.i:40: new declaration `const class fxBoolArray * operator ->()'
y.i:39: ambiguates old declaration `class fxBoolArray * operator ->()'
y.i: In function `class fxBoolArray * operator ->()':
y.i:40: return to `const fxBoolArray *' from `int' lacks a cast
y.i: At top level:
y.i:41: parse error before `}'
>
> --=====================_7883806==_
> Content-Type: text/plain; charset="us-ascii"; format=flowed
>
> At 02:02 AM 3/2/00 +0000, Darren Nickerson wrote:
>
> >Folks,
> >
> >Can't anyone suggest a fix for the current syntax error compiling
> >util/BoolArray.c++? Is C++ really that hard?
>
> It might not be a syntax error, there are some hacks to add a namespace to
> the classes(the Ptr.h) and it seems to be breaking around there.
>
> What does the define
> #define fxCAT(a,b) a##b
> resolve to?...does it just concatenate or something weird with the double
> hash? The Ptr.h classname is defined by that macro which is roughly in the
> area i think the error is occurring.
>
> Attached are all the patches to the util directory since beta2, if beta2
> compiles then add the diff section by section till it breaks.
>
> PS It is not really a C++ problem i don't think, more a C++ compiler
> problem....whoever wrote this wanted some template classes and namespaces,
> but cause the compilers at the time probably didnt support templates they
> wrote it using the preprocessor(sort of like trying to paint the mona lisa
> with a spray gun ;-)...the result is that it is extremely difficult to work
> out what is going on.
>
> - Robert
>
> --=====================_7883806==_
> Content-Type: text/plain; charset="iso-8859-1"
> Content-Transfer-Encoding: quoted-printable
> Content-Disposition: attachment; filename="util.diff"
>
> Index:=
> util/Array.h=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0ARCS=
> file: /usr/local/cvsroot/hylafax/util/Array.h,v=0Aretrieving revision=
> 1.2=0Aretrieving revision 1.3=0Adiff -c -r1.2 -r1.3=0A***=
> util/Array.h 1999/06/13 07:41:19 1.2=0A--- util/Array.h 1999/08/23=
> 11:19:42 1.3=0A***************=0A*** 1,4 ****=0A! /* $Id: Array.h,v 1.2=
> 1999/06/13 07:41:19 robert Exp $ */=0A /*=0A * Copyright (c) 1990-1996=
> Sam Leffler=0A * Copyright (c) 1991-1996 Silicon Graphics, Inc.=0A--- 1,4=
> ----=0A! /* $Id: Array.h,v 1.3 1999/08/23 11:19:42 robert Exp $ */=0A /*=
> =0A * Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c) 1991-1996=
> Silicon Graphics, Inc.=0A***************=0A*** 25,30 ****=0A--- 25,31 ----=
> =0A */=0A #ifndef _Array_=0A #define _Array_=0A+ #include <stdlib.h>=0A =
> #include "Obj.h"=0A #include "Ptr.h"=0A =0A***************=0A*** 35,41=
> ****=0A ARRAY();=0A ARRAY(u_int size);=0A ARRAY(ARRAY const=
> &);=0A! void operator=3D(ARRAY const &);=0A ITEM &=
> operator[](u_int index) const;=0A u_int length() const;=0A void=
> append(ITEM const & item);=0A--- 36,42 ----=0A ARRAY();=0A =
> ARRAY(u_int size);=0A ARRAY(ARRAY const &);=0A! ARRAY&=
> operator=3D(ARRAY const &);=0A ITEM & operator[](u_int index) const;=
> =0A u_int length() const;=0A void append(ITEM const &=
> item);=0A***************=0A*** 112,118 ****=0A virtual ~fxArray();=0A =
> =0A void * operator[](u_int index) { return data + elementsize*index;=
> }=0A! void operator=3D(fxArray const &);=0A =0A void append(void=
> const *item);=0A void append(fxArray const &);=0A--- 113,119 ----=0A =
> virtual ~fxArray();=0A =0A void * operator[](u_int index) { return=
> data + elementsize*index; }=0A! fxArray& operator=3D(fxArray const &);=
> =0A =0A void append(void const *item);=0A void append(fxArray=
> const &);=0A***************=0A*** 175,183 ****=0A ARRAY(ARRAY=
> const&a); \=0A ~ARRAY(); \=0A virtual const char*=
> className() const; \=0A! void operator=3D(ARRAY const&a) { \=0A!=
> maxi =3D a.maxi; num =3D a.num; if (data) delete (void*)data; \=0A! data=
> =3D a.raw_copy(); } \=0A ITEM & operator[](u_int index) { \=
> =0A fxAssert(index*sizeof(ITEM) < num, "Invalid Array[] index"); \=0A=
> return *(ITEM *)((char *)((void *)data) + index*sizeof(ITEM)); \=0A-=
> -- 176,184 ----=0A ARRAY(ARRAY const&a); \=0A =
> ~ARRAY(); \=0A virtual const char* className() const; \=0A! =
> ARRAY& operator=3D(ARRAY const& a) { \=0A! maxi =3D a.maxi;=
> num =3D a.num; if (data) free(data); \=0A! data =3D=
> memmove(malloc(num), a.data, num); return (*this);} \=0A ITEM &=
> operator[](u_int index) { \=0A fxAssert(index*sizeof(ITEM) <=
> num, "Invalid Array[] index"); \=0A return *(ITEM *)((char *)((void=
> *)data) + index*sizeof(ITEM)); \=0AIndex:=
> util/Dictionary.c++=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =0ARCS file: /usr/local/cvsroot/hylafax/util/Dictionary.c++,v=0Aretrieving=
> revision 1.2=0Aretrieving revision 1.3=0Adiff -c -r1.2 -r1.3=0A***=
> util/Dictionary.c++ 1999/06/13 07:41:20 1.2=0A---=
> util/Dictionary.c++ 1999/08/23 11:19:42 1.3=0A***************=0A*** 1,4=
> ****=0A! /* $Id: Dictionary.c++,v 1.2 1999/06/13 07:41:20 robert Exp $ */=
> =0A /*=0A * Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c)=
> 1991-1996 Silicon Graphics, Inc.=0A--- 1,4 ----=0A! /* $Id:=
> Dictionary.c++,v 1.3 1999/08/23 11:19:42 robert Exp $ */=0A /*=0A *=
> Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c) 1991-1996 Silicon=
> Graphics, Inc.=0A***************=0A*** 85,91 ****=0A =0A =
> fxDictBucket::~fxDictBucket()=0A {=0A! delete kvmem;=0A }=0A =0A =
> void=0A--- 85,91 ----=0A =0A fxDictBucket::~fxDictBucket()=0A {=0A! =
> if (kvmem) free(kvmem);=0A }=0A =0A void=0AIndex:=
> util/Dispatcher.c++=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =0ARCS file: /usr/local/cvsroot/hylafax/util/Dispatcher.c++,v=0Aretrieving=
> revision 1.6=0Aretrieving revision 1.7=0Adiff -c -r1.6 -r1.7=0A***=
> util/Dispatcher.c++ 1999/06/13 07:41:21 1.6=0A---=
> util/Dispatcher.c++ 1999/09/01 12:33:45 1.7=0A***************=0A*** 551,573=
> ****=0A fd_set& rmaskret, fd_set& wmaskret, fd_set& emaskret, timeval*=
> howlong=0A ) {=0A int nfound;=0A! #if defined(SV_INTERRUPT) //=
> BSD-style=0A! static struct sigvec sv, osv;=0A! #elif=
> defined(SA_NOCLDSTOP) // POSIX=0A static struct sigaction sa, osa;=0A=
> #else // System V-style=0A void (*osig)();=0A #endif=0A =0A =
> if (!_cqueue->isEmpty()) {=0A! #if defined(SV_INTERRUPT) // BSD-style=0A!=
> sv.sv_handler =3D fxSIGVECHANDLER(&Dispatcher::sigCLD);=0A! sv.sv_flags =
> =3D SV_INTERRUPT;=0A! sigvec(SIGCHLD, &sv, &osv);=0A! #elif=
> defined(SA_NOCLDSTOP) // POSIX=0A sa.sa_handler =3D=
> fxSIGACTIONHANDLER(&Dispatcher::sigCLD);=0A sa.sa_flags =3D=
> SA_INTERRUPT;=0A sigaction(SIGCLD, &sa, &osa);=0A #else // System=
> V-style=0A osig =3D (void (*)())signal(SIGCLD,=
> fxSIGHANDLER(&Dispatcher::sigCLD));=0A #endif=0A--- 551,573 ----=0A =
> fd_set& rmaskret, fd_set& wmaskret, fd_set& emaskret, timeval* howlong=0A =
> ) {=0A int nfound;=0A! #if defined(SA_NOCLDSTOP) // POSIX=0A =
> static struct sigaction sa, osa;=0A+ #elif defined(SV_INTERRUPT) //=
> BSD-style=0A+ static struct sigvec sv, osv;=0A #else // System=
> V-style=0A void (*osig)();=0A #endif=0A =0A if=
> (!_cqueue->isEmpty()) {=0A! #if defined(SA_NOCLDSTOP) // POSIX=0A =
> sa.sa_handler =3D fxSIGACTIONHANDLER(&Dispatcher::sigCLD);=0A =
> sa.sa_flags =3D SA_INTERRUPT;=0A sigaction(SIGCLD, &sa, &osa);=0A+ #elif=
> defined(SV_INTERRUPT) // BSD-style=0A+ sv.sv_handler =3D=
> fxSIGVECHANDLER(&Dispatcher::sigCLD);=0A+ sv.sv_flags =3D SV_INTERRUPT;=0A=
> + sigvec(SIGCHLD, &sv, &osv);=0A #else // System V-style=0A osig =3D=
> (void (*)())signal(SIGCLD, fxSIGHANDLER(&Dispatcher::sigCLD));=0A =
> #endif=0A***************=0A*** 608,617 ****=0A } while (nfound < 0 &&=
> !handleError());=0A }=0A if (!_cqueue->isEmpty()) {=0A! #if=
> defined(SV_INTERRUPT) // BSD-style=0A! sigvec(SIGCHLD, &osv, (struct=
> sigvec*) 0);=0A! #elif defined(SA_NOCLDSTOP) // POSIX=0A =
> sigaction(SIGCLD, &osa, (struct sigaction*) 0);=0A #else // System=
> V-style=0A (void) signal(SIGCLD, fxSIGHANDLER(osig));=0A #endif=0A---=
> 608,617 ----=0A } while (nfound < 0 && !handleError());=0A }=0A =
> if (!_cqueue->isEmpty()) {=0A! #if defined(SA_NOCLDSTOP) // POSIX=0A =
> sigaction(SIGCLD, &osa, (struct sigaction*) 0);=0A+ #elif=
> defined(SV_INTERRUPT) // BSD-style=0A+ sigvec(SIGCHLD, &osv, (struct=
> sigvec*) 0);=0A #else // System V-style=0A (void) signal(SIGCLD,=
> fxSIGHANDLER(osig));=0A #endif=0AIndex:=
> util/FaxDB.c++=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0ARCS=
> file: /usr/local/cvsroot/hylafax/util/FaxDB.c++,v=0Aretrieving revision=
> 1.2=0Aretrieving revision 1.3=0Adiff -c -r1.2 -r1.3=0A***=
> util/FaxDB.c++ 1999/06/13 07:41:22 1.2=0A--- util/FaxDB.c++ 1999/08/23=
> 11:19:42 1.3=0A***************=0A*** 1,4 ****=0A! /* $Id: FaxDB.c++,v 1.2=
> 1999/06/13 07:41:22 robert Exp $ */=0A /*=0A * Copyright (c) 1990-1996=
> Sam Leffler=0A * Copyright (c) 1991-1996 Silicon Graphics, Inc.=0A--- 1,4=
> ----=0A! /* $Id: FaxDB.c++,v 1.3 1999/08/23 11:19:42 robert Exp $ */=0A =
> /*=0A * Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c)=
> 1991-1996 Silicon Graphics, Inc.=0A***************=0A*** 120,126 ****=0A =
> if (key =3D=3D "]") {=0A if (parent =3D=3D 0)=0A fprintf(stderr,=
> "%s: line %d: Unmatched \"]\".\n",=0A! (char*) filename, lineno);=0A =
> break;=0A }=0A if (key =3D=3D "[") {=0A--- 120,126 ----=0A if=
> (key =3D=3D "]") {=0A if (parent =3D=3D 0)=0A fprintf(stderr, "%s:=
> line %d: Unmatched \"]\".\n",=0A! (const char*) filename, lineno);=0A=
> break;=0A }=0A if (key =3D=3D "[") {=0A***************=0A***=
> 132,138 ****=0A break;=0A if (value !=3D ":") {=0A =
> fprintf(stderr, "%s: line %d: Missing \":\" separator.\n",=0A! (char*)=
> filename, lineno);=0A continue;=0A }=0A if (!getToken(fd,=
> value))=0A--- 132,138 ----=0A break;=0A if (value !=3D ":") {=0A =
> fprintf(stderr, "%s: line %d: Missing \":\" separator.\n",=0A! (const=
> char*) filename, lineno);=0A continue;=0A }=0A if (!getToken(fd,=
> value))=0A***************=0A*** 179,185 ****=0A if (c =3D=3D '\\') {=
> =0A c =3D getc(fd);=0A if (c =3D=3D EOF) {=0A! fprintf(stderr,=
> "%s: Premature EOF.\n", (char*) filename);=0A return (false);=0A =
> }=0A // XXX handle standard escapes=0A--- 179,185 ----=0A if (c=
> =3D=3D '\\') {=0A c =3D getc(fd);=0A if (c =3D=3D EOF) {=0A! =
> fprintf(stderr, "%s: Premature EOF.\n", (const char*) filename);=0A =
> return (false);=0A }=0A // XXX handle standard=
> escapes=0A***************=0A*** 202,208 ****=0A ungetc(c, fd);=0A =
> }=0A buf.set('\0');=0A! token =3D (char*) buf;=0A return=
> (true);=0A }=0A =0A--- 202,208 ----=0A ungetc(c, fd);=0A }=0A =
> buf.set('\0');=0A! token =3D (const char*) buf;=0A return=
> (true);=0A }=0A =0AIndex:=
> util/SendFaxClient.c++=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=0ARCS file:=
> /usr/local/cvsroot/hylafax/util/SendFaxClient.c++,v=0Aretrieving revision=
> 1.3=0Aretrieving revision 1.4=0Adiff -c -r1.3 -r1.4=0A***=
> util/SendFaxClient.c++ 1999/06/13 07:41:24 1.3=0A---=
> util/SendFaxClient.c++ 1999/08/23 11:19:42 1.4=0A***************=0A*** 1,4=
> ****=0A! /* $Id: SendFaxClient.c++,v 1.3 1999/06/13 07:41:24 robert Exp $=
> */=0A /*=0A * Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c)=
> 1991-1996 Silicon Graphics, Inc.=0A--- 1,4 ----=0A! /* $Id:=
> SendFaxClient.c++,v 1.4 1999/08/23 11:19:42 robert Exp $ */=0A /*=0A *=
> Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c) 1991-1996 Silicon=
> Graphics, Inc.=0A***************=0A*** 190,197 ****=0A bool=0A =
> SendFaxClient::makeCoverPage(const SendFaxJob& job, fxStr& file, fxStr&=
> emsg)=0A {=0A! tmpFile =3D _PATH_TMP "/sndfaxXXXXXX";=0A! int fd =
> =3D Sys::mkstemp(tmpFile);=0A if (fd >=3D 0) {=0A #define MAXARGS 128=
> =0A const char* av[MAXARGS];=0A--- 190,199 ----=0A bool=0A =
> SendFaxClient::makeCoverPage(const SendFaxJob& job, fxStr& file, fxStr&=
> emsg)=0A {=0A! char buff[128];=0A! sprintf(buff,=
> "%s/sndfaxXXXXXX", _PATH_TMP);=0A! int fd =3D Sys::mkstemp(buff);=0A! =
> tmpFile =3D buff;=0A if (fd >=3D 0) {=0A #define MAXARGS 128=0A =
> const char* av[MAXARGS];=0A***************=0A*** 638,645 ****=0A if=
> (info.temp !=3D "" && info.temp !=3D info.name)=0A =
> Sys::unlink(info.temp);=0A if (info.rule->getCmd() !=3D "") { //=
> conversion required=0A! tmpFile =3D _PATH_TMP "/faxsndXXXXXX";=0A!=
> Sys::mktemp(tmpFile);=0A /*=0A * XXX **** WARNING **** XXXX=0A =
> *=0A--- 640,649 ----=0A if (info.temp !=3D "" && info.temp !=3D=
> info.name)=0A Sys::unlink(info.temp);=0A if (info.rule->getCmd() !=
> =3D "") { // conversion required=0A! char buff[128];=0A! =
> sprintf(buff, "%s/sndfaxXXXXXX", _PATH_TMP);=0A! Sys::mktemp(buff);=0A!=
> tmpFile =3D buff;=0A /*=0A * XXX **** WARNING **** XXXX=0A =
> *=0AIndex:=
> util/Socket.h=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0ARCS=
> file: /usr/local/cvsroot/hylafax/util/Socket.h,v=0Aretrieving revision=
> 1.3=0Aretrieving revision 1.4=0Adiff -c -r1.3 -r1.4=0A***=
> util/Socket.h 1999/06/05 07:10:04 1.3=0A--- util/Socket.h 1999/09/02=
> 10:16:24 1.4=0A***************=0A*** 1,4 ****=0A! /* $Id: Socket.h,v 1.3=
> 1999/06/05 07:10:04 robert Exp $ */=0A /*=0A * Copyright (c) 1995-1996=
> Sam Leffler=0A * Copyright (c) 1995-1996 Silicon Graphics, Inc.=0A--- 1,4=
> ----=0A! /* $Id: Socket.h,v 1.4 1999/09/02 10:16:24 robert Exp $ */=0A /*=
> =0A * Copyright (c) 1995-1996 Sam Leffler=0A * Copyright (c) 1995-1996=
> Silicon Graphics, Inc.=0A***************=0A*** 56,75 ****=0A =0A class=
> Socket {=0A public:=0A! static int accept(int s, void* addr,=
> socklen_t* addrlen)=0A! { return ::accept(s, (struct sockaddr*) addr,=
> addrlen); }=0A! static int bind(int s, const void* addr, int addrlen)=
> =0A! { return ::bind(s, (const struct sockaddr*) addr, addrlen); }=0A! =
> static int connect(int s, const void* addr, int addrlen)=0A! { return=
> ::connect(s, (const struct sockaddr*) addr, addrlen); }=0A! static int=
> getpeername(int s, void* name, socklen_t* namelen)=0A! { return=
> ::getpeername(s, (struct sockaddr*) name, namelen); }=0A! static int=
> getsockname(int s, void* name, socklen_t* namelen)=0A! { return=
> ::getsockname(s, (struct sockaddr*) name, namelen); }=0A! static int=
> setsockopt(int s, int level, int oname, const void* oval, int olen)=0A! {=
> return ::setsockopt(s, level, oname, (const char*) oval, olen); }=0A! =0A! =
> static struct hostent* gethostbyname(const char* name)=0A! { return=
> ::gethostbyname(name); }=0A };=0A #endif /* _Socket_ */=0A--- 56,115=
> ----=0A =0A class Socket {=0A public:=0A! static int accept(int s,=
> void* addr, socklen_t* addrlen);=0A! static int bind(int s, const void*=
> addr, int addrlen);=0A! static int connect(int s, const void* addr, int=
> addrlen);=0A! static int getpeername(int s, void* name, socklen_t*=
> namelen);=0A! static int getsockname(int s, void* name, socklen_t*=
> namelen);=0A! static int setsockopt(int s, int level, int oname, const=
> void* oval, int olen);=0A! static struct hostent* gethostbyname(const=
> char* name);=0A };=0A+ =0A+ inline int Socket::accept(int s, void* addr,=
> socklen_t* addrlen)=0A+ {=0A+ #ifdef CONFIG_HPUX_SOCKLEN_T_BRAINDAMAGE=0A+ =
> return ::accept(s, (struct sockaddr*) addr, (int*)addrlen);=0A+ #else=0A=
> + return ::accept(s, (struct sockaddr*) addr, addrlen);=0A+ #endif=0A+=
> }=0A+ =0A+ inline int Socket::bind(int s, const void* addr, int addrlen)=0A=
> + {=0A+ return ::bind(s, (const struct sockaddr*) addr, addrlen);=0A+=
> }=0A+ =0A+ inline int Socket::connect(int s, const void* addr, int=
> addrlen)=0A+ {=0A+ return ::connect(s, (const struct sockaddr*) addr,=
> addrlen);=0A+ }=0A+ =0A+ inline int Socket::getpeername(int s, void* name,=
> socklen_t* namelen)=0A+ {=0A+ #ifdef CONFIG_HPUX_SOCKLEN_T_BRAINDAMAGE=0A+ =
> return ::getpeername(s, (struct sockaddr*) name, (int*)namelen);=0A+=
> #else=0A+ return ::getpeername(s, (struct sockaddr*) name, namelen);=0A=
> + #endif=0A+ }=0A+ =0A+ inline int Socket::getsockname(int s, void* name,=
> socklen_t* namelen)=0A+ {=0A+ #ifdef CONFIG_HPUX_SOCKLEN_T_BRAINDAMAGE=0A+ =
> return ::getsockname(s, (struct sockaddr*) name, (int*)namelen);=0A+=
> #else=0A+ return ::getsockname(s, (struct sockaddr*) name, namelen);=0A=
> + #endif=0A+ }=0A+ =0A+ inline int Socket::setsockopt(int s, int level, int=
> oname, const void* oval, int olen)=0A+ {=0A+ return ::setsockopt(s,=
> level, oname, (const char*) oval, olen);=0A+ }=0A+ =0A+ inline struct=
> hostent* Socket::gethostbyname(const char* name)=0A+ {=0A+ return=
> ::gethostbyname(name);=0A+ }=0A+ =0A #endif /* _Socket_ */=0AIndex:=
> util/StackBuffer.h=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0AR=
> CS file: /usr/local/cvsroot/hylafax/util/StackBuffer.h,v=0Aretrieving=
> revision 1.2=0Aretrieving revision 1.3=0Adiff -c -r1.2 -r1.3=0A***=
> util/StackBuffer.h 1999/01/02 04:12:43 1.2=0A---=
> util/StackBuffer.h 1999/08/23 11:19:43 1.3=0A***************=0A*** 1,4=
> ****=0A! /* $Id: StackBuffer.h,v 1.2 1999/01/02 04:12:43 robert Exp $ */=0A=
> /*=0A * Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c)=
> 1991-1996 Silicon Graphics, Inc.=0A--- 1,4 ----=0A! /* $Id: StackBuffer.h,v=
> 1.3 1999/08/23 11:19:43 robert Exp $ */=0A /*=0A * Copyright (c)=
> 1990-1996 Sam Leffler=0A * Copyright (c) 1991-1996 Silicon Graphics,=
> Inc.=0A***************=0A*** 54,61 ****=0A u_int getLength()=
> const; // Return number of bytes in buffer=0A =0A // NB: the buffer=
> is *NOT* null terminated, unless you put one there.=0A! operator=
> char*(); // Return base of buffer=0A! operator unsigned char*(); //=
> Return base of buffer=0A operator const char*() const; // Return base=
> of buffer=0A operator const unsigned char*() const;// Return base of=
> buffer=0A char& operator[](u_int i) const; // Return character in=
> buffer=0A--- 54,62 ----=0A u_int getLength() const; // Return number=
> of bytes in buffer=0A =0A // NB: the buffer is *NOT* null terminated,=
> unless you put one there.=0A! // the operator char*() removed by rjc=
> 8/99 as causes gcc-2.95 problems=0A! //operator char*(); // Return=
> base of buffer=0A! //operator unsigned char*(); // Return base of=
> buffer=0A operator const char*() const; // Return base of buffer=0A =
> operator const unsigned char*() const;// Return base of buffer=0A =
> char& operator[](u_int i) const; // Return character in=
> buffer=0A***************=0A*** 77,84 ****=0A inline void=
> fxStackBuffer::put(char const* c) { put(c, strlen(c)); }=0A inline void=
> fxStackBuffer::set(char c) { put(c); next--; }=0A inline void=
> fxStackBuffer::reset() { next =3D base; }=0A! inline=
> fxStackBuffer::operator char*() { return base; }=0A! inline=
> fxStackBuffer::operator unsigned char*() { return (unsigned char*)base; }=
> =0A inline fxStackBuffer::operator const char*() const=0A { return=
> base; }=0A inline fxStackBuffer::operator const unsigned char*() const=0A-=
> -- 78,85 ----=0A inline void fxStackBuffer::put(char const* c) { put(c,=
> strlen(c)); }=0A inline void fxStackBuffer::set(char c) { put(c); next--;=
> }=0A inline void fxStackBuffer::reset() { next =3D base; }=0A! //inline=
> fxStackBuffer::operator char*() { return base; }=0A! //inline=
> fxStackBuffer::operator unsigned char*() { return (unsigned char*)base; }=
> =0A inline fxStackBuffer::operator const char*() const=0A { return=
> base; }=0A inline fxStackBuffer::operator const unsigned char*()=
> const=0AIndex:=
> util/Str.h=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0ARCS=
> file: /usr/local/cvsroot/hylafax/util/Str.h,v=0Aretrieving revision=
> 1.2=0Aretrieving revision 1.3=0Adiff -c -r1.2 -r1.3=0A***=
> util/Str.h 1999/06/13 07:41:25 1.2=0A--- util/Str.h 1999/08/23=
> 11:19:43 1.3=0A***************=0A*** 1,4 ****=0A! /* $Id: Str.h,v 1.2=
> 1999/06/13 07:41:25 robert Exp $ */=0A /*=0A * Copyright (c) 1990-1996=
> Sam Leffler=0A * Copyright (c) 1991-1996 Silicon Graphics, Inc.=0A--- 1,4=
> ----=0A! /* $Id: Str.h,v 1.3 1999/08/23 11:19:43 robert Exp $ */=0A /*=0A =
> * Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c) 1991-1996=
> Silicon Graphics, Inc.=0A***************=0A*** 99,106 ****=0A =
> /////////////////////////////////////////////////////=0A u_long hash()=
> const;=0A =0A! operator char*()=0A! { return data; }=0A operator=
> const char*() const=0A { return data; }=0A operator int() const=0A--=
> - 99,107 ----=0A /////////////////////////////////////////////////////=
> =0A u_long hash() const;=0A =0A! // Removed by rjc 8/1999 because=
> gives ugly warning with gcc-2.95=0A! //operator char*()=0A! //{ return=
> data; }=0A operator const char*() const=0A { return data; }=0A =
> operator int() const=0AIndex:=
> util/Sys.h=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0ARCS=
> file: /usr/local/cvsroot/hylafax/util/Sys.h,v=0Aretrieving revision=
> 1.3=0Aretrieving revision 1.4=0Adiff -c -r1.3 -r1.4=0A***=
> util/Sys.h 1999/06/13 07:41:25 1.3=0A--- util/Sys.h 1999/11/18=
> 12:18:58 1.4=0A***************=0A*** 1,4 ****=0A! /* $Id: Sys.h,v 1.3=
> 1999/06/13 07:41:25 robert Exp $ */=0A /*=0A * Copyright (c) 1994-1996=
> Sam Leffler=0A * Copyright (c) 1994-1996 Silicon Graphics, Inc.=0A--- 1,4=
> ----=0A! /* $Id: Sys.h,v 1.4 1999/11/18 12:18:58 robert Exp $ */=0A /*=0A =
> * Copyright (c) 1994-1996 Sam Leffler=0A * Copyright (c) 1994-1996=
> Silicon Graphics, Inc.=0A***************=0A*** 123,129 ****=0A { return=
> ::gethostname(name, namelen); }=0A =0A static char* mktemp(char*=
> templ) { return ::mktemp(templ); }=0A! static int mkstemp(char*=
> templ) { return ::mkstemp(templ); }=0A static FILE* tmpfile() { return=
> ::tmpfile(); }=0A static FILE* fopen(const char* filename, const char*=
> mode)=0A { return ::fopen(filename, mode); }=0A--- 123,139 ----=0A {=
> return ::gethostname(name, namelen); }=0A =0A static char*=
> mktemp(char* templ) { return ::mktemp(templ); }=0A! =0A! static int=
> mkstemp(char* templ) {=0A! int fd =3D mkstemp(templ);=0A! #if=
> defined __GLIBC__ && __GLIBC__ <=3D 2 && __GLIBC_MINOR__ <=3D 0=0A! =
> // Hack for older versions of glibc which do not set the file=0A! =
> // permissions correctly=0A! if (fchmod(fd, S_IRUSR | S_IWUSR) =3D=
> =3D -1) return -1;=0A! #endif=0A! return fd;=0A! }=0A! =0A =
> static FILE* tmpfile() { return ::tmpfile(); }=0A static FILE*=
> fopen(const char* filename, const char* mode)=0A { return=
> ::fopen(filename, mode); }=0AIndex:=
> util/TextFmt.c++=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0AR=
> CS file: /usr/local/cvsroot/hylafax/util/TextFmt.c++,v=0Aretrieving revision=
> 1.5=0Aretrieving revision 1.6=0Adiff -c -r1.5 -r1.6=0A***=
> util/TextFmt.c++ 1999/06/13 07:41:25 1.5=0A--- util/TextFmt.c++ 1999/09/10=
> 08:48:24 1.6=0A***************=0A*** 1,4 ****=0A! /* $Id: TextFmt.c++,v 1.5=
> 1999/06/13 07:41:25 robert Exp $ */=0A /*=0A * Copyright (c) 1993-1996=
> Sam Leffler=0A * Copyright (c) 1993-1996 Silicon Graphics, Inc.=0A--- 1,4=
> ----=0A! /* $Id: TextFmt.c++,v 1.6 1999/09/10 08:48:24 robert Exp $ */=0A =
> /*=0A * Copyright (c) 1993-1996 Sam Leffler=0A * Copyright (c)=
> 1993-1996 Silicon Graphics, Inc.=0A***************=0A*** 514,520 ****=0A =
> fprintf(output, "%%%%For: %s\n", cp ? cp : "");=0A fputs("%%Origin:=
> 0 0\n", output);=0A fprintf(output, "%%%%BoundingBox: 0 0 %.0f=
> %.0f\n",=0A! physPageHeight*72, physPageWidth*72);=0A fputs("%%Pages:=
> (atend)\n", output);=0A fprintf(output, "%%%%PageOrder: %s\n",=0A =
> reverse ? "Descend" : "Ascend");=0A--- 514,520 ----=0A =
> fprintf(output, "%%%%For: %s\n", cp ? cp : "");=0A fputs("%%Origin: 0=
> 0\n", output);=0A fprintf(output, "%%%%BoundingBox: 0 0 %.0f=
> %.0f\n",=0A! physPageWidth*72, physPageHeight*72);=0A fputs("%%Pages:=
> (atend)\n", output);=0A fprintf(output, "%%%%PageOrder: %s\n",=0A =
> reverse ? "Descend" : "Ascend");=0AIndex:=
> util/Timeout.c++=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0AR=
> CS file: /usr/local/cvsroot/hylafax/util/Timeout.c++,v=0Aretrieving revision=
> 1.2=0Aretrieving revision 1.3=0Adiff -c -r1.2 -r1.3=0A***=
> util/Timeout.c++ 1999/06/13 07:41:26 1.2=0A--- util/Timeout.c++ 1999/09/01=
> 12:33:45 1.3=0A***************=0A*** 1,4 ****=0A! /* $Id: Timeout.c++,v 1.2=
> 1999/06/13 07:41:26 robert Exp $ */=0A /*=0A * Copyright (c) 1990-1996=
> Sam Leffler=0A * Copyright (c) 1991-1996 Silicon Graphics, Inc.=0A--- 1,4=
> ----=0A! /* $Id: Timeout.c++,v 1.3 1999/09/01 12:33:45 robert Exp $ */=0A =
> /*=0A * Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c)=
> 1991-1996 Silicon Graphics, Inc.=0A***************=0A*** 48,64 ****=0A =
> Timeout::startTimeout(long ms)=0A {=0A timerExpired =3D false;=0A-=
> #ifdef SV_INTERRUPT /* BSD-style */=0A- static struct sigvec sv;=0A- =
> sv.sv_handler =3D fxSIGVECHANDLER(Timeout::sigAlarm);=0A- =
> sv.sv_flags =3D SV_INTERRUPT;=0A- sigvec(SIGALRM, &sv, (struct sigvec*)=
> 0);=0A- #else=0A #ifdef SA_NOCLDSTOP /* POSIX */=0A static struct=
> sigaction sa;=0A sa.sa_handler =3D=
> fxSIGACTIONHANDLER(Timeout::sigAlarm);=0A sa.sa_flags =3D=
> SA_INTERRUPT;=0A sigaction(SIGALRM, &sa, (struct sigaction*) 0);=0A =
> #else /* System V-style */=0A signal(SIGALRM,=
> fxSIGHANDLER(sigAlarm));=0A #endif=0A--- 48,64 ----=0A =
> Timeout::startTimeout(long ms)=0A {=0A timerExpired =3D false;=0A =
> #ifdef SA_NOCLDSTOP /* POSIX */=0A static struct sigaction sa;=0A =
> sa.sa_handler =3D fxSIGACTIONHANDLER(Timeout::sigAlarm);=0A =
> sa.sa_flags =3D SA_INTERRUPT;=0A sigaction(SIGALRM, &sa, (struct=
> sigaction*) 0);=0A+ #else=0A+ #ifdef SV_INTERRUPT /* BSD-style */=0A+ =
> static struct sigvec sv;=0A+ sv.sv_handler =3D=
> fxSIGVECHANDLER(Timeout::sigAlarm);=0A+ sv.sv_flags =3D SV_INTERRUPT;=
> =0A+ sigvec(SIGALRM, &sv, (struct sigvec*) 0);=0A #else /* System=
> V-style */=0A signal(SIGALRM, fxSIGHANDLER(sigAlarm));=0A =
> #endif=0AIndex:=
> util/dialtest.c++=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0AR=
> CS file: /usr/local/cvsroot/hylafax/util/dialtest.c++,v=0Aretrieving=
> revision 1.2=0Aretrieving revision 1.3=0Adiff -c -r1.2 -r1.3=0A***=
> util/dialtest.c++ 1999/06/13 07:41:27 1.2=0A---=
> util/dialtest.c++ 1999/08/23 11:19:43 1.3=0A***************=0A*** 1,4=
> ****=0A! /* $Id: dialtest.c++,v 1.2 1999/06/13 07:41:27 robert Exp $ */=0A =
> /*=0A * Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c)=
> 1991-1996 Silicon Graphics, Inc.=0A--- 1,4 ----=0A! /* $Id: dialtest.c++,v=
> 1.3 1999/08/23 11:19:43 robert Exp $ */=0A /*=0A * Copyright (c)=
> 1990-1996 Sam Leffler=0A * Copyright (c) 1991-1996 Silicon Graphics,=
> Inc.=0A***************=0A*** 115,128 ****=0A *ep =3D '\0';=0A =
> fxStr set(line, cp-line);=0A fxStr result =3D rules.applyRules(set,=
> cp+1);=0A! printf("%s(%s) =3D \"%s\"\n", (char*) set, cp+1, (char*)=
> result);=0A } else {=0A fxStr c =3D rules.canonicalNumber(line);=0A=
> fxStr d =3D rules.dialString(line);=0A fxStr n =3D=
> rules.displayNumber(line);=0A! printf("canonical =3D \"%s\"\n",=
> (char*) c);=0A! printf("dial-string =3D \"%s\"\n", (char*) d);=0A! =
> printf("display =3D \"%s\"\n", (char *) n);=0A }=0A }=0A =
> return (0);=0A--- 115,128 ----=0A *ep =3D '\0';=0A fxStr set(line,=
> cp-line);=0A fxStr result =3D rules.applyRules(set, cp+1);=0A! =
> printf("%s(%s) =3D \"%s\"\n", (const char*) set, cp+1, (const char*)=
> result);=0A } else {=0A fxStr c =3D rules.canonicalNumber(line);=0A=
> fxStr d =3D rules.dialString(line);=0A fxStr n =3D=
> rules.displayNumber(line);=0A! printf("canonical =3D \"%s\"\n", (const=
> char*) c);=0A! printf("dial-string =3D \"%s\"\n", (const char*) d);=0A=
> ! printf("display =3D \"%s\"\n", (const char *) n);=0A }=0A }=0A=
> return (0);=0AIndex:=
> util/faxinfo.c++=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0AR=
> CS file: /usr/local/cvsroot/hylafax/util/faxinfo.c++,v=0Aretrieving revision=
> 1.2=0Aretrieving revision 1.3=0Adiff -c -r1.2 -r1.3=0A***=
> util/faxinfo.c++ 1999/06/13 07:41:27 1.2=0A--- util/faxinfo.c++ 1999/08/23=
> 11:19:44 1.3=0A***************=0A*** 1,4 ****=0A! /* $Id: faxinfo.c++,v 1.2=
> 1999/06/13 07:41:27 robert Exp $ */=0A /*=0A * Copyright (c) 1990-1996=
> Sam Leffler=0A * Copyright (c) 1991-1996 Silicon Graphics, Inc.=0A--- 1,4=
> ----=0A! /* $Id: faxinfo.c++,v 1.3 1999/08/23 11:19:44 robert Exp $ */=0A =
> /*=0A * Copyright (c) 1990-1996 Sam Leffler=0A * Copyright (c)=
> 1991-1996 Silicon Graphics, Inc.=0A***************=0A*** 59,67 ****=0A =
> static void=0A sanitize(fxStr& s)=0A {=0A! for (char* cp =3D s; *cp;=
> cp++)=0A! if (!isascii(*cp) || !isprint(*cp))=0A! *cp =3D '?';=0A }=
> =0A =0A int=0A--- 59,67 ----=0A static void=0A sanitize(fxStr& s)=0A =
> {=0A! for(int i =3D 0; i < s.length(); i++) {=0A! if=
> (!isascii(s[i]) || !isprint(s[i])) s[i] =3D '?';=0A! }=0A }=0A =0A =
> int=0AIndex:=
> util/typetest.c++=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0AR=
> CS file: /usr/local/cvsroot/hylafax/util/typetest.c++,v=0Aretrieving=
> revision 1.2=0Aretrieving revision 1.3=0Adiff -c -r1.2 -r1.3=0A***=
> util/typetest.c++ 1999/06/13 07:41:28 1.2=0A---=
> util/typetest.c++ 1999/08/23 11:19:44 1.3=0A***************=0A*** 1,4=
> ****=0A! /* $Id: typetest.c++,v 1.2 1999/06/13 07:41:28 robert Exp $ */=0A =
> /*=0A * Copyright (c) 1994-1996 Sam Leffler=0A * Copyright (c)=
> 1994-1996 Silicon Graphics, Inc.=0A--- 1,4 ----=0A! /* $Id: typetest.c++,v=
> 1.3 1999/08/23 11:19:44 robert Exp $ */=0A /*=0A * Copyright (c)=
> 1994-1996 Sam Leffler=0A * Copyright (c) 1994-1996 Silicon Graphics,=
> Inc.=0A***************=0A*** 76,82 ****=0A }=0A if=
> (tr->getResult() =3D=3D TypeRule::ERROR) {=0A fxStr=
> emsg(tr->getErrMsg());=0A! fprintf(stderr, "%s: %s\n", filename, (char*)=
> emsg);=0A return (NULL);=0A }=0A return tr; =0A--- 76,82=
> ----=0A }=0A if (tr->getResult() =3D=3D TypeRule::ERROR) {=0A =
> fxStr emsg(tr->getErrMsg());=0A! fprintf(stderr, "%s: %s\n", filename,=
> (const char*) emsg);=0A return (NULL);=0A }=0A return tr; =0A
> --=====================_7883806==_
> Content-Type: text/plain; charset="us-ascii"; format=flowed
>
>
> --=====================_7883806==_--
>
>
--
Steve Williams, Calgary, Alberta, Canada
Genie Computer Systems Inc.
steve@genie96.com
"A man doesn't begin to attain wisdom until he recognizes that he is
no longer indispensable."
- Admiral Richard E. Byrd ( 1888-1957 )
