From 725b02e6bf5ab40973ecfb748df3d40d755a36ed Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Fri, 22 Jun 2018 20:40:47 +0100 Subject: [PATCH] dthelp: Remove define M_PROTO that was always turned on (for all platforms) that enabled ANSI not K&R function prototypes --- .../dthelp/parser.ccdf/htag/build/build.h | 6 +- .../dthelp/parser.ccdf/htag/build/fsa.c | 16 - .../dthelp/parser.ccdf/htag/build/param.c | 15 - .../dthelp/parser.ccdf/htag/build/proto.h | 727 +++-------- .../dthelp/parser.ccdf/htag/build/sref.c | 6 - .../dthelp/parser.ccdf/htag/eltdef/eltutil.c | 32 +- .../dthelp/parser.ccdf/htag/eltdef/proto.h | 332 +---- .../dthelp/parser.ccdf/htag/helptag/default.c | 45 - .../dthelp/parser.ccdf/htag/helptag/fproto.h | 1008 +++------------ .../dthelp/parser.ccdf/htag/helptag/help.c | 133 -- .../dthelp/parser.ccdf/htag/helptag/option.c | 18 - .../dthelp/parser.ccdf/htag/helptag/out.c | 68 - .../dthelp/parser.ccdf/htag/helptag/xref.c | 14 +- .../dthelp/parser.ccdf/htag/parser/actutil.c | 17 - .../dthelp/parser.ccdf/htag/parser/cyclent.c | 8 - .../dthelp/parser.ccdf/htag/parser/entity.c | 6 - .../dthelp/parser.ccdf/htag/parser/error.c | 69 -- .../dthelp/parser.ccdf/htag/parser/findpar.c | 7 - .../dthelp/parser.ccdf/htag/parser/param.c | 6 - .../dthelp/parser.ccdf/htag/parser/parser.h | 2 - .../dthelp/parser.ccdf/htag/parser/parvalok.c | 7 - .../dthelp/parser.ccdf/htag/parser/proto.h | 1101 +++++----------- .../dthelp/parser.ccdf/htag/parser/scan.c | 41 - .../dthelp/parser.ccdf/htag/parser/string.c | 7 - .../dthelp/parser.ccdf/htag/parser/struct.c | 25 - .../dthelp/parser.ccdf/htag/parser/text.c | 5 - .../dthelp/parser.ccdf/htag/util/allwhite.c | 17 +- .../dthelp/parser.ccdf/htag/util/basic.h | 66 +- .../dthelp/parser.ccdf/htag/util/cont.h | 174 +-- .../dthelp/parser.ccdf/htag/util/conutil.c | 15 - .../dthelp/parser.ccdf/htag/util/emptyfil.c | 10 +- .../dthelp/parser.ccdf/htag/util/entout.c | 23 +- .../dthelp/parser.ccdf/htag/util/error.c | 175 +-- .../dthelp/parser.ccdf/htag/util/exit.c | 6 +- .../dthelp/parser.ccdf/htag/util/fclndir.c | 18 +- .../dthelp/parser.ccdf/htag/util/inctest.c | 18 +- .../dthelp/parser.ccdf/htag/util/initct.c | 6 +- .../dthelp/parser.ccdf/htag/util/itoa.c | 12 +- .../dthelp/parser.ccdf/htag/util/letter.c | 11 - .../dthelp/parser.ccdf/htag/util/lower.c | 11 +- .../dthelp/parser.ccdf/htag/util/malloc.c | 48 +- .../dthelp/parser.ccdf/htag/util/openchk.c | 16 +- .../dthelp/parser.ccdf/htag/util/paramu.c | 6 - .../dthelp/parser.ccdf/htag/util/sparse.h | 6 +- .../dthelp/parser.ccdf/htag/util/trie.c | 29 +- .../dthelp/parser.ccdf/htag/util/trie.h | 24 +- .../dthelp/parser.ccdf/htag/util/triecnt.c | 27 +- .../dthelp/parser.ccdf/htag/util/triedump.c | 20 +- .../dthelp/parser.ccdf/htag/util/triepdmp.c | 29 +- .../dthelp/parser.ccdf/htag/util/trieplk.c | 11 +- .../dthelp/parser.ccdf/htag/util/upcmp8.c | 35 +- .../dthelp/parser.ccdf/htag/util/upper.c | 9 +- .../dthelp/parser.ccdf/htag/util/upstrcmp.c | 12 +- .../dthelp/parser.ccdf/htag/util/wchar.c | 44 - .../dthelp/parser.ccdf/htag/util/whitesp.c | 11 - .../dthelp/parser/canon1/build/build.h | 6 +- cde/programs/dthelp/parser/canon1/build/fsa.c | 16 - .../dthelp/parser/canon1/build/param.c | 15 - .../dthelp/parser/canon1/build/proto.h | 726 +++-------- .../dthelp/parser/canon1/build/sref.c | 6 - .../dthelp/parser/canon1/eltdef/eltutil.c | 31 +- .../dthelp/parser/canon1/eltdef/proto.h | 330 +---- .../dthelp/parser/canon1/helptag/default.c | 45 - .../dthelp/parser/canon1/helptag/fproto.h | 598 ++------- .../dthelp/parser/canon1/helptag/help.c | 204 +-- .../dthelp/parser/canon1/helptag/option.c | 18 - .../dthelp/parser/canon1/helptag/out.c | 72 -- .../dthelp/parser/canon1/helptag/xref.c | 12 - .../dthelp/parser/canon1/parser/actutil.c | 17 - .../dthelp/parser/canon1/parser/cyclent.c | 8 - .../dthelp/parser/canon1/parser/entity.c | 6 - .../dthelp/parser/canon1/parser/error.c | 73 +- .../dthelp/parser/canon1/parser/findpar.c | 7 - .../dthelp/parser/canon1/parser/param.c | 6 - .../dthelp/parser/canon1/parser/parser.h | 2 - .../dthelp/parser/canon1/parser/parvalok.c | 7 - .../dthelp/parser/canon1/parser/proto.h | 1102 +++++------------ .../dthelp/parser/canon1/parser/scan.c | 46 - .../dthelp/parser/canon1/parser/string.c | 7 - .../dthelp/parser/canon1/parser/struct.c | 25 - .../dthelp/parser/canon1/parser/text.c | 5 - .../dthelp/parser/canon1/util/allwhite.c | 17 +- .../dthelp/parser/canon1/util/basic.h | 84 +- cde/programs/dthelp/parser/canon1/util/cont.h | 174 +-- .../dthelp/parser/canon1/util/conutil.c | 15 - .../dthelp/parser/canon1/util/emptyfil.c | 6 +- .../dthelp/parser/canon1/util/entout.c | 23 +- .../dthelp/parser/canon1/util/error.c | 175 +-- cde/programs/dthelp/parser/canon1/util/exit.c | 6 +- .../dthelp/parser/canon1/util/fclndir.c | 18 +- .../dthelp/parser/canon1/util/inctest.c | 18 +- .../dthelp/parser/canon1/util/initct.c | 6 - cde/programs/dthelp/parser/canon1/util/itoa.c | 12 +- .../dthelp/parser/canon1/util/letter.c | 11 - .../dthelp/parser/canon1/util/lower.c | 6 +- .../dthelp/parser/canon1/util/malloc.c | 48 +- .../dthelp/parser/canon1/util/openchk.c | 12 +- .../dthelp/parser/canon1/util/paramu.c | 6 - .../dthelp/parser/canon1/util/sparse.h | 6 +- cde/programs/dthelp/parser/canon1/util/trie.c | 24 +- cde/programs/dthelp/parser/canon1/util/trie.h | 24 +- .../dthelp/parser/canon1/util/triecnt.c | 27 +- .../dthelp/parser/canon1/util/triedump.c | 19 +- .../dthelp/parser/canon1/util/triepdmp.c | 29 +- .../dthelp/parser/canon1/util/trieplk.c | 7 +- .../dthelp/parser/canon1/util/upcmp8.c | 35 +- .../dthelp/parser/canon1/util/upper.c | 9 +- .../dthelp/parser/canon1/util/upstrcmp.c | 15 +- .../dthelp/parser/canon1/util/wchar.c | 44 - .../dthelp/parser/canon1/util/whitesp.c | 11 +- .../dthelp/parser/pass1/build/build.h | 6 +- cde/programs/dthelp/parser/pass1/build/fsa.c | 16 - .../dthelp/parser/pass1/build/param.c | 15 - .../dthelp/parser/pass1/build/proto.h | 726 +++-------- cde/programs/dthelp/parser/pass1/build/sref.c | 6 - .../dthelp/parser/pass1/eltdef/eltutil.c | 31 +- .../dthelp/parser/pass1/eltdef/proto.h | 330 +---- .../dthelp/parser/pass1/helptag/default.c | 50 - .../dthelp/parser/pass1/helptag/fproto.h | 598 ++------- .../dthelp/parser/pass1/helptag/help.c | 208 +--- .../dthelp/parser/pass1/helptag/option.c | 18 - .../dthelp/parser/pass1/helptag/out.c | 72 -- .../dthelp/parser/pass1/helptag/xref.c | 12 - .../dthelp/parser/pass1/parser/actutil.c | 17 - .../dthelp/parser/pass1/parser/cyclent.c | 8 - .../dthelp/parser/pass1/parser/entity.c | 6 - .../dthelp/parser/pass1/parser/error.c | 69 -- .../dthelp/parser/pass1/parser/findpar.c | 7 - .../dthelp/parser/pass1/parser/param.c | 6 - .../dthelp/parser/pass1/parser/parser.h | 2 - .../dthelp/parser/pass1/parser/parvalok.c | 7 - .../dthelp/parser/pass1/parser/proto.h | 1102 +++++------------ .../dthelp/parser/pass1/parser/scan.c | 41 - .../dthelp/parser/pass1/parser/string.c | 7 - .../dthelp/parser/pass1/parser/struct.c | 25 - .../dthelp/parser/pass1/parser/text.c | 5 - .../dthelp/parser/pass1/util/allwhite.c | 17 +- cde/programs/dthelp/parser/pass1/util/basic.h | 84 +- cde/programs/dthelp/parser/pass1/util/cont.h | 174 +-- .../dthelp/parser/pass1/util/conutil.c | 15 - .../dthelp/parser/pass1/util/emptyfil.c | 10 +- .../dthelp/parser/pass1/util/entout.c | 23 +- cde/programs/dthelp/parser/pass1/util/error.c | 175 +-- cde/programs/dthelp/parser/pass1/util/exit.c | 6 +- .../dthelp/parser/pass1/util/fclndir.c | 18 +- .../dthelp/parser/pass1/util/inctest.c | 18 +- .../dthelp/parser/pass1/util/initct.c | 6 - cde/programs/dthelp/parser/pass1/util/itoa.c | 12 +- .../dthelp/parser/pass1/util/letter.c | 11 - cde/programs/dthelp/parser/pass1/util/lower.c | 6 +- .../dthelp/parser/pass1/util/malloc.c | 48 +- .../dthelp/parser/pass1/util/openchk.c | 12 +- .../dthelp/parser/pass1/util/paramu.c | 6 - .../dthelp/parser/pass1/util/sparse.h | 6 +- cde/programs/dthelp/parser/pass1/util/trie.c | 24 +- cde/programs/dthelp/parser/pass1/util/trie.h | 24 +- .../dthelp/parser/pass1/util/triecnt.c | 27 +- .../dthelp/parser/pass1/util/triedump.c | 20 +- .../dthelp/parser/pass1/util/triepdmp.c | 29 +- .../dthelp/parser/pass1/util/trieplk.c | 8 +- .../dthelp/parser/pass1/util/upcmp8.c | 35 +- cde/programs/dthelp/parser/pass1/util/upper.c | 9 +- .../dthelp/parser/pass1/util/upstrcmp.c | 15 +- cde/programs/dthelp/parser/pass1/util/wchar.c | 44 - .../dthelp/parser/pass1/util/whitesp.c | 11 - .../dthelp/parser/pass2/build/build.h | 6 +- cde/programs/dthelp/parser/pass2/build/fsa.c | 16 - .../dthelp/parser/pass2/build/param.c | 15 - .../dthelp/parser/pass2/build/proto.h | 726 +++-------- cde/programs/dthelp/parser/pass2/build/sref.c | 6 - .../dthelp/parser/pass2/eltdef/eltutil.c | 31 +- .../dthelp/parser/pass2/eltdef/proto.h | 330 +---- .../dthelp/parser/pass2/htag2/fproto.h | 270 +--- .../dthelp/parser/pass2/htag2/option.c | 18 - cde/programs/dthelp/parser/pass2/htag2/out.c | 20 - cde/programs/dthelp/parser/pass2/htag2/sdl.c | 245 ---- .../dthelp/parser/pass2/parser/actutil.c | 17 - .../dthelp/parser/pass2/parser/cyclent.c | 8 - .../dthelp/parser/pass2/parser/entity.c | 6 - .../dthelp/parser/pass2/parser/error.c | 69 -- .../dthelp/parser/pass2/parser/findpar.c | 7 - .../dthelp/parser/pass2/parser/param.c | 6 - .../dthelp/parser/pass2/parser/parser.h | 2 - .../dthelp/parser/pass2/parser/parvalok.c | 7 - .../dthelp/parser/pass2/parser/proto.h | 1102 +++++------------ .../dthelp/parser/pass2/parser/scan.c | 41 - .../dthelp/parser/pass2/parser/string.c | 7 - .../dthelp/parser/pass2/parser/struct.c | 25 - .../dthelp/parser/pass2/parser/text.c | 5 - .../dthelp/parser/pass2/util/allwhite.c | 17 +- cde/programs/dthelp/parser/pass2/util/basic.h | 90 +- cde/programs/dthelp/parser/pass2/util/cont.h | 174 +-- .../dthelp/parser/pass2/util/conutil.c | 15 - .../dthelp/parser/pass2/util/emptyfil.c | 6 +- .../dthelp/parser/pass2/util/entout.c | 23 +- cde/programs/dthelp/parser/pass2/util/error.c | 175 +-- cde/programs/dthelp/parser/pass2/util/exit.c | 6 +- .../dthelp/parser/pass2/util/fclndir.c | 18 +- .../dthelp/parser/pass2/util/inctest.c | 18 +- .../dthelp/parser/pass2/util/initct.c | 6 +- cde/programs/dthelp/parser/pass2/util/itoa.c | 12 +- .../dthelp/parser/pass2/util/letter.c | 11 - cde/programs/dthelp/parser/pass2/util/lower.c | 6 +- .../dthelp/parser/pass2/util/malloc.c | 48 +- .../dthelp/parser/pass2/util/openchk.c | 12 +- .../dthelp/parser/pass2/util/paramu.c | 6 - .../dthelp/parser/pass2/util/sparse.h | 6 +- cde/programs/dthelp/parser/pass2/util/trie.c | 24 +- cde/programs/dthelp/parser/pass2/util/trie.h | 24 +- .../dthelp/parser/pass2/util/triecnt.c | 27 +- .../dthelp/parser/pass2/util/triedump.c | 20 +- .../dthelp/parser/pass2/util/triepdmp.c | 29 +- .../dthelp/parser/pass2/util/trieplk.c | 7 +- .../dthelp/parser/pass2/util/upcmp8.c | 35 +- cde/programs/dthelp/parser/pass2/util/upper.c | 6 +- .../dthelp/parser/pass2/util/upstrcmp.c | 12 +- cde/programs/dthelp/parser/pass2/util/wchar.c | 51 - .../dthelp/parser/pass2/util/whitesp.c | 11 +- 218 files changed, 2975 insertions(+), 14075 deletions(-) diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/build.h b/cde/programs/dthelp/parser.ccdf/htag/build/build.h index 21c610cbd..573acf801 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/build.h +++ b/cde/programs/dthelp/parser.ccdf/htag/build/build.h @@ -421,8 +421,4 @@ BUILDEXTERN LOGICAL entrule BUILDINIT(FALSE) ; BUILDEXTERN M_WCHAR genname[M_NAMELEN + sizeof(M_PREFIX)] ; -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c b/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c index 34359da95..42488ace0 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c @@ -37,18 +37,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Addarc adds an arc from FSA state to state setting other fields as indicated by the other parameters.*/ -#if defined(M_PROTO) int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, int id, LOGICAL minim, ELTSTRUCT **errelt) -#else -int addarc(from, to, label, and, optional, id, minim, errelt) - STATE *from, *to ; - ELTSTRUCT *label ; - ANDGROUP *and ; - LOGICAL optional ; - int id ; - LOGICAL minim ; - ELTSTRUCT **errelt ; -#endif { ARC *parc, *qarc ; int determ ; @@ -630,12 +619,7 @@ LOGICAL samelabelarc(a, s) /* Saves the name of an element appearing on the left-hand side of a grammar rule */ -#if defined(M_PROTO) void savelhs(LOGICAL param) -#else -void savelhs(param) - LOGICAL param ; -#endif { STATE *end ; ELTSTRUCT *errelt ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/param.c b/cde/programs/dthelp/parser.ccdf/htag/build/param.c index d9ec77455..4d6d9a8e5 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/param.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/param.c @@ -124,12 +124,7 @@ newpar->ptypep = NULL ; /* Check that specified default value is legal parameter value */ -#if defined(M_PROTO) LOGICAL checkdefault( const M_WCHAR *string ) -#else -LOGICAL checkdefault(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { const M_WCHAR *p ; int len ; @@ -204,12 +199,7 @@ switch (newpar->type) /* Normalize parameter default. Change tabs and RE's to spaces, capitalize all letters (unless type is CDATA), remove extra space in lists */ -#if defined(M_PROTO) void normdefault(M_WCHAR *string ) -#else -void normdefault(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { M_WCHAR *p, *q ; int i ; @@ -292,12 +282,7 @@ ruleinit() ; } /* Make string the default for the current parameter of the current element */ -#if defined(M_PROTO) void setdefault(const M_WCHAR *string) -#else -void setdefault() -M_WCHAR *string; -#endif /* M_PROTO */ { PTYPE *kw ; int keycount ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/proto.h b/cde/programs/dthelp/parser.ccdf/htag/build/proto.h index 8fb876de9..2297a7224 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/proto.h +++ b/cde/programs/dthelp/parser.ccdf/htag/build/proto.h @@ -26,589 +26,206 @@ */ /* Proto.h contains function prototypes for program BUILD. */ +/* Proto.h contains function prototypes for program BUILD. */ -int addarc( -#if defined(M_PROTO) - STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, - int id, LOGICAL minim, ELTSTRUCT **errelt -#endif - ) ; +int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, + int id, LOGICAL minim, ELTSTRUCT **errelt); -void adddefent( -#if defined(M_PROTO) - M_WCHAR *mapname -#endif - ) ; +void adddefent(M_WCHAR *mapname); -LOGICAL addent( -#if defined(M_PROTO) - M_WCHAR *name -#endif - ) ; +LOGICAL addent(M_WCHAR *name); -void addex( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addex(M_NOPAR); -void addkeyword( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addkeyword(M_NOPAR); -LOGICAL addmapname( -#if defined(M_PROTO) - M_WCHAR *p, LOGICAL define -#endif - ) ; +LOGICAL addmapname(M_WCHAR *p, LOGICAL define); -void addndent( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void addndent(M_WCHAR *p); -void addpar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addpar(M_NOPAR); -void addsref( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void addsref(M_WCHAR *p); -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -void checkand( -#if defined(M_PROTO) - ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root, - ELTSTRUCT **errelt -#endif - ) ; +void checkand(ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root, + ELTSTRUCT **errelt); -LOGICAL checkdefault( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL checkdefault(const M_WCHAR *string); -int checkdfsa( -#if defined(M_PROTO) - STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt -#endif - ) ; +int checkdfsa(STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt); -int checkrepeat( -#if defined(M_PROTO) - STATE *from, ANDGROUP *and, ELTSTRUCT **errelt -#endif - ) ; +int checkrepeat(STATE *from, ANDGROUP *and, ELTSTRUCT **errelt); -void copyintolist( -#if defined(M_PROTO) - STATELIST *from, STATELIST **to -#endif - ) ; +void copyintolist(STATELIST *from, STATELIST **to); -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void defmapname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void defmapname(M_NOPAR); -char *deftype( -#if defined(M_PROTO) - int n -#endif - ) ; +char *deftype(int n); -void dellist( -#if defined(M_PROTO) - STATELIST **list -#endif - ) ; +void dellist(STATELIST **list); -void delstartarcs( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void delstartarcs(M_NOPAR); -void done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void done(M_NOPAR); -void dumpentnode( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void dumpentnode(FILE *file, M_TRIE *value); -void dumpmapnode( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void dumpmapnode(FILE *file, M_TRIE *value); -void dumpsrefnode( -#if defined(M_PROTO) - FILE *file, - M_TRIE *value -#endif - ) ; +void dumpsrefnode(FILE *file, + M_TRIE *value); -void dumpptrie( -#if defined(M_PROTO) - M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, - void (*proc)( FILE *, M_TRIE *) -#endif - ) ; +void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, + void (*proc)( FILE *, M_TRIE *)); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(M_ENTITY *) -#endif - ) ; - -void eltblocks( -#if defined(M_PROTO) - FILE *tempfile -#endif - ) ; - -void eltreeout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void endmodel( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void entout( -#if defined(M_PROTO) - char *fname -#endif - ) ; - -char *enttype( -#if defined(M_PROTO) - int n -#endif - ) ; - -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; - -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; - -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; - -void exout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; - -void freetree( -#if defined(M_PROTO) - TREE *ruletree -#endif - ) ; - -void found( -#if defined(M_PROTO) - LOGICAL *flag, char *delim -#endif - ) ; - -void fsa( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int getachar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -ANDGROUP *getand( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL getname( -#if defined(M_PROTO) - int first -#endif - ) ; - -STATE *getstate( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int gettoken( -#if defined(M_PROTO) - int *c, int context -#endif - ) ; - -TREE *gettreenode( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; - -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void makeand( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root, int optional -#endif - ) ; - -LOGICAL makefsa( -#if defined(M_PROTO) - TREE *root, int optional -#endif - ) ; - -void makeor( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root -#endif - ) ; - -void makeseq( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root, int optional -#endif - ) ; - -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; - -void msgline( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void msg1line( -#if defined(M_PROTO) - char *text, char *arg1 -#endif - ) ; - -void nondeterm( -#if defined(M_PROTO) - TREE *root, int c, ELTSTRUCT *eltp -#endif - ) ; - -void normdefault( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL notinlist( -#if defined(M_PROTO) - STATELIST *item, STATELIST *list -#endif - ) ; - -ELTSTRUCT *ntrelt( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; - -void parout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -char *partype( -#if defined(M_PROTO) - int n -#endif - ) ; - -LOGICAL permitspcd( -#if defined(M_PROTO) - ARC *a -#endif - ) ; - -void pop( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void prulend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void push( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL regenerate( -#if defined(M_PROTO) - TREE *start, TREE *stop -#endif - ) ; - -void repeat( -#if defined(M_PROTO) - TREE *root -#endif - ) ; - -void ruleinit( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void rulend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL samelabelarc( -#if defined(M_PROTO) - ARC *a, STATE *s -#endif - ) ; - -void savelhs( -#if defined(M_PROTO) - LOGICAL param -#endif - ) ; - -void savestartarcs( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void setdefault( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; - -void simplebranch( -#if defined(M_PROTO) - TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional -#endif - ) ; - -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_sprscon( -#if defined(M_PROTO) - int i, int j -#endif - ) ; - -void srefout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -STATE *startfsa( -#if defined(M_PROTO) - TREE *root, LOGICAL *canbenull -#endif - ) ; - -void tempelt( -#if defined(M_PROTO) - ELTSTRUCT *eltp, FILE *tempfile -#endif - ) ; - -void template( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -char *typecon( -#if defined(M_PROTO) - int n -#endif - ) ; - -void undodelim( -#if defined(M_PROTO) - M_WCHAR *delim -#endif - ) ; - -void ungetachar( -#if defined(M_PROTO) - int c -#endif - ) ; - -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; - -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; - -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; - -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; - -void warning2( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2 -#endif - ) ; - -void warning3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; - -void warning4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; - -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; + void (*proc)(M_ENTITY *)); + +void eltblocks(FILE *tempfile); + +void eltreeout(M_NOPAR); + +void endmodel(M_NOPAR); + +void entout(char *fname); + +char *enttype(int n); + +void m_error(char *text); + +void m_err1(const char *text, const M_WCHAR *arg); + +void m_mberr1(char *text, const char *arg); + +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); + +void exout(M_NOPAR); + +void m_free(void *block, char *msg); + +void freetree(TREE *ruletree); + +void found(LOGICAL *flag, char *delim); + +void fsa(M_NOPAR); + +int getachar(M_NOPAR); + +ANDGROUP *getand(M_NOPAR); + +LOGICAL getname(int first); + +STATE *getstate(M_NOPAR); + +int gettoken(int *c, int context); + +TREE *gettreenode(M_NOPAR); + +void m_initctype(M_NOPAR); + +void initialize(M_NOPAR); + +LOGICAL litproc(int delim); + +void main(int argc, char **argv); + +void makeand(LOGICAL *canbenull, TREE *root, int optional); + +LOGICAL makefsa(TREE *root, int optional); + +void makeor(LOGICAL *canbenull, TREE *root); + +void makeseq(LOGICAL *canbenull, TREE *root, int optional); + +void *m_malloc(int size, char *msg); + +void msgline(char *text); + +void msg1line(char *text, char *arg1); + +void nondeterm(TREE *root, int c, ELTSTRUCT *eltp); + +void normdefault(M_WCHAR *string); + +LOGICAL notinlist(STATELIST *item, STATELIST *list); + +ELTSTRUCT *ntrelt(M_WCHAR *p); + +void m_openchk(FILE **ptr, char *name, char *mode); + +void parout(M_NOPAR); + +char *partype(int n); + +LOGICAL permitspcd(ARC *a); + +void pop(M_NOPAR); + +void prulend(M_NOPAR); + +void push(M_NOPAR); + +LOGICAL regenerate(TREE *start, TREE *stop); + +void repeat(TREE *root); + +void ruleinit(M_NOPAR); + +void rulend(M_NOPAR); + +LOGICAL samelabelarc(ARC *a, STATE *s); + +void savelhs(LOGICAL param); + +void savestartarcs(M_NOPAR); + +int scan(M_NOPAR); + +void setdefault(const M_WCHAR *string); + +void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional); + +void skiptoend(M_NOPAR); + +int m_sprscon(int i, int j); + +void srefout(M_NOPAR); + +STATE *startfsa(TREE *root, LOGICAL *canbenull); + +void tempelt(ELTSTRUCT *eltp, FILE *tempfile); + +void template(M_NOPAR); + +char *typecon(int n); + +void undodelim(M_WCHAR *delim); + +void ungetachar(int c); + +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); + +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); + +int m_mbmbupstrcmp(const char *p, const char *q); + +void warning(char *text); + +void warning1(char *text, M_WCHAR *arg); + +void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2); + +void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); + +void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); + +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/sref.c b/cde/programs/dthelp/parser.ccdf/htag/build/sref.c index dfe83fd75..c31ced7bf 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/sref.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/sref.c @@ -100,13 +100,7 @@ return(TRUE); } /* Add a short reference map name */ -#if defined(M_PROTO) LOGICAL addmapname(M_WCHAR* p, LOGICAL define) -#else -LOGICAL addmapname(p, define) -M_WCHAR *p; -LOGICAL define; -#endif { MAP *old; MAP *new; diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c index 07c6d40c4..4ae71e5af 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c @@ -66,23 +66,14 @@ void actptrout(array, name) /* Close a code file and write jump table at the end */ -#if defined(M_PROTO) void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto) -#else -void closeiffile(flag, file, count, table, proto) - LOGICAL flag; - FILE *file; - int count; - char *table; - char *proto; -#endif { int i; endcode(flag, file); if (count) { fprintf(file, - "void (*m_%stable[])(\n#if defined(M_PROTO)\n %s\n#endif\n ) = {\n", + "void (*m_%stable[])(%s) = {\n", table, proto); fprintf(file, " m_%s1, /* Place holder for 1-based indexing */\n", table); @@ -94,7 +85,7 @@ void closeiffile(flag, file, count, table, proto) } else fprintf(file, - "void (*m_%stable[1])(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n", + "void (*m_%stable[1])(%s) ;\n", table, proto); fclose(file); } @@ -193,13 +184,7 @@ void done(M_NOPAR) } /* Called when finished reading a section of code from the input file */ -#if defined(M_PROTO) void endcode(LOGICAL flag, FILE *file) -#else -void endcode(flag, file) - LOGICAL flag; - FILE *file; -#endif { if (flag) fprintf(file, "}}\n\n"); } @@ -563,21 +548,14 @@ endcode(*flag, file); *flag = TRUE; /* protoype */ fprintf(file, - "void m_%s%d(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n", + "void m_%s%d(%s) ;\n", prefix, caseno, proto); /* ANSI defines */ -fputs("#if defined(M_PROTO)\n", file); -fprintf(file, "void m_%s%d(%s)\n", prefix, caseno, proto); -fputs("#else\n", file); -fprintf(file, - "void m_%s%d(%s)\n%s\n#endif\n {\n", /* balance the "}" */ - prefix, - caseno, - formal, - formtype); +fprintf(file, "void m_%s%d(%s)\n {\n", prefix, caseno, proto); +); for (cvarp = cvarlist ; cvarp ; cvarp = cvarp->next) { diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h b/cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h index a1691c51e..ba94579ae 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h @@ -28,334 +28,112 @@ /* Proto.h contains function prototypes for program ELTDEF. */ -void actptrout( -#if defined(M_PROTO) - ACTION **array, char *name -#endif - ) ; +void actptrout(ACTION **array, char *name); -void addent( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addent(M_NOPAR); -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -void closeiffile( -#if defined(M_PROTO) - LOGICAL flag, FILE *file, int count, char *table, char *proto -#endif - ) ; +void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto); -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void cvalue( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void cvalue(M_NOPAR); +void done(M_NOPAR); -void done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, void (*proc)(M_ENTITY *)); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, - M_TRIE *xtrie, - char *extname, - int *count, - void (*proc)(M_ENTITY *) -#endif - ) ; +void endcode(LOGICAL flag, FILE *file); -void endcode( -#if defined(M_PROTO) - LOGICAL flag, FILE *file -#endif - ) ; +void endini(M_NOPAR); -void endini( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endsignon(M_NOPAR); -void endsignon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endstring(M_NOPAR); -void endstring( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void entout(char *fname); -void entout( -#if defined(M_PROTO) - char *fname -#endif - ) ; +void enttype(int type); -void enttype( -#if defined(M_PROTO) - int type -#endif - ) ; +void m_error(char *text); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_err1(const char *text, const M_WCHAR *arg); -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; +void m_mberr1(char *text, const char *arg); -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5); -void m_err5( -#if defined(M_PROTO) - char *text, - M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5 -#endif - ) ; +void m_exit(int status); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_free(void *block, char *msg); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void freechain(M_NOPAR); -void freechain( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int getachar(M_NOPAR); -int getachar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int *getaction(ACTION **array); -int *getaction( -#if defined(M_PROTO) - ACTION **array -#endif - ) ; +ACTION *getactstruct(M_NOPAR); -ACTION *getactstruct( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void getname(int first); -void getname( -#if defined(M_PROTO) - int first -#endif - ) ; +int gettoken(int *c, int context); -int gettoken( -#if defined(M_PROTO) - int *c, int context -#endif - ) ; +void m_initctype(M_NOPAR); -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void initialize(M_NOPAR); -void initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +LOGICAL m_letter(M_WCHAR c); -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL litproc(int delim); -LOGICAL litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; +void main(int argc, char **argv); -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +void *m_malloc(int size, char *msg); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void outpval(M_TRIE *p); -void outpval( -#if defined(M_PROTO) - M_TRIE *p -#endif - ) ; +void outstring(M_NOPAR); -void outstring( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, M_WCHAR *name -#endif - ) ; +const M_WCHAR *m_partype(const int par, const M_WCHAR *string); -const M_WCHAR *m_partype( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; +int scan(M_NOPAR); -int scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, + char *formal, char *formtype); -void startcode( -#if defined(M_PROTO) - int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, - char *formal, char *formtype -#endif - ) ; +void startelement(M_NOPAR); -void startelement( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void storecvar(M_NOPAR); -void storecvar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void storepname(M_NOPAR); -void storepname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void undodelim(M_WCHAR *delim); -void undodelim( -#if defined(M_PROTO) - M_WCHAR *delim -#endif - ) ; +void ungetachar(int c); -void ungetachar( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; +int m_mbmbupstrcmp(const char *p, const char *q); -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; +void value(M_WCHAR *p); -void value( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void warning(char *text); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning1(char *text, M_WCHAR *arg); -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; - -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/default.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/default.c index f4cdf540c..55fd96610 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/default.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/default.c @@ -30,12 +30,7 @@ Copyright 1988, 1989, 1992 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(M_PROTO) int vextextsize(const M_WCHAR *keyword) -#else -int vextextsize(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return NORMAL; @@ -47,12 +42,7 @@ m_err1("Unexpected value for ex/vex textsize parameter: %s", keyword); return NORMAL; } -#if defined(M_PROTO) int vgloss(const M_WCHAR *keyword) -#else -int vgloss(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return GLOSS; @@ -63,12 +53,7 @@ m_err1("Unexpected value for gloss parameter: %s", keyword); return GLOSS; } -#if defined(M_PROTO) int vcenter(const M_WCHAR *keyword) -#else -int vcenter(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return CENTER; @@ -80,12 +65,7 @@ m_err1("Unexpected value for center parameter: %s", keyword); return CENTER; } -#if defined(M_PROTO) int vnumber(const M_WCHAR *keyword) -#else -int vnumber(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return NONUMBER; @@ -96,12 +76,7 @@ m_err1("Unexpected value for number parameter: %s", keyword); return NONUMBER; } -#if defined(M_PROTO) LOGICAL vstack(const M_WCHAR *keyword) -#else -LOGICAL vnumber(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return FALSE; @@ -112,12 +87,7 @@ m_err1("Unexpected value for number parameter: %s", keyword); return FALSE; } -#if defined(M_PROTO) int vordertype(const M_WCHAR *keyword) -#else -int vordertype(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return ARABIC; @@ -131,12 +101,7 @@ m_err1("Unexpected list order type: %s", keyword); return ARABIC; } -#if defined(M_PROTO) int vrsectpage(const M_WCHAR *keyword) -#else -int vrsectpage(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return NEWPAGE; @@ -147,12 +112,7 @@ m_err1("Unexpected value for rsectpage parameter: %s", keyword); return NEWPAGE; } -#if defined(M_PROTO) int vspacing(const M_WCHAR *keyword) -#else -int vspacing(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return LOOSE; @@ -163,12 +123,7 @@ m_err1("Unexpected value for spacing parameter: %s", keyword); return LOOSE; } -#if defined(M_PROTO) int vtype(const M_WCHAR *keyword) -#else -int vtype(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return BULLET; diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h b/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h index eda789705..a44475b39 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h @@ -24,1031 +24,393 @@ /* Copyright (c) 1988, 1989, 1990 Hewlett-Packard Co. */ /* Function prototypes for HP Tag/TeX translator */ -void appstart( -#if defined(M_PROTO) - M_WCHAR *id, M_WCHAR *letter -#endif - ) ; +void appstart(M_WCHAR *id, M_WCHAR *letter); -void assert_hometopic_exists( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void assert_hometopic_exists(M_NOPAR); -void badgraphic( -#if defined(M_PROTO) - int filestat -#endif - ) ; +void badgraphic(int filestat); -void basename( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void basename(M_NOPAR); -void calcdisp ( -#if defined(M_PROTO) - M_WCHAR *file, M_WCHAR *startrow, M_WCHAR *endrow, - M_WCHAR *clip, M_WCHAR *margin -#endif - ) ; +void calcdisp (M_WCHAR *file, M_WCHAR *startrow, M_WCHAR *endrow, + M_WCHAR *clip, M_WCHAR *margin); -void callndbeg ( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void callndbeg (M_NOPAR); -void callndend ( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void callndend (M_NOPAR); /* used by ccompspec(), cmenlspec(), and cwmenlspec() */ -char *ccharspec( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +char *ccharspec(M_WCHAR textchar); -void ccmpiooutchar ( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void ccmpiooutchar (M_WCHAR textchar); -void ccompesoutchar ( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void ccompesoutchar (M_WCHAR textchar, FILE *outfile); -void ccompexoutchar ( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void ccompexoutchar (M_WCHAR textchar, FILE *outfile); -void ccompoutchar ( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void ccompoutchar (M_WCHAR textchar, FILE *outfile); /* special computer expansions for dot matrix(computer) in calculator style */ -char *ccompspec( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +char *ccompspec(M_WCHAR textchar); -void chapstart( -#if defined(M_PROTO) - M_WCHAR *id, M_WCHAR *number, char type[] -#endif - ) ; +void chapstart(M_WCHAR *id, M_WCHAR *number, char type[]); -M_WCHAR *checkdimen( -#if defined(M_PROTO) - M_WCHAR *val, M_WCHAR *paramname, M_WCHAR *elt -#endif - ) ; +M_WCHAR *checkdimen(M_WCHAR *val, M_WCHAR *paramname, M_WCHAR *elt); -M_WCHAR *mb_checkdimen( -#if defined(M_PROTO) - M_WCHAR *val, char *paramname, char *elt -#endif - ) ; +M_WCHAR *mb_checkdimen(M_WCHAR *val, char *paramname, char *elt); -M_WCHAR *checkent( -#if defined(M_PROTO) - M_WCHAR *entcontent -#endif - ) ; +M_WCHAR *checkent(M_WCHAR *entcontent); -void checkgloss( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void checkgloss(M_NOPAR); -M_WCHAR *checkid( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +M_WCHAR *checkid(M_WCHAR *id); -void checkmsghead ( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void checkmsghead (M_NOPAR); -M_WCHAR *checkreal ( -#if defined(M_PROTO) - M_WCHAR *val, M_WCHAR *paramname, LOGICAL msgout, M_WCHAR *elt -#endif - ) ; +M_WCHAR *checkreal (M_WCHAR *val, M_WCHAR *paramname, LOGICAL msgout, M_WCHAR *elt); -LOGICAL chkplottype( -#if defined(M_PROTO) - M_WCHAR *val, int *p1x, int *p1y, int *p2x, int *p2y, LOGICAL prnt -#endif - ) ; +LOGICAL chkplottype(M_WCHAR *val, int *p1x, int *p1y, int *p2x, int *p2y, LOGICAL prnt ); -void cmloutchar ( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void cmloutchar (M_WCHAR textchar, FILE *outfile); /* special menu lable character expansions */ -char *cmenlspec( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +char *cmenlspec(M_WCHAR textchar); -void cspotend( -#if defined(M_PROTO) - M_WCHAR *file, int graphics, M_WCHAR *xwidth, M_WCHAR *xheight -#endif - ) ; +void cspotend(M_WCHAR *file, int graphics, M_WCHAR *xwidth, M_WCHAR *xheight); -void cspotstart( -#if defined(M_PROTO) - M_WCHAR *file, int graphics, M_WCHAR *xwidth, M_WCHAR *xheight -#endif - ) ; +void cspotstart(M_WCHAR *file, int graphics, M_WCHAR *xwidth, M_WCHAR *xheight); -void csubtc ( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile, M_WCHAR *parent -#endif - ) ; +void csubtc (M_WCHAR textchar, FILE *outfile, M_WCHAR *parent); -void csuptc ( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile, M_WCHAR *parent -#endif - ) ; +void csuptc (M_WCHAR textchar, FILE *outfile, M_WCHAR *parent); /* special white menu label character expansions */ -char *cwmenlspec( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +char *cwmenlspec(M_WCHAR textchar); -void cwmloutchar( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void cwmloutchar(M_WCHAR textchar, FILE *outfile); -void defxref( -#if defined(M_PROTO) - FILE *xfile, M_WCHAR *id, struct xref *xref -#endif - ) ; +void defxref(FILE *xfile, M_WCHAR *id, struct xref *xref); -int do_esc_seq( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int do_esc_seq(M_NOPAR); -void dumpxref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void dumpxref(M_NOPAR); -void echohead( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void echohead(M_WCHAR *p); -void mb_echohead( -#if defined(M_PROTO) - char *p -#endif - ) ; +void mb_echohead(char *p); -void endhead( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endhead(M_NOPAR); -void endhelpnode( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endhelpnode(M_NOPAR); -void esoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void esoutchar(M_WCHAR textchar); -void exoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void exoutchar(M_WCHAR textchar); -void exvexend( -#if defined(M_PROTO) - M_WCHAR *textsize -#endif - ) ; +void exvexend(M_WCHAR *textsize); -void exvexstart( -#if defined(M_PROTO) - M_WCHAR *type, M_WCHAR *textsize, char *listinfo -#endif - ) ; +void exvexstart(M_WCHAR *type, M_WCHAR *textsize, char *listinfo); -void figend ( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void figend (M_WCHAR *id); -int figext ( -#if defined(M_PROTO) - M_WCHAR *fname -#endif - ) ; +int figext (M_WCHAR *fname); -int figlist ( -#if defined(M_PROTO) - char *fnin -#endif - ) ; +int figlist (char *fnin); -void figraster( -#if defined(M_PROTO) -M_WCHAR *file, M_WCHAR *magnify, +void figraster(M_WCHAR *file, M_WCHAR *magnify, M_WCHAR *width, M_WCHAR *depth, M_WCHAR *hadjust, M_WCHAR *vadjust, M_WCHAR *mirror, M_WCHAR *margin, M_WCHAR *clip, -M_WCHAR *penwidth,M_WCHAR *plottype, M_WCHAR *callout, M_WCHAR *textsize -#endif - ) ; +M_WCHAR *penwidth,M_WCHAR *plottype, M_WCHAR *callout, M_WCHAR *textsize); -void figstart( -#if defined(M_PROTO) -M_WCHAR *number, M_WCHAR *tonumber, M_WCHAR *id, M_WCHAR *file, +void figstart(M_WCHAR *number, M_WCHAR *tonumber, M_WCHAR *id, M_WCHAR *file, M_WCHAR *type, M_WCHAR *oldtype, M_WCHAR *xmagnify,M_WCHAR *xwidth, M_WCHAR *xdepth, M_WCHAR *xhadjust, M_WCHAR *xvadjust,M_WCHAR *border, M_WCHAR *video, M_WCHAR *strip, M_WCHAR *mirror, M_WCHAR *margin, M_WCHAR *clip, M_WCHAR *penwidth,M_WCHAR *snap, M_WCHAR *autoscale, M_WCHAR *plottype, -M_WCHAR *callout, M_WCHAR *textsize -#endif - ) ; +M_WCHAR *callout, M_WCHAR *textsize); -void figvector( -#if defined(M_PROTO) -M_WCHAR *file, M_WCHAR *magnify, +void figvector(M_WCHAR *file, M_WCHAR *magnify, M_WCHAR *width, M_WCHAR *depth, M_WCHAR *hadjust, M_WCHAR *vadjust, M_WCHAR *mirror, M_WCHAR *margin, M_WCHAR *clip, M_WCHAR *penwidth, M_WCHAR *autoscale, M_WCHAR *plottype, M_WCHAR *callout, -M_WCHAR *textsize -#endif - ) ; +M_WCHAR *textsize); -unsigned get2b( -#if defined(M_PROTO) - FILE *fh -#endif - ) ; +unsigned get2b(FILE *fh); -unsigned long get4b( -#if defined(M_PROTO) - FILE *fh -#endif - ) ; +unsigned long get4b(FILE *fh); -unsigned long getPCLdims ( -#if defined(M_PROTO) - char *fn -#endif - ) ; +unsigned long getPCLdims (char *fn); -int getqualified ( -#if defined(M_PROTO) - M_WCHAR *qualname, M_WCHAR *unqualname -#endif - ) ; +int getqualified (M_WCHAR *qualname, M_WCHAR *unqualname); -int mb_getqualified ( -#if defined(M_PROTO) - char *qualname, char *unqualname -#endif - ) ; +int mb_getqualified (char *qualname, char *unqualname); -void handle_link_and_graphic( -#if defined(M_PROTO) - M_WCHAR *parent, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink, - M_WCHAR *glinktype, M_WCHAR *gdescription -#endif - ); +void handle_link_and_graphic(M_WCHAR *parent, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink, + M_WCHAR *glinktype, M_WCHAR *gdescription); -void keyesoutchar ( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void keyesoutchar (M_WCHAR textchar); -void idstring( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void idstring(M_WCHAR *string); -void indexchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void indexchar(M_WCHAR textchar); -void item( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void item(M_WCHAR *id); -char *m_itoa( -#if defined(M_PROTO) - int n, char *s -#endif - ) ; +char *m_itoa(int n, char *s); -void itoletter( -#if defined(M_PROTO) - int n, char start, char *dest, int length -#endif - ) ; +void itoletter(int n, char start, char *dest, int length); -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_letter(M_WCHAR c); -void loadxref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void loadxref(M_NOPAR); -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); -char *makecsname( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +char *makecsname(M_WCHAR *id); -void manustart( -#if defined(M_PROTO) - M_WCHAR *language, M_WCHAR *idxvol, M_WCHAR *status -#endif - ) ; +void manustart(M_WCHAR *language, M_WCHAR *idxvol, M_WCHAR *status); -void notimp( -#if defined(M_PROTO) - char *eltname, char *option -#endif - ) ; +void notimp(char *eltname, char *option); -M_WCHAR *okdimen ( -#if defined(M_PROTO) - M_WCHAR *val -#endif - ) ; +M_WCHAR *okdimen (M_WCHAR *val); -void onlygraphic( -#if defined(M_PROTO) - char *param, M_WCHAR *magnify, M_WCHAR *video, M_WCHAR *mirror, +void onlygraphic(char *param, M_WCHAR *magnify, M_WCHAR *video, M_WCHAR *mirror, M_WCHAR *margin, M_WCHAR *clip, M_WCHAR *penwidth, M_WCHAR *autoscale, - M_WCHAR *plottype, M_WCHAR *hadjust, M_WCHAR *vadjust -#endif - ) ; + M_WCHAR *plottype, M_WCHAR *hadjust, M_WCHAR *vadjust); -void open_new_helpfile( -#if defined(M_PROTO) - M_NOPAR -#endif -); +void open_new_helpfile(M_NOPAR); -void notallow( -#if defined(M_PROTO) - char *param1, char *param2 -#endif - ) ; +void notallow(char *param1, char *param2); -void options( -#if defined(M_PROTO) - LOGICAL filelenonly -#endif - ) ; +void options(LOGICAL filelenonly); -void outcall( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void outcall(M_WCHAR textchar, FILE *outfile); -void outchar( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void outchar(M_WCHAR textchar, FILE *outfile); -void outpi( -#if defined(M_PROTO) - int enttype, M_WCHAR *pi, M_WCHAR *entname -#endif - ) ; +void outpi(int enttype, M_WCHAR *pi, M_WCHAR *entname); -void parspace( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void parspace(M_NOPAR); -LOGICAL pushndok( -#if defined(M_PROTO) - LOGICAL val -#endif - ) ; +LOGICAL pushndok(LOGICAL val); -LOGICAL popndok( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +LOGICAL popndok(M_NOPAR); -void prfigborder( -#if defined(M_PROTO) - int val -#endif - ) ; +void prfigborder(int val); -void prfigclip( -#if defined(M_PROTO) - M_WCHAR figmargin [NFIGSIDES] [M_NAMELEN+1] -#endif - ) ; +void prfigclip(M_WCHAR figmargin [NFIGSIDES] [M_NAMELEN+1]); -void prfigheight( -#if defined(M_PROTO) - char *val -#endif - ) ; +void prfigheight(char *val); -void prfigmagnify( -#if defined(M_PROTO) - char *val -#endif - ) ; +void prfigmagnify(char *val); -void prfigmargin( -#if defined(M_PROTO) - M_WCHAR figmargin [NFIGSIDES] [M_NAMELEN+1] -#endif - ) ; +void prfigmargin(M_WCHAR figmargin [NFIGSIDES] [M_NAMELEN+1]); -void prfigpenwds( -#if defined(M_PROTO) - long penwdarray[MAXPENS] -#endif - ) ; +void prfigpenwds(long penwdarray[MAXPENS]); -void prfigwidth( -#if defined(M_PROTO) - char *val -#endif - ) ; +void prfigwidth(char *val); -LOGICAL print_vectors( -#if defined(M_PROTO) - FILE * hOutFile, PTWTXT **Points, int *maxcalltxt, FILE *hCalFile, int CalNo -#endif - ) ; +LOGICAL print_vectors(FILE * hOutFile, PTWTXT **Points, int *maxcalltxt, FILE *hCalFile, int CalNo); -void prplottype( -#if defined(M_PROTO) - int p1x, int p1y, int p2x, int p2y -#endif - ) ; +void prplottype(int p1x, int p1y, int p2x, int p2y); -float readcoord( -#if defined(M_PROTO) - FILE *fh -#endif - ) ; +float readcoord(FILE *fh); -float readinches( -#if defined(M_PROTO) - FILE *fh -#endif - ) ; +float readinches(FILE *fh); -void realoutchar( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void realoutchar(M_WCHAR textchar, FILE *outfile); -void rsectstart( -#if defined(M_PROTO) - M_WCHAR *id, M_WCHAR *pagebreak -#endif - ) ; +void rsectstart(M_WCHAR *id, M_WCHAR *pagebreak); -void rseqend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void rseqend(M_NOPAR); -void rshnewclear( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void rshnewclear(M_NOPAR); -M_WCHAR *searchforfile( -#if defined(M_PROTO) - M_WCHAR *file -#endif - ) ; +M_WCHAR *searchforfile(M_WCHAR *file); -void setid( -#if defined(M_PROTO) - M_WCHAR *id, +void setid(M_WCHAR *id, LOGICAL where, LOGICAL csensitive, LOGICAL inchapter, char *chapter, M_WCHAR *xrffile, int xrfline, - LOGICAL xrefable -#endif - ) ; + LOGICAL xrefable); -void setopt( -#if defined(M_PROTO) - char *string, LOGICAL filelenonly -#endif - ) ; +void setopt(char *string, LOGICAL filelenonly); -LOGICAL setvalopt( -#if defined(M_PROTO) - int thisopt, char *string, LOGICAL filelenonly -#endif - ) ; +LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly); -void shchar( -#if defined(M_PROTO) - M_WCHAR textchar, +void shchar(M_WCHAR textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void mb_shchar( -#if defined(M_PROTO) - char textchar, +void mb_shchar(char textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void shstring( -#if defined(M_PROTO) - M_WCHAR *addstring, +void shstring(M_WCHAR *addstring, int *len, int max, M_WCHAR *storestring, char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void mb_shstring( -#if defined(M_PROTO) - char *addstring, +void mb_shstring(char *addstring, int *len, int max, M_WCHAR *storestring, char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void starthelpnode( -#if defined(M_PROTO) - M_WCHAR *id, - LOGICAL suppress_topic_map -#endif - ) ; +void starthelpnode(M_WCHAR *id, + LOGICAL suppress_topic_map); -void mb_starthelpnode( -#if defined(M_PROTO) - char *id, - LOGICAL suppress_topic_map -#endif - ) ; +void mb_starthelpnode(char *id, + LOGICAL suppress_topic_map); -void startlablist( -#if defined(M_PROTO) - M_WCHAR *longlabel, M_WCHAR *width, M_WCHAR *spacing -#endif - ) ; +void startlablist(M_WCHAR *longlabel, M_WCHAR *width, M_WCHAR *spacing); -void startlist( -#if defined(M_PROTO) - M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont -#endif - ) ; +void startlist(M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont); -void strcode( -#if defined(M_PROTO) - M_WCHAR *string, FILE *outfile -#endif - ) ; +void strcode(M_WCHAR *string, FILE *outfile); -void mb_strcode( -#if defined(M_PROTO) - char *string, FILE *outfile -#endif - ) ; +void mb_strcode(char *string, FILE *outfile); #if defined(hpux) || defined(__aix) || defined(sun) -char *strstr( -#if defined(M_PROTO) - const char *s1, const char *s2 -#endif - ) ; +char *strstr(const char *s1, const char *s2); #endif -void svhdstring( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void svhdstring(M_WCHAR *string); -void svtcstring( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void svtcstring(M_WCHAR *string); -void taboutre( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void taboutre(M_NOPAR); -void termchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void termchar(M_WCHAR textchar); -void termpi( -#if defined(M_PROTO) - int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname -#endif - ) ; +void termpi(int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname); -void testindexfile( -#if defined(M_PROTO) - FILE *first -#endif - ) ; +void testindexfile(FILE *first); -void texinit( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void texinit(M_NOPAR); -void unimp( -#if defined(M_PROTO) - M_WCHAR *eltname -#endif - ) ; +void unimp(M_WCHAR *eltname); -void mb_unimp( -#if defined(M_PROTO) - char *eltname -#endif - ) ; +void mb_unimp(char *eltname); -int m_upstrcmp( -#if defined(M_PROTO) - char *p, char *q -#endif - ) ; +int m_upstrcmp(char *p, char *q); -int vextextsize( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vextextsize(const M_WCHAR *keyword); -int vgloss( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vgloss(const M_WCHAR *keyword); -int vcenter( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vcenter(const M_WCHAR *keyword); -int vnumber( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vnumber(const M_WCHAR *keyword); -int vordertype( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vordertype(const M_WCHAR *keyword); -int vrsectpage( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vrsectpage(const M_WCHAR *keyword); -int vspacing( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vspacing(const M_WCHAR *keyword); -int vtype( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vtype(const M_WCHAR *keyword); -void xrefexpand( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void xrefexpand(M_WCHAR *id); -void rtrim( -#if defined(M_PROTO) - char *s -#endif - ) ; +void rtrim(char *s); -double usertopt( -#if defined(M_PROTO) - M_WCHAR *s -#endif - ) ; +double usertopt(M_WCHAR *s); -double mb_usertopt( -#if defined(M_PROTO) - char *s -#endif - ) ; +double mb_usertopt(char *s); -long usertosp( -#if defined(M_PROTO) - char *s -#endif - ) ; +long usertosp(char *s); -void whereneedused( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void whereneedused(M_NOPAR); -void t_addnotes( -#if defined(M_PROTO) - M_WCHAR *tnoteid -#endif - ) ; +void t_addnotes(M_WCHAR *tnoteid); -void t_prntnotes( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_prntnotes(M_NOPAR); -LOGICAL t_want_a_Q( -#if defined(M_PROTO) - int span_count -#endif - ); +LOGICAL t_want_a_Q(int span_count); -void t_xrefnotes( -#if defined(M_PROTO) - M_WCHAR *tnoteid -#endif - ) ; +void t_xrefnotes(M_WCHAR *tnoteid); -int t_getnum( -#if defined(M_PROTO) - char *s -#endif - ) ; +int t_getnum(char *s); -void t_insertcellmarkup( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_insertcellmarkup(M_NOPAR); -void t_newpage( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_newpage(M_NOPAR); -void t_startcolh( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_startcolh(M_NOPAR); -void t_start_tabhead_colh( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_start_tabhead_colh(M_NOPAR); -void t_nextcell( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_nextcell(M_NOPAR); -void t_checkcaption( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_checkcaption(M_NOPAR); -void t_preamble( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_preamble(M_NOPAR); -void t_getstyle( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_getstyle(M_NOPAR); -void t_dospan( -#if defined(M_PROTO) - LOGICAL in_colh -#endif - ) ; +void t_dospan(LOGICAL in_colh); -void t_startcell( -#if defined(M_PROTO) - M_WCHAR *span, M_WCHAR *vspan, char *msg -#endif - ) ; +void t_startcell(M_WCHAR *span, M_WCHAR *vspan, char *msg); -void t_endcell( -#if defined(M_PROTO) - M_WCHAR *span, M_WCHAR *vspan -#endif - ) ; +void t_endcell(M_WCHAR *span, M_WCHAR *vspan); -void t_startrow( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_startrow(M_NOPAR); -void t_endrow( -#if defined(M_PROTO) - M_WCHAR *taglevone -#endif - ) ; +void t_endrow(M_WCHAR *taglevone); -void sizetofloat( -#if defined(M_PROTO) - int column, char *s -#endif - ) ; +void sizetofloat(int column, char *s); -void t_tabstart( -#if defined(M_PROTO) - M_WCHAR *style, M_WCHAR *id, M_WCHAR *number, M_WCHAR *box, M_WCHAR *rule, +void t_tabstart(M_WCHAR *style, M_WCHAR *id, M_WCHAR *number, M_WCHAR *box, M_WCHAR *rule, M_WCHAR *vrule, M_WCHAR *hrule, M_WCHAR *vcount, M_WCHAR *hcount, M_WCHAR *spacing, M_WCHAR *width, M_WCHAR *position, - M_WCHAR *tonumber, M_WCHAR *divide, M_WCHAR *textsize -#endif - ) ; + M_WCHAR *tonumber, M_WCHAR *divide, M_WCHAR *textsize); -void t_tablebody( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_tablebody(M_NOPAR); -void t_sendout_rowrule( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void t_sendout_rowrule(M_NOPAR); -void showmemavail( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void showmemavail(M_NOPAR); -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -char *GetDefaultHeaderString( -#if defined(M_PROTO) - char *elementName, +char *GetDefaultHeaderString(char *elementName, unsigned char desiredType, - char *defaultString -#endif - ) ; + char *defaultString); -void SetDefaultLocale( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void SetDefaultLocale(M_NOPAR); -char *MakeMByteString( -#if defined(M_PROTO) - const M_WCHAR *from -#endif - ); +char *MakeMByteString(const M_WCHAR *from); -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); -void paragraph( -#if defined(M_PROTO) - M_WCHAR *indent, +void paragraph(M_WCHAR *indent, M_WCHAR *id, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink, M_WCHAR *glinktype, M_WCHAR *gdescription, - char *listinfo -#endif - ); + char *listinfo); -void figure( -#if defined(M_PROTO) - M_WCHAR *number, +void figure(M_WCHAR *number, M_WCHAR *tonumber, M_WCHAR *id, M_WCHAR *file, @@ -1076,20 +438,10 @@ void figure( M_WCHAR *ghyperlink, M_WCHAR *glinktype, M_WCHAR *gdescription, - char *listinfo -#endif - ); + char *listinfo); -void endterm( -#if defined(M_PROTO) - M_WCHAR *base, +void endterm(M_WCHAR *base, M_WCHAR *gloss, - int linktype -#endif - ); + int linktype); -M_WCHAR wc_toupper( -#if defined(M_PROTO) - M_WCHAR wc -#endif - ); +M_WCHAR wc_toupper(M_WCHAR wc); diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c index 119472e7a..3b785f701 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c @@ -877,15 +877,8 @@ m_free(string, "GetDefaultHeaderString return"); /* Verify that val is an acceptable real number value */ -#if defined(M_PROTO) M_WCHAR * checkreal (M_WCHAR *val, M_WCHAR *paramname, LOGICAL msgout, M_WCHAR *elt) -#else -M_WCHAR *checkreal (val, paramname, msgout, elt) -M_WCHAR *val, *paramname; -LOGICAL msgout; -M_WCHAR *elt; -#endif { /* returns val if a valid real number, else NULL */ double num; @@ -950,13 +943,7 @@ else /* Starting stuff for and */ -#if defined(M_PROTO) void exvexstart (M_WCHAR *type, M_WCHAR *textsize, char *listinfo) -#else -void exvexstart (type, textsize, listinfo) -M_WCHAR *type, *textsize; -char *listinfo; -#endif { int tsize; @@ -1520,15 +1507,7 @@ fputs(">\n", outfile); /* Express a sequence number as a letter in an alpha list or appendix */ -#if defined(M_PROTO) void itoletter(int n, char start, char *dest, int length) -#else -void itoletter(n, start, dest, length) -int n; -char start; -char *dest; -int length; -#endif { char invert[10]; char *p, *q; @@ -1837,13 +1816,7 @@ m_exit(0); } /* Start a new helpnode */ -#if defined(M_PROTO) void starthelpnode(M_WCHAR *id, LOGICAL suppress_topic_map) -#else -void starthelpnode(id, suppress_topic_map) -M_WCHAR *id; -LOGICAL suppress_topic_map; /* should we suppress .tpc entry */ -#endif { int i; char *mbyte; @@ -1944,13 +1917,7 @@ if (!suppress_topic_map) } /* End starthelpnode(id) */ -#if defined(M_PROTO) void mb_starthelpnode(char *id, LOGICAL suppress_topic_map) -#else -void mb_starthelpnode(id, suppress_topic_map) -char *id; -LOGICAL suppress_topic_map; /* should we suppress .tpc entry */ -#endif { M_WCHAR *wc; @@ -2372,17 +2339,10 @@ return((long) num ); the string returned must be m_free'd. */ char * -#if defined(M_PROTO) GetDefaultHeaderString( char *elementName, unsigned char desiredType, char *defaultString ) -#else -GetDefaultHeaderString(elementName, desiredType, defaultString) -char *elementName; -unsigned char desiredType; -char *defaultString; -#endif { unsigned char type,wheredef; M_WCHAR *content; @@ -2484,7 +2444,6 @@ m_free(elementName,"wide character string"); } -#if defined(M_PROTO) void paragraph(M_WCHAR *indent, M_WCHAR *id, M_WCHAR *gentity, @@ -2493,24 +2452,6 @@ void paragraph(M_WCHAR *indent, M_WCHAR *glinktype, M_WCHAR *gdescription, char *listinfo) -#else -void paragraph(indent, - id, - gentity, - gposition, - ghyperlink, - glinktype, - gdescription, - listinfo) -M_WCHAR *indent; -M_WCHAR *id; -M_WCHAR *gentity; -M_WCHAR *gposition; -M_WCHAR *ghyperlink; -M_WCHAR *glinktype; -M_WCHAR *gdescription; -char *listinfo; -#endif { if (id) { @@ -2569,7 +2510,6 @@ fprintf(outfile, "%s>", listinfo); unleaded = FALSE; } -#if defined(M_PROTO) void figure( M_WCHAR *number, M_WCHAR *tonumber, @@ -2600,67 +2540,6 @@ void figure( M_WCHAR *glinktype, M_WCHAR *gdescription, char *listinfo) -#else -void figure( - number, - tonumber, - id, - file, - figpos, - cappos, - oldtype, - xwidth, - xdepth, - xhadjust, - xvadjust, - border, - type, - xmagnify, - video, - strip, - mirror, - margin, - clip, - penwidth, - snap, - autoscale, - plottype, - callout, - textsize, - ghyperlink, - glinktype, - gdescription, - listinfo) -M_WCHAR *number; -M_WCHAR *tonumber; -M_WCHAR *id; -M_WCHAR *file; -M_WCHAR *figpos; -M_WCHAR *cappos; -M_WCHAR *oldtype; -M_WCHAR *xwidth; -M_WCHAR *xdepth; -M_WCHAR *xhadjust; -M_WCHAR *xvadjust; -M_WCHAR *border; -M_WCHAR *type; -M_WCHAR *xmagnify; -M_WCHAR *video; -M_WCHAR *strip; -M_WCHAR *mirror; -M_WCHAR *margin; -M_WCHAR *clip; -M_WCHAR *penwidth; -M_WCHAR *snap; -M_WCHAR *autoscale; -M_WCHAR *plottype; -M_WCHAR *callout; -M_WCHAR *textsize; -M_WCHAR *ghyperlink; -M_WCHAR *glinktype; -M_WCHAR *gdescription; -char *listinfo; -#endif { unsigned char etype,wheredef; char *string = @@ -2919,14 +2798,7 @@ if (ftonumber) m_free(string, "default header string return"); } -#if defined(M_PROTO) void endterm( M_WCHAR *base, M_WCHAR *gloss, int linktype) -#else -void endterm( base, gloss, linktype) -M_WCHAR *base; -M_WCHAR *gloss; -int linktype; -#endif { M_WCHAR *p; M_WCHAR wnl, wsp, wus; @@ -3004,12 +2876,7 @@ if (vgloss(gloss) == GLOSS) if (echo) mb_echohead("++"); } -#if defined(M_PROTO) M_WCHAR wc_toupper(M_WCHAR wc) -#else -M_WCHAR wc_toupper(wc) -M_WCHAR wc; -#endif { if ((wc >= 0) && (wc <= 255)) { diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c index 65e59d699..3a5d65adc 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/option.c @@ -37,12 +37,7 @@ #define TAGDOTOPT "helptag.opt" #define DOTOPT ".opt" -#if defined(M_PROTO) void options(LOGICAL filelenonly) -#else -void options(filelenonly) - LOGICAL filelenonly; -#endif { int i; FILE *optfile; @@ -149,13 +144,7 @@ optval = M_NULLVAL; /* Set a single option */ /* Workonly parameter described with function options()*/ -#if defined(M_PROTO) void setopt(char *string, LOGICAL filelenonly) -#else -void setopt(string, filelenonly) -char *string; -LOGICAL filelenonly; -#endif { char *p; int thisopt; @@ -280,14 +269,7 @@ else switch(thisopt + 1) } /* Process a value for a command line option */ -#if defined(M_PROTO) LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly) -#else -LOGICAL setvalopt(thisopt, string, filelenonly) -int thisopt; -char *string; -LOGICAL filelenonly; -#endif { char *p; int i; diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/out.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/out.c index e409bd8ea..0745e70be 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/out.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/out.c @@ -89,12 +89,7 @@ echo = savhd = FALSE; } /* Process a character in an environment where spaces must be escaped */ -#if defined(M_PROTO) void esoutchar(M_WCHAR textchar) -#else -void esoutchar(textchar) -M_WCHAR textchar; -#endif { static M_WCHAR wsp = 0; @@ -115,12 +110,7 @@ outchar(textchar, outfile); } /* Process a character in an example or an image paragraph */ -#if defined(M_PROTO) void exoutchar(M_WCHAR textchar) -#else -void exoutchar(textchar) -M_WCHAR textchar; -#endif { static M_WCHAR wsp = 0, wre; @@ -146,12 +136,7 @@ else outchar(textchar, outfile); } /* Write a character to be passed to the index file */ -#if defined(M_PROTO) void indexchar(M_WCHAR textchar) -#else -void indexchar(textchar) -M_WCHAR textchar; -#endif { if (idxsavlen + 4 > (sizeof(idxsav) / sizeof(M_WCHAR))) { @@ -163,26 +148,14 @@ idxsav[idxsavlen++] = textchar; /* Processes output for call out text */ -#if defined(M_PROTO) void outcall(M_WCHAR textchar, FILE *outfile) -#else -void outcall(textchar, outfile) -M_WCHAR textchar; -FILE *outfile; -#endif { if (textchar != M_RE) outchar(textchar, outfile); } /* Processes a data character */ -#if defined(M_PROTO) void outchar(M_WCHAR textchar, FILE *outfile) -#else -void outchar(textchar, outfile) -M_WCHAR textchar; -FILE *outfile; -#endif { M_WCHAR buffer[2]; static M_WCHAR wnl = 0; @@ -263,13 +236,7 @@ if (unleaded) /* unleaded is a one-shot flag */ } /* Really output a character */ -#if defined(M_PROTO) void realoutchar(M_WCHAR textchar, FILE *outfile) -#else -void realoutchar(textchar, outfile) -M_WCHAR textchar; -FILE *outfile; -#endif { rshnewclear(); if (! abbrev || fabbrev) @@ -313,22 +280,7 @@ if (! abbrev || fabbrev) /* Save a character in the array used to store table of contents entries when processing a head */ -#if defined(M_PROTO) void shchar(M_WCHAR textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, LOGICAL *errflg) -#else -void shchar(textchar, len, max, string, proc, msg, errflg) -M_WCHAR textchar; -int *len; -int max; -M_WCHAR *string; -void (*proc)( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ); -char *msg; -LOGICAL *errflg; -#endif { char mb_textchar[32]; /* arbitrarily large */ unsigned char index; @@ -361,27 +313,12 @@ else } -#if defined(M_PROTO) void mb_shchar(char textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, LOGICAL *errflg) -#else -void mb_shchar(textchar, len, max, string, proc, msg, errflg) -char textchar; -int *len; -int max; -M_WCHAR *string; -void (*proc)( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ); -char *msg; -LOGICAL *errflg; -#endif { M_WCHAR wc_textchar; @@ -530,12 +467,7 @@ svtclen += length; } /* Process a character in a term */ -#if defined(M_PROTO) void termchar(M_WCHAR textchar) -#else -void termchar(textchar) -M_WCHAR textchar; -#endif { if (termp - term >= MAXTERM) { diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c index 2a83c2f0f..37b0c4b01 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c @@ -333,21 +333,9 @@ while (TRUE) /* Save a cross-reference ID and associated expansion */ -#if defined(M_PROTO) void setid(M_WCHAR *id, LOGICAL where, LOGICAL csensitive, LOGICAL inchapter, char *chapter, M_WCHAR *xrffile, int xrfline, LOGICAL xrefable) -#else -void setid(id, where, csensitive, inchapter, chapter, xrffile, xrfline, xrefable) -M_WCHAR *id; -LOGICAL where; -LOGICAL csensitive; -LOGICAL inchapter; -char *chapter; -M_WCHAR *xrffile; -int xrfline; -LOGICAL xrefable; -#endif -{ +s{ struct xref *old; struct xref *xref; char *buffer; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c index 848f7539c..3197d3339 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c @@ -107,17 +107,7 @@ int m_findact(elt, array) } /* Recursive procedure called by findact() to search m_action */ -#if defined(M_PROTO) void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild) -#else -void m_findchain(stackptr, start, chainin, chainout, index, wild) - M_PARSE *stackptr; - int start; - int chainin; - int *chainout; - int *index; - LOGICAL wild; -#endif { int node; M_PARSE *stackp; @@ -241,14 +231,7 @@ void m_strtaction(m_elt) } /* Output a start-string or end-string */ -#if defined(M_PROTO) void m_textout(char *format, LOGICAL start, LOGICAL end) -#else -void m_textout(format, start, end) - char *format; - LOGICAL start; - LOGICAL end; -#endif { M_WCHAR name[M_NAMELEN + 1]; int i, par; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/cyclent.c b/cde/programs/dthelp/parser.ccdf/htag/parser/cyclent.c index f9cba2c6b..7b42a3d35 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/cyclent.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/cyclent.c @@ -36,15 +36,7 @@ #include "parser.h" #include "entext.h" -#if defined(M_PROTO) M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, unsigned char *wheredef) -#else -M_WCHAR *m_cyclent(init, type, content, wheredef) - LOGICAL init ; - unsigned char *type ; - M_WCHAR **content ; - unsigned char *wheredef ; -#endif { static M_TRIE *current ; static M_TRIE *ancestor[M_NAMELEN + 1] ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c b/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c index 0e3553e23..c974d7b5a 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c @@ -43,13 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "entext.h" /* Process the name in a usemap delaration */ -#if defined(M_PROTO) void m_ckmap(M_WCHAR *name, LOGICAL useoradd) -#else -void m_ckmap(name, useoradd) - M_WCHAR *name ; - LOGICAL useoradd ; -#endif { int mapid ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c index 6f64dff7d..d44058fcd 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c @@ -52,15 +52,9 @@ void m_error(text) } /* Issue error message (one argument) */ -#if defined(M_PROTO) void m_err1( const char *text, const M_WCHAR *arg) -#else -void m_err1(text, arg) - char *text; - M_WCHAR *arg; -#endif { char *buffer, *mb_arg; @@ -77,15 +71,9 @@ m_esuffix(); } -#if defined(M_PROTO) void m_mberr1( const char *text, const char *arg) -#else -void m_err1(text, arg) - char *text; - char *arg; -#endif { M_WCHAR *wc_arg; @@ -95,17 +83,10 @@ void m_err1(text, arg) } /* Issue error message (two arguments) */ -#if defined(M_PROTO) void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2) -#else -void m_err2(text, arg1, arg2) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; -#endif { char *buffer; char *mb_arg1,*mb_arg2; @@ -126,19 +107,11 @@ void m_err2(text, arg1, arg2) } /* Issue error message (three arguments) */ -#if defined(M_PROTO) void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void m_err3(text, arg1, arg2, arg3) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3; @@ -164,21 +137,12 @@ void m_err3(text, arg1, arg2, arg3) } /* Issue error message (four arguments) */ -#if defined(M_PROTO) void m_err4( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4) -#else -void m_err4(text, arg1, arg2, arg3, arg4) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; -#endif { char *buffer; char *mb_arg1, *mb_arg2,*mb_arg3,*mb_arg4; @@ -207,7 +171,6 @@ void m_err4(text, arg1, arg2, arg3, arg4) } /* Issue error message (five arguments) */ -#if defined(M_PROTO) void m_err5( char *text, M_WCHAR *arg1, @@ -215,15 +178,6 @@ void m_err5( M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5) -#else -void m_err5(text, arg1, arg2, arg3, arg4, arg5) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5; @@ -261,7 +215,6 @@ void m_err5(text, arg1, arg2, arg3, arg4, arg5) } /* Issue error message (six arguments) */ -#if defined(M_PROTO) void m_err6( char *text, M_WCHAR *arg1, @@ -270,16 +223,6 @@ void m_err6( M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6) -#else -void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; - M_WCHAR *arg6; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6; @@ -321,7 +264,6 @@ void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6) } /* Issue error message (seven arguments) */ -#if defined(M_PROTO) void m_err7( char *text, M_WCHAR *arg1, @@ -331,17 +273,6 @@ void m_err7( M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7) -#else -void m_err7(text, arg1, arg2, arg3, arg4, arg5, arg6, arg7) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; - M_WCHAR *arg6; - M_WCHAR *arg7; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6, *mb_arg7; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/findpar.c b/cde/programs/dthelp/parser.ccdf/htag/parser/findpar.c index 3f36cb1c1..57f4aa674 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/findpar.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/findpar.c @@ -41,14 +41,7 @@ Returns 0 if elt is not a valid element name, if param is specified but is not a valid parameter name, or if param is NULL and value is not a valid value of any of elt's parameters. */ -#if defined(M_PROTO) int m_findpar( const char *elt , const char *param , const M_WCHAR *value ) -#else -int m_findpar(elt, param, value) -char *elt ; -char *param ; -M_WCHAR *value ; -#endif /* M_PROTO */ { M_ELEMENT eltid ; int par ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c index a9778b724..2c9b82b34 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c @@ -290,13 +290,7 @@ void m_stkparams(M_NOPAR) } /* Update the default of a parameter whose default is #CURRENT */ -#if defined(M_PROTO) void m_updatedefault(const int par , const M_WCHAR *string ) -#else -void m_updatedefault(par, string) - int par ; - M_WCHAR *string ; -#endif /* M_PROTO */ { if (m_parameter[par - 1].deftype != M_CURRENT && m_parameter[par - 1].deftype != M_CHANGEDCUR) return ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/parser.h b/cde/programs/dthelp/parser.ccdf/htag/parser/parser.h index b0ac76955..277724c27 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/parser.h +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/parser.h @@ -345,8 +345,6 @@ M_PAREXTERN int m_wsused ; /* Temporary pointers to parameter values. Used while scanning start tag before element is placed on parse stack.*/ M_PAREXTERN -#if defined M_PROTO -#endif M_WCHAR *m_poccur[ #if defined(M_PARDEF) M_MAXPAR ? M_MAXPAR : 1 diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/parvalok.c b/cde/programs/dthelp/parser.ccdf/htag/parser/parvalok.c index 56cc575fa..1fb0dee97 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/parvalok.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/parvalok.c @@ -34,14 +34,7 @@ /* Function callable by interface designers. Returns TRUE if specified value is a legal value for the indicated parameter of the given element, FALSE otherwise. */ -#if defined(M_PROTO) LOGICAL m_parvalok( M_WCHAR *elt , M_WCHAR *param , const M_WCHAR *value ) -#else -LOGICAL m_parvalok(elt, param, value) - M_WCHAR *elt ; - M_WCHAR *param ; - M_WCHAR *value ; -#endif /* M_PROTO */ { M_ELEMENT eltid ; int par ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/proto.h b/cde/programs/dthelp/parser.ccdf/htag/parser/proto.h index 0d692da73..525464900 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/proto.h +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/proto.h @@ -21,827 +21,282 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 11:30:37 rswiston $ */ -int m_actgetc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_adjuststate( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; - -void m_attval( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL m_attvonly( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -int m_checkstart( -#if defined(M_PROTO) - M_ELEMENT val -#endif - ) ; - -LOGICAL m_ckend( -#if defined(M_PROTO) - M_ELEMENT val, LOGICAL neednet -#endif - ) ; - -void m_ckmap( -#if defined(M_PROTO) - M_WCHAR *name, LOGICAL useoradd -#endif - ) ; - -void m_closent( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -void m_codeent( -#if defined(M_PROTO) - int m_ent -#endif - ) ; - -M_PARSE *m_copystackelt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -M_WCHAR *m_cyclent( -#if defined(M_PROTO) - LOGICAL init, unsigned char *type, M_WCHAR **content, - unsigned char *wheredef -#endif - ) ; - -void m_dispcurelt( -#if defined(M_PROTO) - M_WCHAR *file, int line -#endif - ) ; - -void m_done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_dumpline( -#if defined(M_PROTO) - M_WCHAR *file, int line -#endif - ) ; - -void m_eduptype( -#if defined(M_PROTO) - int type -#endif - ) ; - -M_ELEMENT m_eltname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_endaction( -#if defined(M_PROTO) - M_ELEMENT m_elt -#endif - ) ; - -void m_endcase( -#if defined(M_PROTO) - int m_action -#endif - ) ; - -void m_endtag( -#if defined(M_PROTO) - M_ELEMENT c -#endif - ) ; - -void m_entexpand( -#if defined(M_PROTO) - M_ENTITY *openent -#endif - ) ; - -void m_eprefix( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; - -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; - -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; - -void m_err4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; - -void m_err5( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5 -#endif - ) ; - -void m_err6( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6 -#endif - ) ; - -void m_err7( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7 -#endif - ) ; - -void m_errline( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void m_esuffix( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; - -void m_etcomplete( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_excluded( -#if defined(M_PROTO) - M_ELEMENT elt -#endif - ) ; - -void m_expecting( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_expexpand( -#if defined(M_PROTO) - LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data -#endif - ) ; - -void m_expline( -#if defined(M_PROTO) - LOGICAL *expstart, LOGICAL *data, M_ELEMENT label -#endif - ) ; - -void m_exptend( -#if defined(M_PROTO) - LOGICAL *expstart, M_PARSE *stackptr -#endif - ) ; - -int m_findact( -#if defined(M_PROTO) - M_ELEMENT elt, int *array -#endif - ) ; - -void m_findatt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_findchain( -#if defined(M_PROTO) - M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, - LOGICAL wild -#endif - ) ; - -int m_findpar( -#if defined(M_PROTO) - const char *elt, const char *param, const M_WCHAR *value -#endif - ) ; - -M_ELEMENT m_findunique( -#if defined(M_PROTO) - M_STATE from, int *newleft -#endif - ) ; - -void m_frcend( -#if defined(M_PROTO) - M_ELEMENT val -#endif - ) ; - -void m_frcstart( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; - -void m_freeFSA( -#if defined(M_PROTO) - M_PARSE *stackelt -#endif - ) ; - -void m_freemin( -#if defined(M_PROTO) - M_MIN *min - , char *msg -#endif - ) ; - -void m_freeparam( -#if defined(M_PROTO) - M_PARSE *stackelt -#endif - ) ; - -LOGICAL m_gendelim( -#if defined(M_PROTO) - int srlen, int context -#endif - ) ; - -int m_getachar( -#if defined(M_PROTO) - M_HOLDTYPE *dchar -#endif - ) ; - -int m_getc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -int mb_getwc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -void *m_getdata( -#if defined(M_PROTO) - int n, LOGICAL *flag -#endif - ) ; - -void m_getline( -#if defined(M_PROTO) - M_WCHAR **file, int *line -#endif - ) ; - -void m_getname( -#if defined(M_PROTO) - M_WCHAR first -#endif - ) ; - -void m_getsignon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_gettoken( -#if defined(M_PROTO) - int *c, M_HOLDTYPE *dchar, int context -#endif - ) ; - -void m_globes( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_globss( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_holdproc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_inctest( -#if defined(M_PROTO) - int *count, int limit, char *message -#endif - ) ; - -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_lastchars( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_level( -#if defined(M_PROTO) - M_WCHAR *elt -#endif - ) ; - -int m_mblevel( -#if defined(M_PROTO) - char *elt -#endif - ) ; - -void m_litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; - -void m_longent( -#if defined(M_PROTO) - int context -#endif - ) ; - -LOGICAL m_lookent( -#if defined(M_PROTO) - M_WCHAR *name, unsigned char *type, M_WCHAR **content, - unsigned char *wheredef -#endif - ) ; - -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; - -void m_missingtagc( -#if defined(M_PROTO) - int c, M_HOLDTYPE dchar, LOGICAL start -#endif - ) ; - -LOGICAL m_nextand( -#if defined(M_PROTO) - M_OPENFSA *thisfsa, M_ELEMENT label -#endif - ) ; - -void m_nextdelimchar( -#if defined(M_PROTO) - int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, - unsigned char type -#endif - ) ; - -void m_ntrent( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -void m_nullendtag( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_omitend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_omitstart( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; - -void *m_openent( -#if defined(M_PROTO) - M_WCHAR *entcontent -#endif - ) ; - -void *m_openfirst( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_optstring( -#if defined(M_PROTO) - char *p -#endif - ) ; - -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, M_WCHAR *name -#endif - ) ; - -int m_parcount( -#if defined(M_PROTO) - M_WCHAR *elt -#endif - ) ; - -M_WCHAR *m_pardefault( -#if defined(M_PROTO) - M_WCHAR *elt, M_WCHAR *param, unsigned char *type -#endif - ) ; - -M_WCHAR *m_parent( -#if defined(M_PROTO) - int n -#endif - ) ; - -M_WCHAR *m_parname( -#if defined(M_PROTO) - M_WCHAR *elt, int n -#endif - ) ; - -M_WCHAR *m_mbparname( -#if defined(M_PROTO) - char *elt, int n -#endif - ) ; - -const M_WCHAR *m_partype( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; - -void m_parupper( -#if defined(M_PROTO) - int par, M_WCHAR *string -#endif - ) ; - -LOGICAL m_parvalok( -#if defined(M_PROTO) - M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value -#endif - ) ; - -void m_piaction( -#if defined(M_PROTO) - M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype -#endif - ) ; - -void m_pop( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_push( -#if defined(M_PROTO) - M_ELEMENT elt, M_STATE current, LOGICAL need -#endif - ) ; - -LOGICAL m_putdata( -#if defined(M_PROTO) - void *data, int n -#endif - ) ; - -void m_readcomments( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void *m_realloc( -#if defined(M_PROTO) - void *ptr, int size, char *msg -#endif - ) ; - -int m_scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_setmap( -#if defined(M_PROTO) - int map, LOGICAL useoradd -#endif - ) ; - -void m_setoptions( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_setparam( -#if defined(M_PROTO) - M_WCHAR **cvar, int par -#endif - ) ; - -void m_shortref( -#if defined(M_PROTO) - int context -#endif - ) ; - -void m_showcurelt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_signmsg( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_sigre( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_startdoc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_startmsg( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stcaction( -#if defined(M_PROTO) - M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END -#endif - ) ; - -void m_stcomplete( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stkdefaultparams( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stkonedef( -#if defined(M_PROTO) - int par, M_ELEMENT scanel, M_WCHAR **poccur, int i -#endif - ) ; - -void m_stkparams( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_strtaction( -#if defined(M_PROTO) - M_ELEMENT m_elt -#endif - ) ; - -void m_strtcase( -#if defined(M_PROTO) - int m_action -#endif - ) ; - -void m_strtcdata( -#if defined(M_PROTO) - int scanval -#endif - ) ; - -LOGICAL m_strtproc( -#if defined(M_PROTO) - M_ELEMENT scanval -#endif - ) ; - -void m_strttag( -#if defined(M_PROTO) - M_ELEMENT val, LOGICAL net -#endif - ) ; - -void m_textaction( -#if defined(M_PROTO) - M_WCHAR m_textchar -#endif - ) ; - -void m_textout( -#if defined(M_PROTO) - char *format, LOGICAL start, LOGICAL end -#endif - ) ; - -LOGICAL m_textpermitted( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -M_WCHAR *m_thisfile( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_thisline( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_trace( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_wctrace( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -LOGICAL m_transition( -#if defined(M_PROTO) - M_ELEMENT label, LOGICAL recur -#endif - ) ; - -void m_undodelim( -#if defined(M_PROTO) - M_WCHAR *delim, LOGICAL flag -#endif - ) ; - -void m_ungetachar( -#if defined(M_PROTO) - int c, M_HOLDTYPE dchar, LOGICAL preread -#endif - ) ; - -void m_updatedefault( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; - -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; - -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; - -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; - -LOGICAL m_validinpar( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL m_vldentref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +int m_actgetc(M_NOPAR); + +void m_adjuststate(M_NOPAR); + +LOGICAL m_allwhite(const M_WCHAR *string); + +void m_attval(M_WCHAR *string); + +LOGICAL m_attvonly(M_WCHAR *string); + +int m_checkstart(M_ELEMENT val); + +LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet); + +void m_ckmap(M_WCHAR *name, LOGICAL useoradd); + +void m_closent(void *m_ptr); + +void m_codeent(int m_ent); + +M_PARSE *m_copystackelt(M_NOPAR); + +M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, + unsigned char *wheredef); + +void m_dispcurelt(M_WCHAR *file, int line); + +void m_done(M_NOPAR); + +void m_dumpline(M_WCHAR *file, int line); + +void m_eduptype(int type); + +M_ELEMENT m_eltname(M_NOPAR); + +void m_endaction(M_ELEMENT m_elt); + +void m_endcase(int m_action); + +void m_endtag(M_ELEMENT c); + +void m_entexpand(M_ENTITY *openent); + +void m_eprefix(M_NOPAR); + +void m_err1(const char *text, const M_WCHAR *arg); + +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); + +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); + +void m_err4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); + +void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5); + +void m_err6(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6); + +void m_err7(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7); + +void m_errline(char *p); + +void m_error(char *text); + +void m_esuffix(M_NOPAR); + +void m_exit(int status); + +void m_etcomplete(M_NOPAR); + +LOGICAL m_excluded(M_ELEMENT elt); + +void m_expecting(M_NOPAR); + +void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data); + +void m_expline(LOGICAL *expstart, LOGICAL *data, M_ELEMENT label); + +void m_exptend(LOGICAL *expstart, M_PARSE *stackptr); + +int m_findact(M_ELEMENT elt, int *array); + +void m_findatt(M_NOPAR); + +void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, + LOGICAL wild); + +int m_findpar(const char *elt, const char *param, const M_WCHAR *value); + +M_ELEMENT m_findunique(M_STATE from, int *newleft); + +void m_frcend(M_ELEMENT val); + +void m_frcstart(M_NOPAR); + +void m_free(void *block, char *msg); + +void m_freeFSA(M_PARSE *stackelt); + +void m_freemin(M_MIN *min, char *msg); + +void m_freeparam(M_PARSE *stackelt); + +LOGICAL m_gendelim(int srlen, int context); + +int m_getachar(M_HOLDTYPE *dchar); + +int m_getc(void *m_ptr); + +int mb_getwc(void *m_ptr); + +void *m_getdata(int n, LOGICAL *flag); + +void m_getline(M_WCHAR **file, int *line); + +void m_getname(M_WCHAR first); + +void m_getsignon(M_NOPAR); + +int m_gettoken(int *c, M_HOLDTYPE *dchar, int context); + +void m_globes(M_NOPAR); + +void m_globss(M_NOPAR); + +void m_holdproc(M_NOPAR); + +void m_inctest(int *count, int limit, char *message); + +void m_initctype(M_NOPAR); + +void m_initialize(M_NOPAR); + +void m_lastchars(M_NOPAR); + +int m_level(M_WCHAR *elt); + +int m_mblevel(char *elt); + +void m_litproc(int delim); + +void m_longent(int context); + +LOGICAL m_lookent(M_WCHAR *name, unsigned char *type, M_WCHAR **content, + unsigned char *wheredef); + +void main(int argc, char **argv); + +void *m_malloc(int size, char *msg); + +void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start); + +LOGICAL m_nextand(M_OPENFSA *thisfsa, M_ELEMENT label); + +void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, + unsigned char type); + +void m_ntrent(M_WCHAR *p); + +void m_nullendtag(M_NOPAR); + +LOGICAL m_omitend(M_NOPAR); + +LOGICAL m_omitstart(M_NOPAR); + +void m_openchk(FILE **ptr, char *name, char *mode); + +void *m_openent(M_WCHAR *entcontent); + +void *m_openfirst(M_NOPAR); + +void m_optstring(char *p); + +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); + +int m_parcount(M_WCHAR *elt); + +M_WCHAR *m_pardefault(M_WCHAR *elt, M_WCHAR *param, unsigned char *type); + +M_WCHAR *m_parent(int n); + +M_WCHAR *m_parname(M_WCHAR *elt, int n); + +M_WCHAR *m_mbparname(char *elt, int n); + +const M_WCHAR *m_partype(const int par, const M_WCHAR *string); + +void m_parupper(int par, M_WCHAR *string); + +LOGICAL m_parvalok(M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value); + +void m_piaction(M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype); + +void m_pop(M_NOPAR); + +void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need); + +LOGICAL m_putdata(void *data, int n); + +void m_readcomments(M_NOPAR); + +void *m_realloc(void *ptr, int size, char *msg); + +int m_scan(M_NOPAR); + +void m_setmap(int map, LOGICAL useoradd); + +void m_setoptions(M_NOPAR); + +void m_setparam(M_WCHAR **cvar, int par); + +void m_shortref(int context); + +void m_showcurelt(M_NOPAR); + +void m_signmsg(char *p); + +void m_sigre(M_NOPAR); + +void m_startdoc(M_NOPAR); + +void m_startmsg(M_NOPAR); + +void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END); + +void m_stcomplete(M_NOPAR); + +void m_stkdefaultparams(M_NOPAR); + +void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i); + +void m_stkparams(M_NOPAR); + +void m_strtaction(M_ELEMENT m_elt); + +void m_strtcase(int m_action); + +void m_strtcdata(int scanval); + +LOGICAL m_strtproc(M_ELEMENT scanval); + +void m_strttag(M_ELEMENT val, LOGICAL net); + +void m_textaction(M_WCHAR m_textchar); + +void m_textout(char *format, LOGICAL start, LOGICAL end); + +LOGICAL m_textpermitted(M_NOPAR); + +M_WCHAR *m_thisfile(M_NOPAR); + +int m_thisline(M_NOPAR); + +void m_trace(char *p); + +void m_wctrace(M_WCHAR *p); + +LOGICAL m_transition(M_ELEMENT label, LOGICAL recur); + +void m_undodelim(M_WCHAR *delim, LOGICAL flag); + +void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread); + +void m_updatedefault(const int par, const M_WCHAR *string); + +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); + +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); + +int m_mbmbupstrcmp(const char *p, const char *q); + +LOGICAL m_validinpar(M_WCHAR *string); + +LOGICAL m_vldentref(M_NOPAR); + +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c b/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c index 4e14a56ba..941872fc2 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c @@ -398,12 +398,7 @@ int m_getachar(dchar) } /* Reads a name token */ -#if defined(M_PROTO) void m_getname(M_WCHAR first) -#else -void m_getname(first) - M_WCHAR first ; -#endif { M_WCHAR *p ; M_HOLDTYPE dchar ; @@ -645,14 +640,7 @@ void m_litproc(delim) } /* Called when a missing tagc delimiter is detected */ -#if defined(M_PROTO) void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start) -#else -void m_missingtagc(c, dchar, start) - int c ; - M_HOLDTYPE dchar ; - LOGICAL start ; -#endif { if (! m_wholetag) { if (start) m_mberr1("Invalid parameter or missing %s", m_tagc); @@ -665,18 +653,8 @@ void m_missingtagc(c, dchar, start) /* Have found one character in a possible short reference delimiter. Prepare to look for the next one */ -#if defined(M_PROTO) void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, unsigned char type) -#else -void m_nextdelimchar(n, i, linestart, newlinestart, skipblank, type) - int *n ; - int i ; - LOGICAL *linestart ; - LOGICAL newlinestart ; - LOGICAL skipblank ; - unsigned char type ; -#endif { int k ; char mb_re,mb_seqchar, mb_rschar; @@ -858,13 +836,7 @@ int m_scan(M_NOPAR) /* Process explicit or implied USEMAP or ADDMAP */ -#if defined(M_PROTO) void m_setmap(int map, LOGICAL useoradd) -#else -void m_setmap(map, useoradd) - int map ; - LOGICAL useoradd ; -#endif { int i ; int sref ; @@ -1082,13 +1054,7 @@ void m_sigre(M_NOPAR) /* Returns a context-dependent delimiter string to input stream so characters can be reread one at a time in another context */ -#if defined(M_PROTO) void m_undodelim(M_WCHAR *delim, LOGICAL flag) -#else -void m_undodelim(delim, flag) - M_WCHAR *delim ; - LOGICAL flag ; -#endif { M_WCHAR *p ; @@ -1105,14 +1071,7 @@ void m_undodelim(delim, flag) /* Place a character on the current input stream. The character may have been scanned and determined not to be part of the current token or it may be in the expansion of an entity*/ -#if defined(M_PROTO) void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread) -#else -void m_ungetachar(c, dchar, preread) - int c ; - M_HOLDTYPE dchar ; - LOGICAL preread ; -#endif { char buffer[10] ; int length; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/string.c b/cde/programs/dthelp/parser.ccdf/htag/parser/string.c index b618aed34..95d157e42 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/string.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/string.c @@ -31,14 +31,7 @@ /* Include generated code */ #include "stfile.c" -#if defined(M_PROTO) void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END) -#else -void m_stcaction(m_string, M_START, M_END) - M_WCHAR *m_string ; - LOGICAL M_START ; - LOGICAL M_END ; -#endif { m_stackpar = m_stacktop->stparam ; (*m_sttable[m_stacktop->stccase])(m_string, M_START, M_END) ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c index 0afe866e5..bf69fb944 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c @@ -88,13 +88,7 @@ int m_checkstart(val) If VAL is not the element at the top of the parse stack, m_ckend checks to see if the end of VAL can validly end nested elements as well. */ -#if defined(M_PROTO) LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet) -#else -LOGICAL m_ckend(val, neednet) - M_ELEMENT val ; - LOGICAL neednet ; - #endif { M_PARSE *stackptr ; M_OPENFSA *fsastack ; @@ -423,14 +417,7 @@ void m_pop(M_NOPAR) /* Pushes a new item onto the parse stack, setting its element, current, and neednet fields as indicated by the parameters*/ -#if defined(M_PROTO) void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need) -#else -void m_push(elt, current, need) - M_ELEMENT elt ; - M_STATE current ; - LOGICAL need ; - #endif { M_PARSE *newstack ; @@ -651,13 +638,7 @@ LOGICAL m_strtproc(scanval) } /* Processes explicit or implied start tag*/ -#if defined(M_PROTO) void m_strttag(M_ELEMENT val, LOGICAL net) -#else -void m_strttag(val, net) - M_ELEMENT val ; - LOGICAL net ; -#endif { m_transition(val, TRUE) ; if (val) { @@ -723,13 +704,7 @@ LOGICAL m_textpermitted(M_NOPAR) /* Returns TRUE iff LABEL allowed in the current state of the current element (without expanding any minimization). May result in changes to the stack of FSA's for this element if and-groups open or close. */ -#if defined(M_PROTO) LOGICAL m_transition(M_ELEMENT label, LOGICAL recur) -#else -LOGICAL m_transition(label, recur) - M_ELEMENT label ; - LOGICAL recur ; -#endif { M_ARC parc ; M_OPENFSA *newfsa ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/text.c b/cde/programs/dthelp/parser.ccdf/htag/parser/text.c index dbf1c7892..fb39edbfb 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/text.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/text.c @@ -36,12 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "tfile.c" /* When a text character occurs */ -#if defined(M_PROTO) void m_textaction(M_WCHAR m_textchar) -#else -void m_textaction(m_textchar) - M_WCHAR m_textchar ; - #endif { char buffer[10] ; char mb_re; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/allwhite.c b/cde/programs/dthelp/parser.ccdf/htag/util/allwhite.c index 3165fbc57..d03d79d08 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/allwhite.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/allwhite.c @@ -26,25 +26,12 @@ */ #include "basic.h" -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); /* Test if a string contains only white space characters */ -#if defined(M_PROTO) LOGICAL m_allwhite(const M_WCHAR *string ) -#else -LOGICAL m_allwhite(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { const M_WCHAR *p ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/basic.h b/cde/programs/dthelp/parser.ccdf/htag/util/basic.h index bbb0d8c25..9c13a58ba 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/basic.h +++ b/cde/programs/dthelp/parser.ccdf/htag/util/basic.h @@ -46,69 +46,23 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#if defined(hpux) || defined(__aix) || defined(sun) -/* Old unix stuff - *#define void int - *#define M_NOPAR - */ -/* New Ansi style */ -#define M_PROTO + #define M_NOPAR void -#else -#define M_PROTO -#define M_NOPAR void -#endif -char *MakeMByteString( -#if defined(M_PROTO) - const M_WCHAR *from -#endif - ); +char *MakeMByteString(const M_WCHAR *from); -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); -int w_strcmp( -#if defined(M_PROTO) - const M_WCHAR *string1, const M_WCHAR *string2 -#endif - ); +int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2); -M_WCHAR *w_strcpy( -#if defined(M_PROTO) - M_WCHAR *string1, const M_WCHAR *string2 -#endif - ); +M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2); -M_WCHAR *w_strncpy( -#if defined(M_PROTO) - M_WCHAR *string1, const M_WCHAR *string2, int max -#endif - ); +M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max); -int w_strlen( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ); +int w_strlen(const M_WCHAR *string); -M_WCHAR *w_strchr( -#if defined(M_PROTO) - M_WCHAR *string, const M_WCHAR chr -#endif - ); +M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr); -M_WCHAR *w_strstr( -#if defined(M_PROTO) - M_WCHAR *string1, M_WCHAR *string2 -#endif - ); +M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/cont.h b/cde/programs/dthelp/parser.ccdf/htag/util/cont.h index 5771e5f32..2aaa6bde7 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/cont.h +++ b/cde/programs/dthelp/parser.ccdf/htag/util/cont.h @@ -37,179 +37,63 @@ This product and information is proprietary of Tandem Computers Incorporated. #define CONTINIT(a) #endif -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpdlmptr( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void dumpdlmptr(M_NOPAR); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)); -void dumptree( -#if defined(M_PROTO) - LOGICAL sparse -#endif - ) ; +void dumptree(LOGICAL sparse); -void enterdelim( -#if defined(M_PROTO) - int n -#endif - ) ; +void enterdelim(int n); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - char *text, char *arg -#endif - ) ; +void m_err1(char *text, char *arg); -void getcode( -#if defined(M_PROTO) - int n -#endif - ) ; +void getcode(int n); -void getcolon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void getcolon(M_NOPAR); -int getcontext( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int getcontext(M_NOPAR); -LOGICAL getdname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +LOGICAL getdname(M_NOPAR); -void inccon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void inccon(M_NOPAR); -void incdelim( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void incdelim(M_NOPAR); -void loaddelim( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void loaddelim(M_NOPAR); -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +void main(int argc, char **argv); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void nextcon( -#if defined(M_PROTO) - LOGICAL sparse -#endif - ) ; +void nextcon(LOGICAL sparse); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); -void printval( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void printval(FILE *file, M_TRIE *value); -void prtctxt( -#if defined(M_PROTO) - int column, int value -#endif - ) ; +void prtctxt(int column, int value); -int readchar( -#if defined(M_PROTO) - LOGICAL cap -#endif - ) ; +int readchar(LOGICAL cap); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void unread( -#if defined(M_PROTO) - int c -#endif - ) ; +void unread(int c); -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, char *arg -#endif - ) ; +void warning1(char *text, char *arg); -void warning2( -#if defined(M_PROTO) - char *text, char *arg1, char *arg2 -#endif - ) ; +void warning2(char *text, char *arg1, char *arg2); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); #define NOMORE -1 diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c index 5ae190cfb..9620697e5 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c @@ -55,12 +55,7 @@ void dumpdlmptr(M_NOPAR) } /* Output the generated data structures */ -#if defined(M_PROTO) void dumptree(LOGICAL sparse) -#else -void dumptree(sparse) - LOGICAL sparse; -#endif { int i, count = 0; @@ -563,12 +558,7 @@ loading = FALSE; } /* Output transition matrix */ -#if defined(M_PROTO) void nextcon(LOGICAL sparse) -#else -void nextcon(sparse) - LOGICAL sparse; -#endif { int i, j; int firstinrow; @@ -635,12 +625,7 @@ void prtctxt(column, value) /* Read the next input character */ -#if defined(M_PROTO) int readchar(LOGICAL cap) -#else -int readchar(cap) - LOGICAL cap; -#endif { int c; M_WCHAR wnl; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/emptyfil.c b/cde/programs/dthelp/parser.ccdf/htag/util/emptyfil.c index d8754cc5a..dc56ffc0c 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/emptyfil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/emptyfil.c @@ -29,15 +29,7 @@ #endif #include "basic.h" -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void main(argc, argv) - int argc ; - char **argv ; +void main(int argc, char **argv) { if (argc != 2) { fprintf(stderr, "Usage: emptyfil filename\n") ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/entout.c b/cde/programs/dthelp/parser.ccdf/htag/util/entout.c index 95996715c..dbd8ff38f 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/entout.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/entout.c @@ -25,23 +25,11 @@ /* Entout has procedures to write generated entity TRIE */ -void entptr( -#if defined(M_PROTO) - M_ENTITY *data -#endif - ) ; +void entptr(M_ENTITY *data); -char *typetype( -#if defined(M_PROTO) - int n -#endif - ) ; +char *typetype(int n); -char *typewhere( -#if defined(M_PROTO) - unsigned char n -#endif - ) ; +char *typewhere(unsigned char n); /* Macro names written to output file */ char xdbuild[] = "M_DBUILD" ; @@ -213,12 +201,7 @@ char *typetype(n) } /* Typewhere returns a string indicating where the nth entity was defined.*/ -#if defined(M_PROTO) char *typewhere(unsigned char n) -#else -char *typewhere(n) - unsigned char n ; -#endif { switch(n) { case M_DBUILD: return(xdbuild) ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/error.c b/cde/programs/dthelp/parser.ccdf/htag/util/error.c index a3380302d..5853bc293 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/error.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/error.c @@ -33,128 +33,47 @@ extern FILE *m_errfile ; extern int m_line ; extern LOGICAL errexit ; -void eprefix( -#if defined(M_PROTO) - LOGICAL flag -#endif - ) ; +void eprefix(LOGICAL flag); -void m_errline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_errline(char *text); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - char *text, const M_WCHAR *arg -#endif - ) ; +void m_err1(char *text, const M_WCHAR *arg); -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; +void m_mberr1(char *text, const char *arg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void m_err5( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, - M_WCHAR *arg5 -#endif - ) ; +void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, + M_WCHAR *arg5); -void esuffix( -#if defined(M_PROTO) - void -#endif - ) ; +void esuffix(void); -void msgline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void msgline(char *text); -void msg1line( -#if defined(M_PROTO) - char *text, char *arg1 -#endif - ) ; +void msg1line(char *text, char *arg1); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void m_wctrace( -#if defined(M_PROTO) - M_WCHAR *text -#endif - ) ; +void m_wctrace(M_WCHAR *text); -void m_trace( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_trace(char *text); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; +void warning1(char *text, M_WCHAR *arg); -void warning2( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2 -#endif - ) ; +void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2); -void warning3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void warning4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; +void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); /* Write error message prefix */ -#if defined(M_PROTO) void eprefix(LOGICAL flag) -#else -void eprefix(flag) - LOGICAL flag ; -#endif { if (flag) errexit = TRUE ; fprintf(stderr, "\n**** ") ; @@ -184,13 +103,7 @@ void m_error(text) /* Writes an error message with one argument to standard error and file "error" */ -#if defined(M_PROTO) void m_err1(char *text, const M_WCHAR *arg) -#else -void m_err1(text, arg) - char *text; - M_WCHAR *arg ; -#endif { char *mb_arg; @@ -203,13 +116,7 @@ skiptoend() ; m_free(mb_arg,"multi-byte string"); } -#if defined(M_PROTO) void m_mberr1(char *text, const char *arg) -#else -void m_err1(text, arg) - char *text; - char *arg ; -#endif { eprefix(TRUE) ; fprintf(stderr, text, arg) ; @@ -220,13 +127,7 @@ skiptoend() ; /* Writes an error message with two arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2) -#else -void m_err2(text, arg1, arg2) -char *text; -M_WCHAR *arg1, *arg2 ; -#endif { char *mb_arg1, *mb_arg2; @@ -243,13 +144,7 @@ m_free(mb_arg2,"multi-byte string"); /* Writes an error message with three arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void m_err3(text, arg1, arg2, arg3) -char *text; -M_WCHAR *arg1, *arg2, *arg3 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3; @@ -268,14 +163,8 @@ m_free(mb_arg3,"multi-byte string"); /* Writes an error message with five arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err5( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5) -#else -void m_err5(text, arg1, arg2, arg3, arg4, arg5) -char *text; -M_WCHAR *arg1, *arg2, *arg3, *arg4, *arg5 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5; @@ -347,13 +236,7 @@ void warning(text) /* Writes a nonfatal error message with one argument to standard error and file "error" */ -#if defined(M_PROTO) void warning1( char *text, M_WCHAR *arg) -#else -void warning1(text, arg) -char *text; -M_WCHAR *arg ; -#endif { char *mb_arg; @@ -367,13 +250,7 @@ m_free(mb_arg,"multi-byte string"); /* Writes a nonfatal error message with two arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2) -#else -void warning2(text, arg1, arg2) -char *text; -M_WCHAR *arg1, *arg2 ; -#endif { char *mb_arg1, *mb_arg2; @@ -389,13 +266,7 @@ m_free(mb_arg2,"multi-byte string"); /* Writes a nonfatal error message with three arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void warning3(text, arg1, arg2, arg3) -char *text; -M_WCHAR *arg1, *arg2, *arg3 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3; @@ -413,14 +284,8 @@ m_free(mb_arg3,"multi-byte string"); /* Writes a nonfatal error message with four arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4) -#else -void warning4(text, arg1, arg2, arg3, arg4) -char *text; -M_WCHAR *arg1, *arg2, *arg3, *arg4 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/exit.c b/cde/programs/dthelp/parser.ccdf/htag/util/exit.c index 0966c4a08..bc9a12c12 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/exit.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/exit.c @@ -30,11 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #endif #include "basic.h" -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); /* Exit function called by utilities used in PARSER and other programs in the MARKUP system */ diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c b/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c index cc78e8522..7fc2aa147 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c @@ -58,23 +58,11 @@ struct data { char linedir[] = "#line" ; char *p = linedir, *q = linedir + 1 ; -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +void main(int argc, char **argv); -void copyfile( -#if defined(m_proto) - char *pfile1, char *pfile2 -#endif - ) ; +void copyfile(char *pfile1, char *pfile2); -int nextchar( -#if defined (M_PROTO) - FILE *file, struct data *data -#endif - ) ; +int nextchar(FILE *file, struct data *data); void main(argc, argv) int argc ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/inctest.c b/cde/programs/dthelp/parser.ccdf/htag/util/inctest.c index 8f97f60ad..9f25e667e 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/inctest.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/inctest.c @@ -30,23 +30,11 @@ #endif #include "basic.h" -void m_err1( -#if defined(M_PROTO) - const char *text, const char *arg -#endif - ) ; +void m_err1(const char *text, const char *arg); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_inctest( -#if defined(M_PROTO) - int *count, int limit, char *message -#endif - ) ; +void m_inctest(int *count, int limit, char *message); /* Increment a count and test against a limit */ void m_inctest(count, limit, message) diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/initct.c b/cde/programs/dthelp/parser.ccdf/htag/util/initct.c index f041dfc16..7bb5aa16d 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/initct.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/initct.c @@ -29,11 +29,7 @@ #include "common.h" extern char m_chartype[M_CHARSETLEN] ; -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_initctype(M_NOPAR); void m_initctype(M_NOPAR) { diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/itoa.c b/cde/programs/dthelp/parser.ccdf/htag/util/itoa.c index a11e73f1b..1d61bd563 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/itoa.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/itoa.c @@ -27,17 +27,9 @@ #include #include "basic.h" -char *m_itoa( -#if defined(M_PROTO) - int n, char *s -#endif - ) ; +char *m_itoa(int n, char *s); -void reverse( -#if defined(M_PROTO) - char *s -#endif - ) ; +void reverse(char *s); char *m_itoa(n, s) /* convert n to characters in s */ char s[]; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/letter.c b/cde/programs/dthelp/parser.ccdf/htag/util/letter.c index b3f828c6c..b83617197 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/letter.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/letter.c @@ -27,18 +27,7 @@ #include "basic.h" -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; - -#if defined(M_PROTO) LOGICAL m_letter(M_WCHAR c) -#else -LOGICAL m_letter(c) - M_WCHAR c ; -#endif { if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) return(TRUE) ; return(FALSE) ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/lower.c b/cde/programs/dthelp/parser.ccdf/htag/util/lower.c index 107a51e81..d6eaaf291 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/lower.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/lower.c @@ -27,17 +27,8 @@ #include "basic.h" -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; - - - /* Force a letter to lowercase */ -int m_lower(c) - int c ; +int m_lower(int c) { if (c >= 'A' && c <= 'Z') c += 'a' - 'A' ; return(c) ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c index ab18230c4..4e831d9b6 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c @@ -36,53 +36,21 @@ extern LOGICAL m_heapchk ; extern LOGICAL m_malftrace ; -void m_errline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_errline(char *text); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void m_heapdump( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_heapdump(M_NOPAR); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void *m_realloc( -#if defined(M_PROTO) - void *ptr, int size, char *msg -#endif - ) ; +void *m_realloc(void *ptr, int size, char *msg); -void *m_trace( -#if defined(M_PROTO) - char *text -#endif - ) ; +void *m_trace(char *text); -void *m_wctrace( -#if defined(M_PROTO) - M_WCHAR *text -#endif - ) ; +void *m_wctrace(M_WCHAR *text); void m_free(block, msg) void *block ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/openchk.c b/cde/programs/dthelp/parser.ccdf/htag/util/openchk.c index b9be2e4b0..d5f4b4fc9 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/openchk.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/openchk.c @@ -33,22 +33,12 @@ extern FILE *m_errfile ; -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); /* Open a file and check that the open succeeded */ -void m_openchk(ptr, name, mode) - FILE **ptr ; - char *name, *mode ; +void m_openchk(FILE **ptrm, char *name, char *mode) { *ptr = fopen(name, mode) ; if (*ptr) return ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/paramu.c b/cde/programs/dthelp/parser.ccdf/htag/util/paramu.c index 066cf9d63..1f3c2fbb9 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/paramu.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/paramu.c @@ -33,13 +33,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Check to see if string is a valid value for parameter par. If so return a pointer to the keyword if it's a keyword parameter and otherwise a pointer to string. If not valid, return FALSE. */ -#if defined(M_PROTO) const M_WCHAR *m_partype(const int par , const M_WCHAR *string ) -#else -M_WCHAR *m_partype(par, string) - int par ; - M_WCHAR *string ; -#endif /* M_PROTO */ { LOGICAL first = TRUE ; int kw ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/sparse.h b/cde/programs/dthelp/parser.ccdf/htag/util/sparse.h index 47ba594d6..1879916fe 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/sparse.h +++ b/cde/programs/dthelp/parser.ccdf/htag/util/sparse.h @@ -29,11 +29,7 @@ #if defined(sparse) #define m_newcon(i, j) m_sprscon(i, j) -int m_sprscon( -#if defined(M_PROTO) - int i, int j -#endif - ) ; +int m_sprscon(int i, int j); #else #define m_newcon(i, j) m_nextcon[i][j] diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/trie.c b/cde/programs/dthelp/parser.ccdf/htag/util/trie.c index e91d02ae5..493f72044 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/trie.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/trie.c @@ -45,26 +45,12 @@ extern FILE *m_errfile ; extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ; -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void m_entercharintrie( -#if defined(M_PROTO) - M_TRIE **currentnode, M_WCHAR c -#endif - ) ; +void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c); /* Enters the next character of a string into a trie */ -#if defined(M_PROTO) void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c) -#else -void m_entercharintrie(currentnode, c) - M_TRIE **currentnode ; - M_WCHAR c ; -#endif { M_TRIE *newnode ; @@ -112,13 +98,7 @@ M_TRIE *m_gettrienode(M_NOPAR) /* M_lookfortrie(p, xtrie) looks for string p in the specified trie, returning its data value if found and otherwise FALSE */ -#if defined(M_PROTO) void *m_lookfortrie( const M_WCHAR *p , const M_TRIE *xtrie ) -#else -void *m_lookfortrie(p, xtrie) - M_WCHAR *p ; - M_TRIE *xtrie ; -#endif /* M_PROTO */ { M_TRIE *currentnode ; @@ -141,10 +121,7 @@ void *m_lookfortrie(p, xtrie) } /* Enters a string and associated data value into a trie */ -void *m_ntrtrie(p, xtrie, dataval) - M_WCHAR *p ; - M_TRIE *xtrie ; - void *dataval ; +void *m_ntrtrie(M_WCHAR *p, M_TRIE *xtrie, void *dataval) { M_TRIE *currentnode ; void *n ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/trie.h b/cde/programs/dthelp/parser.ccdf/htag/util/trie.h index 4d8a583de..f991fb31e 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/trie.h +++ b/cde/programs/dthelp/parser.ccdf/htag/util/trie.h @@ -51,26 +51,10 @@ struct m_ptrie { } ; -M_TRIE *m_gettrienode( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +M_TRIE *m_gettrienode(M_NOPAR); -void *m_lookfortrie( -#if defined(M_PROTO) - const M_WCHAR *p, const M_TRIE *xtrie -#endif - ) ; +void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie); -void *m_ntrtrie( -#if defined(M_PROTO) - M_WCHAR *p, M_TRIE *xtrie, void *dataval -#endif - ) ; +void *m_ntrtrie(M_WCHAR *p, M_TRIE *xtrie, void *dataval); -void *m_resettrie( -#if defined(M_PROTO) - M_TRIE *xtrie, M_WCHAR *p, void *value -#endif - ) ; +void *m_resettrie(M_TRIE *xtrie, M_WCHAR *p, void *value); diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/triecnt.c b/cde/programs/dthelp/parser.ccdf/htag/util/triecnt.c index 9e81d04a4..d19c476d4 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/triecnt.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/triecnt.c @@ -31,24 +31,12 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, + void (*proc)(FILE *file, void *value)); -void printval( -#if defined(M_PROTO) - FILE *file, void *value -#endif - ) ; +void printval(FILE *file, void *value); /* Count the descendants of a node in order to generate declarations for the packed form of a trie*/ @@ -71,12 +59,7 @@ void dumpnode(first, file, trieptr, count, proc) FILE *file ; M_TRIE *trieptr ; int *count ; - void (*proc) ( -#if defined (M_PROTO) - FILE *file, - void *value -#endif - ) ; + void (*proc) (FILE *file, void *value); { M_TRIE *p ; int savecount ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/triedump.c b/cde/programs/dthelp/parser.ccdf/htag/util/triedump.c index 0ddf29af5..b34d480d4 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/triedump.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/triedump.c @@ -29,18 +29,10 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(void *value) -#endif - ) ; +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, + void (*proc)(void *value)); /* Write the C declaration of a trie */ void m_dumptrie(file, xtrie, extname, count, proc) @@ -48,11 +40,7 @@ void m_dumptrie(file, xtrie, extname, count, proc) M_TRIE *xtrie ; char *extname ; int *count ; - void (*proc)( -#if defined(M_PROTO) - void *value -#endif - ) ; + void (*proc)(void *value); { int firstson ; M_TRIE *p ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/triepdmp.c b/cde/programs/dthelp/parser.ccdf/htag/util/triepdmp.c index 30bd2a4cd..8d96d9c58 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/triepdmp.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/triepdmp.c @@ -29,25 +29,13 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, + void (*proc)(FILE *file, void *value)); -void dumpptrie( -#if defined(M_PROTO) - M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, + void (*proc)(FILE *file, void *value)); /* Write the declaration of a packed trie to the specified files */ void dumpptrie(intname, extname, file, externdef, defdef, proc) @@ -56,12 +44,7 @@ void dumpptrie(intname, extname, file, externdef, defdef, proc) FILE *file ; char *externdef ; char *defdef ; - void (*proc) ( -#if defined (M_PROTO) - FILE *file, - void *value -#endif - ) ; + void (*proc) (FILE *file, void *value); { LOGICAL first = TRUE ; int count = 0 ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/trieplk.c b/cde/programs/dthelp/parser.ccdf/htag/util/trieplk.c index da15d5da3..9a36bbf44 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/trieplk.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/trieplk.c @@ -36,17 +36,10 @@ extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ; -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, - M_WCHAR *name -#endif - ) ; +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); /* Look for the string NAME in the packed trie PTRIE */ -int m_packedlook(xptrie, name) -M_PTRIE *xptrie ; -M_WCHAR *name ; +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name) { int current = 0 ; int i ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/upcmp8.c b/cde/programs/dthelp/parser.ccdf/htag/util/upcmp8.c index 828c05904..27627ad8c 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/upcmp8.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/upcmp8.c @@ -32,30 +32,13 @@ #include "common.h" extern M_CHARTYPE m_ctarray[256] ; -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; +int m_mbmbupstrcmp(const char *p, const char *q); -#if defined(M_PROTO) int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q ) -#else -int m_wcupstrcmp(p, q) - M_WCHAR *p, *q ; -#endif /* M_PROTO */ { do { if (m_ctupper(*p) < m_ctupper(*q)) return(-1) ; @@ -65,13 +48,7 @@ int m_wcupstrcmp(p, q) return(0) ; } -#if defined(M_PROTO) int m_wcmbupstrcmp(const M_WCHAR *p, const char *q) -#else -int m_wcmbupstrcmp(p, q) - M_WCHAR *p; - char *q ; -#endif { M_WCHAR *wc; int retval; @@ -82,13 +59,7 @@ int m_wcmbupstrcmp(p, q) return retval; } -#if defined(M_PROTO) int m_mbmbupstrcmp(const char *p, const char *q) -#else -int m_mbmbupstrcmp(p, q) - char *p; - char *q ; -#endif { M_WCHAR *w_p, *w_q; int retval; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/upper.c b/cde/programs/dthelp/parser.ccdf/htag/util/upper.c index 53f77e2b3..7b1361b3c 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/upper.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/upper.c @@ -29,14 +29,7 @@ #include "basic.h" -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; - -int m_upper(c) - int c ; +int m_upper(int c) { if (c >= 'a' && c <= 'z') c += 'A' - 'a' ; return(c) ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/upstrcmp.c b/cde/programs/dthelp/parser.ccdf/htag/util/upstrcmp.c index 5bf7b2d7c..16d9140bc 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/upstrcmp.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/upstrcmp.c @@ -29,17 +29,9 @@ #include "basic.h" -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -int m_upstrcmp( -#if defined(M_PROTO) - char *p, char *q -#endif - ) ; +int m_upstrcmp(char *p, char *q); int m_upstrcmp(p, q) char *p, *q ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/wchar.c b/cde/programs/dthelp/parser.ccdf/htag/util/wchar.c index 180995ab6..660281939 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/wchar.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/wchar.c @@ -30,13 +30,7 @@ /* compare two wide character strings */ -#if defined(M_PROTO) int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2) -#else -int w_strcmp(string1, string2) -M_WCHAR *string1; -M_WCHAR *string2; -#endif { M_WCHAR c1, c2, null; @@ -58,13 +52,7 @@ while (1) /* copy a wide character string */ -#if defined(M_PROTO) M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2) -#else -M_WCHAR *w_strcpy(string1, string2) -M_WCHAR *string1; -M_WCHAR *string2; -#endif { M_WCHAR *string1start; @@ -77,14 +65,7 @@ return string1start; /* copy a wide character string, stopping after "max" moves */ -#if defined(M_PROTO) M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max) -#else -M_WCHAR *w_strncpy(string1, string2, max) -M_WCHAR *string1; -M_WCHAR *string2; -int max; -#endif { M_WCHAR *string1start; @@ -97,12 +78,7 @@ return string1start; /* get the length of a wide character string */ -#if defined(M_PROTO) int w_strlen(const M_WCHAR *string) -#else -int w_strlen(string) -M_WCHAR *string; -#endif { int length; @@ -115,12 +91,7 @@ return length; /* find wide character "chr" in wide string "string" */ -#if defined(M_PROTO) M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr) -#else -M_WCHAR *w_strchr(string, chr) -M_WCHAR *string, chr; -#endif { M_WCHAR *where; @@ -140,12 +111,7 @@ else /* find wide character "chr" in wide string "string" */ -#if defined(M_PROTO) M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2) -#else -M_WCHAR *w_strstr(string1, string2) -M_WCHAR *string1, *string2; -#endif { M_WCHAR *where1, *where2; @@ -180,12 +146,7 @@ return NULL; /* make a multi-byte string from a wide character string */ -#if defined(M_PROTO) char *MakeMByteString(const M_WCHAR *wc_string) -#else -char *MakeMByteString(wc_string) -M_WCHAR *wc_string; -#endif { char *mb_string; int length; @@ -210,12 +171,7 @@ return mb_string; /* make a wide character string from a multi-byte string */ -#if defined(M_PROTO) M_WCHAR *MakeWideCharString(const char *mb_string) -#else -M_WCHAR *MakeWideCharString(mb_string) -char *mb_string; -#endif { M_WCHAR *wc_string, *wc_stringStart; int length, incr; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/whitesp.c b/cde/programs/dthelp/parser.ccdf/htag/util/whitesp.c index 36d0beafa..000033c3b 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/whitesp.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/whitesp.c @@ -27,19 +27,8 @@ #include "basic.h" -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; - /* Test if character c is a blank, tab, or carriage return */ -#if defined(M_PROTO) LOGICAL m_whitespace(M_WCHAR c) -#else -LOGICAL m_whitespace(c) - M_WCHAR c ; -#endif { char mb_c[32]; /* arbitrarily large */ int length; diff --git a/cde/programs/dthelp/parser/canon1/build/build.h b/cde/programs/dthelp/parser/canon1/build/build.h index aadec6fca..9887254f2 100644 --- a/cde/programs/dthelp/parser/canon1/build/build.h +++ b/cde/programs/dthelp/parser/canon1/build/build.h @@ -421,8 +421,4 @@ BUILDEXTERN LOGICAL entrule BUILDINIT(FALSE) ; BUILDEXTERN M_WCHAR genname[M_NAMELEN + sizeof(M_PREFIX)] ; -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); diff --git a/cde/programs/dthelp/parser/canon1/build/fsa.c b/cde/programs/dthelp/parser/canon1/build/fsa.c index 9dfb91698..e76d5bde4 100644 --- a/cde/programs/dthelp/parser/canon1/build/fsa.c +++ b/cde/programs/dthelp/parser/canon1/build/fsa.c @@ -37,18 +37,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Addarc adds an arc from FSA state to state setting other fields as indicated by the other parameters.*/ -#if defined(M_PROTO) int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, int id, LOGICAL minim, ELTSTRUCT **errelt) -#else -int addarc(from, to, label, and, optional, id, minim, errelt) - STATE *from, *to ; - ELTSTRUCT *label ; - ANDGROUP *and ; - LOGICAL optional ; - int id ; - LOGICAL minim ; - ELTSTRUCT **errelt ; -#endif { ARC *parc, *qarc ; int determ ; @@ -630,12 +619,7 @@ LOGICAL samelabelarc(a, s) /* Saves the name of an element appearing on the left-hand side of a grammar rule */ -#if defined(M_PROTO) void savelhs(LOGICAL param) -#else -void savelhs(param) - LOGICAL param ; -#endif { STATE *end ; ELTSTRUCT *errelt ; diff --git a/cde/programs/dthelp/parser/canon1/build/param.c b/cde/programs/dthelp/parser/canon1/build/param.c index b6b8e4593..c2cc35068 100644 --- a/cde/programs/dthelp/parser/canon1/build/param.c +++ b/cde/programs/dthelp/parser/canon1/build/param.c @@ -124,12 +124,7 @@ newpar->ptypep = NULL ; /* Check that specified default value is legal parameter value */ -#if defined(M_PROTO) LOGICAL checkdefault( const M_WCHAR *string ) -#else -LOGICAL checkdefault(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { const M_WCHAR *p ; int len ; @@ -205,12 +200,7 @@ switch (newpar->type) /* Normalize parameter default. Change tabs and RE's to spaces, capitalize all letters (unless type is CDATA), remove extra space in lists */ -#if defined(M_PROTO) void normdefault(M_WCHAR *string ) -#else -void normdefault(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { M_WCHAR *p, *q ; int i, ret ; @@ -296,12 +286,7 @@ ruleinit() ; } /* Make string the default for the current parameter of the current element */ -#if defined(M_PROTO) void setdefault(const M_WCHAR *string) -#else -void setdefault() -M_WCHAR *string; -#endif /* M_PROTO */ { PTYPE *kw ; int keycount ; diff --git a/cde/programs/dthelp/parser/canon1/build/proto.h b/cde/programs/dthelp/parser/canon1/build/proto.h index f86bef3e2..03252c786 100644 --- a/cde/programs/dthelp/parser/canon1/build/proto.h +++ b/cde/programs/dthelp/parser/canon1/build/proto.h @@ -28,587 +28,203 @@ /* Proto.h contains function prototypes for program BUILD. */ -int addarc( -#if defined(M_PROTO) - STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, - int id, LOGICAL minim, ELTSTRUCT **errelt -#endif - ) ; +int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, + int id, LOGICAL minim, ELTSTRUCT **errelt); -void adddefent( -#if defined(M_PROTO) - M_WCHAR *mapname -#endif - ) ; +void adddefent(M_WCHAR *mapname); -LOGICAL addent( -#if defined(M_PROTO) - M_WCHAR *name -#endif - ) ; +LOGICAL addent(M_WCHAR *name); -void addex( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addex(M_NOPAR); -void addkeyword( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addkeyword(M_NOPAR); -LOGICAL addmapname( -#if defined(M_PROTO) - M_WCHAR *p, LOGICAL define -#endif - ) ; +LOGICAL addmapname(M_WCHAR *p, LOGICAL define); -void addndent( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void addndent(M_WCHAR *p); -void addpar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addpar(M_NOPAR); -void addsref( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void addsref(M_WCHAR *p); -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -void checkand( -#if defined(M_PROTO) - ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root, - ELTSTRUCT **errelt -#endif - ) ; +void checkand(ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root, + ELTSTRUCT **errelt); -LOGICAL checkdefault( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL checkdefault(const M_WCHAR *string); -int checkdfsa( -#if defined(M_PROTO) - STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt -#endif - ) ; +int checkdfsa(STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt); -int checkrepeat( -#if defined(M_PROTO) - STATE *from, ANDGROUP *and, ELTSTRUCT **errelt -#endif - ) ; +int checkrepeat(STATE *from, ANDGROUP *and, ELTSTRUCT **errelt); -void copyintolist( -#if defined(M_PROTO) - STATELIST *from, STATELIST **to -#endif - ) ; +void copyintolist(STATELIST *from, STATELIST **to); -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void defmapname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void defmapname(M_NOPAR); -char *deftype( -#if defined(M_PROTO) - int n -#endif - ) ; +char *deftype(int n); -void dellist( -#if defined(M_PROTO) - STATELIST **list -#endif - ) ; +void dellist(STATELIST **list); -void delstartarcs( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void delstartarcs(M_NOPAR); -void done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void done(M_NOPAR); -void dumpentnode( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void dumpentnode(FILE *file, M_TRIE *value); -void dumpmapnode( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void dumpmapnode(FILE *file, M_TRIE *value); -void dumpsrefnode( -#if defined(M_PROTO) - FILE *file, - M_TRIE *value -#endif - ) ; +void dumpsrefnode(FILE *file, + M_TRIE *value); -void dumpptrie( -#if defined(M_PROTO) - M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, - void (*proc)( FILE *, M_TRIE *) -#endif - ) ; +void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, + void (*proc)( FILE *, M_TRIE *)); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(M_ENTITY *) -#endif - ) ; - -void eltblocks( -#if defined(M_PROTO) - FILE *tempfile -#endif - ) ; - -void eltreeout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void endmodel( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void entout( -#if defined(M_PROTO) - char *fname -#endif - ) ; - -char *enttype( -#if defined(M_PROTO) - int n -#endif - ) ; - -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; - -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; - -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; - -void exout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; - -void freetree( -#if defined(M_PROTO) - TREE *ruletree -#endif - ) ; - -void found( -#if defined(M_PROTO) - LOGICAL *flag, char *delim -#endif - ) ; - -void fsa( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int getachar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -ANDGROUP *getand( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL getname( -#if defined(M_PROTO) - int first -#endif - ) ; - -STATE *getstate( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int gettoken( -#if defined(M_PROTO) - int *c, int context -#endif - ) ; - -TREE *gettreenode( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; - -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void makeand( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root, int optional -#endif - ) ; - -LOGICAL makefsa( -#if defined(M_PROTO) - TREE *root, int optional -#endif - ) ; - -void makeor( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root -#endif - ) ; - -void makeseq( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root, int optional -#endif - ) ; - -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; - -void msgline( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void msg1line( -#if defined(M_PROTO) - char *text, char *arg1 -#endif - ) ; - -void nondeterm( -#if defined(M_PROTO) - TREE *root, int c, ELTSTRUCT *eltp -#endif - ) ; - -void normdefault( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL notinlist( -#if defined(M_PROTO) - STATELIST *item, STATELIST *list -#endif - ) ; - -ELTSTRUCT *ntrelt( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; - -void parout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -char *partype( -#if defined(M_PROTO) - int n -#endif - ) ; - -LOGICAL permitspcd( -#if defined(M_PROTO) - ARC *a -#endif - ) ; - -void pop( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void prulend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void push( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL regenerate( -#if defined(M_PROTO) - TREE *start, TREE *stop -#endif - ) ; - -void repeat( -#if defined(M_PROTO) - TREE *root -#endif - ) ; - -void ruleinit( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void rulend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL samelabelarc( -#if defined(M_PROTO) - ARC *a, STATE *s -#endif - ) ; - -void savelhs( -#if defined(M_PROTO) - LOGICAL param -#endif - ) ; - -void savestartarcs( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void setdefault( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; - -void simplebranch( -#if defined(M_PROTO) - TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional -#endif - ) ; - -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_sprscon( -#if defined(M_PROTO) - int i, int j -#endif - ) ; - -void srefout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -STATE *startfsa( -#if defined(M_PROTO) - TREE *root, LOGICAL *canbenull -#endif - ) ; - -void tempelt( -#if defined(M_PROTO) - ELTSTRUCT *eltp, FILE *tempfile -#endif - ) ; - -void template( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -char *typecon( -#if defined(M_PROTO) - int n -#endif - ) ; - -void undodelim( -#if defined(M_PROTO) - M_WCHAR *delim -#endif - ) ; - -void ungetachar( -#if defined(M_PROTO) - int c -#endif - ) ; - -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; - -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; - -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; - -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; - -void warning2( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2 -#endif - ) ; - -void warning3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; - -void warning4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; - -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; + void (*proc)(M_ENTITY *)); + +void eltblocks(FILE *tempfile); + +void eltreeout(M_NOPAR); + +void endmodel(M_NOPAR); + +void entout(char *fname); + +char *enttype(int n); + +void m_error(char *text); + +void m_err1(const char *text, const M_WCHAR *arg); + +void m_mberr1(char *text, const char *arg); + +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); + +void exout(M_NOPAR); + +void m_free(void *block, char *msg); + +void freetree(TREE *ruletree); + +void found(LOGICAL *flag, char *delim); + +void fsa(M_NOPAR); + +int getachar(M_NOPAR); + +ANDGROUP *getand(M_NOPAR); + +LOGICAL getname(int first); + +STATE *getstate(M_NOPAR); + +int gettoken(int *c, int context); + +TREE *gettreenode(M_NOPAR); + +void m_initctype(M_NOPAR); + +void initialize(M_NOPAR); + +LOGICAL litproc(int delim); + +int main(int argc, char **argv); + +void makeand(LOGICAL *canbenull, TREE *root, int optional); + +LOGICAL makefsa(TREE *root, int optional); + +void makeor(LOGICAL *canbenull, TREE *root); + +void makeseq(LOGICAL *canbenull, TREE *root, int optional); + +void *m_malloc(int size, char *msg); + +void msgline(char *text); + +void msg1line(char *text, char *arg1); + +void nondeterm(TREE *root, int c, ELTSTRUCT *eltp); + +void normdefault(M_WCHAR *string); + +LOGICAL notinlist(STATELIST *item, STATELIST *list); + +ELTSTRUCT *ntrelt(M_WCHAR *p); + +void m_openchk(FILE **ptr, char *name, char *mode); + +void parout(M_NOPAR); + +char *partype(int n); + +LOGICAL permitspcd(ARC *a); + +void pop(M_NOPAR); + +void prulend(M_NOPAR); + +void push(M_NOPAR); + +LOGICAL regenerate(TREE *start, TREE *stop); + +void repeat(TREE *root); + +void ruleinit(M_NOPAR); + +void rulend(M_NOPAR); + +LOGICAL samelabelarc(ARC *a, STATE *s); + +void savelhs(LOGICAL param); + +void savestartarcs(M_NOPAR); + +int scan(M_NOPAR); + +void setdefault(const M_WCHAR *string); + +void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional); + +void skiptoend(M_NOPAR); + +int m_sprscon(int i, int j); + +void srefout(M_NOPAR); + +STATE *startfsa(TREE *root, LOGICAL *canbenull); + +void tempelt(ELTSTRUCT *eltp, FILE *tempfile); + +void template(M_NOPAR); + +char *typecon(int n); + +void undodelim(M_WCHAR *delim); + +void ungetachar(int c); + +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); + +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); + +int m_mbmbupstrcmp(const char *p, const char *q); + +void warning(char *text); + +void warning1(char *text, M_WCHAR *arg); + +void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2); + +void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); + +void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); + +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser/canon1/build/sref.c b/cde/programs/dthelp/parser/canon1/build/sref.c index d8d45cc40..d5f89266f 100644 --- a/cde/programs/dthelp/parser/canon1/build/sref.c +++ b/cde/programs/dthelp/parser/canon1/build/sref.c @@ -101,13 +101,7 @@ return(TRUE); } /* Add a short reference map name */ -#if defined(M_PROTO) LOGICAL addmapname(M_WCHAR* p, LOGICAL define) -#else -LOGICAL addmapname(p, define) -M_WCHAR *p; -LOGICAL define; -#endif { MAP *old; MAP *new; diff --git a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c index 12f7c57e0..ff433f4ea 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c @@ -66,23 +66,14 @@ void actptrout(array, name) /* Close a code file and write jump table at the end */ -#if defined(M_PROTO) void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto) -#else -void closeiffile(flag, file, count, table, proto) - LOGICAL flag; - FILE *file; - int count; - char *table; - char *proto; -#endif { int i; endcode(flag, file); if (count) { fprintf(file, - "void (*m_%stable[])(\n#if defined(M_PROTO)\n %s\n#endif\n ) = {\n", + "void (*m_%stable[])(%s) = {\n", table, proto); fprintf(file, " m_%s1, /* Place holder for 1-based indexing */\n", table); @@ -94,7 +85,7 @@ void closeiffile(flag, file, count, table, proto) } else fprintf(file, - "void (*m_%stable[1])(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n", + "void (*m_%stable[1])(%s) ;\n", table, proto); fclose(file); } @@ -193,13 +184,7 @@ void done(M_NOPAR) } /* Called when finished reading a section of code from the input file */ -#if defined(M_PROTO) void endcode(LOGICAL flag, FILE *file) -#else -void endcode(flag, file) - LOGICAL flag; - FILE *file; -#endif { if (flag) fprintf(file, "}}\n\n"); } @@ -563,21 +548,13 @@ endcode(*flag, file); *flag = TRUE; /* protoype */ fprintf(file, - "void m_%s%d(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n", + "void m_%s%d(%s);\n", prefix, caseno, proto); /* ANSI defines */ -fputs("#if defined(M_PROTO)\n", file); -fprintf(file, "void m_%s%d(%s)\n", prefix, caseno, proto); -fputs("#else\n", file); -fprintf(file, - "void m_%s%d(%s)\n%s\n#endif\n {\n", /* balance the "}" */ - prefix, - caseno, - formal, - formtype); +fprintf(file, "void m_%s%d(%s)\n {\n", prefix, caseno, proto); for (cvarp = cvarlist ; cvarp ; cvarp = cvarp->next) { diff --git a/cde/programs/dthelp/parser/canon1/eltdef/proto.h b/cde/programs/dthelp/parser/canon1/eltdef/proto.h index be5ad4716..077e929fe 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/proto.h +++ b/cde/programs/dthelp/parser/canon1/eltdef/proto.h @@ -28,334 +28,118 @@ /* Proto.h contains function prototypes for program ELTDEF. */ -void actptrout( -#if defined(M_PROTO) - ACTION **array, char *name -#endif - ) ; +void actptrout(ACTION **array, char *name); -void addent( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addent(M_NOPAR); -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -void closeiffile( -#if defined(M_PROTO) - LOGICAL flag, FILE *file, int count, char *table, char *proto -#endif - ) ; +void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto); -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void cvalue( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void cvalue(M_NOPAR); -void done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void done(M_NOPAR); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(M_ENTITY *) -#endif - ) ; + void (*proc)(M_ENTITY *)); -void endcode( -#if defined(M_PROTO) - LOGICAL flag, FILE *file -#endif - ) ; +void endcode(LOGICAL flag, FILE *file); -void endini( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endini(M_NOPAR); -void endsignon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endsignon(M_NOPAR); -void endstring( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endstring(M_NOPAR); -void entout( -#if defined(M_PROTO) - char *fname -#endif - ) ; +void entout(char *fname); -void enttype( -#if defined(M_PROTO) - int type -#endif - ) ; +void enttype(int type); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; +void m_err1(const char *text, const M_WCHAR *arg); -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; +void m_mberr1(char *text, const char *arg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void m_err5( -#if defined(M_PROTO) - char *text, - M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5 -#endif - ) ; +void m_err5(char *text, + M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void freechain( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void freechain(M_NOPAR); -int getachar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int getachar(M_NOPAR); -int *getaction( -#if defined(M_PROTO) - ACTION **array -#endif - ) ; +int *getaction(ACTION **array); -ACTION *getactstruct( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +ACTION *getactstruct(M_NOPAR); -void getname( -#if defined(M_PROTO) - int first -#endif - ) ; +void getname(int first); -int gettoken( -#if defined(M_PROTO) - int *c, int context -#endif - ) ; +int gettoken(int *c, int context); -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_initctype(M_NOPAR); -void initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void initialize(M_NOPAR); -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_letter(M_WCHAR c); -LOGICAL litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; +LOGICAL litproc(int delim); -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +int main(int argc, char **argv); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); -void outpval( -#if defined(M_PROTO) - M_TRIE *p -#endif - ) ; +void outpval(M_TRIE *p); -void outstring( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void outstring(M_NOPAR); -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, M_WCHAR *name -#endif - ) ; +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); -const M_WCHAR *m_partype( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; +const M_WCHAR *m_partype(const int par, const M_WCHAR *string); -int scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int scan(M_NOPAR); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void startcode( -#if defined(M_PROTO) - int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, - char *formal, char *formtype -#endif - ) ; +void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, + char *formal, char *formtype); -void startelement( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void startelement(M_NOPAR); -void storecvar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void storecvar(M_NOPAR); -void storepname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void storepname(M_NOPAR); -void undodelim( -#if defined(M_PROTO) - M_WCHAR *delim -#endif - ) ; +void undodelim(M_WCHAR *delim); -void ungetachar( -#if defined(M_PROTO) - int c -#endif - ) ; +void ungetachar(int c); -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; +int m_mbmbupstrcmp(const char *p, const char *q); -void value( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void value(M_WCHAR *p); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; +void warning1(char *text, M_WCHAR *arg); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser/canon1/helptag/default.c b/cde/programs/dthelp/parser/canon1/helptag/default.c index 134d013f8..c91ee0d08 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/default.c +++ b/cde/programs/dthelp/parser/canon1/helptag/default.c @@ -30,12 +30,7 @@ Copyright 1988, 1989, 1992 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(M_PROTO) int vextextsize(const M_WCHAR *keyword) -#else -int vextextsize(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return NORMAL; @@ -47,12 +42,7 @@ m_err1("Unexpected value for ex/vex textsize parameter: %s", keyword); return NORMAL; } -#if defined(M_PROTO) int vgloss(const M_WCHAR *keyword) -#else -int vgloss(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return GLOSS; @@ -63,12 +53,7 @@ m_err1("Unexpected value for gloss parameter: %s", keyword); return GLOSS; } -#if defined(M_PROTO) int vcenter(const M_WCHAR *keyword) -#else -int vcenter(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return CENTER; @@ -80,12 +65,7 @@ m_err1("Unexpected value for center parameter: %s", keyword); return CENTER; } -#if defined(M_PROTO) int vnumber(const M_WCHAR *keyword) -#else -int vnumber(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return NONUMBER; @@ -96,12 +76,7 @@ m_err1("Unexpected value for number parameter: %s", keyword); return NONUMBER; } -#if defined(M_PROTO) LOGICAL vstack(const M_WCHAR *keyword) -#else -LOGICAL vnumber(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return FALSE; @@ -112,12 +87,7 @@ m_err1("Unexpected value for number parameter: %s", keyword); return FALSE; } -#if defined(M_PROTO) int vordertype(const M_WCHAR *keyword) -#else -int vordertype(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return ARABIC; @@ -131,12 +101,7 @@ m_err1("Unexpected list order type: %s", keyword); return ARABIC; } -#if defined(M_PROTO) int vspacing(const M_WCHAR *keyword) -#else -int vspacing(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return LOOSE; @@ -147,12 +112,7 @@ m_err1("Unexpected value for spacing parameter: %s", keyword); return LOOSE; } -#if defined(M_PROTO) int vlonglabel(const M_WCHAR *keyword) -#else -int vlonglabel(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return WRAP; @@ -163,12 +123,7 @@ m_err1("Unexpected value for longlabel parameter: %s", keyword); return WRAP; } -#if defined(M_PROTO) int vtype(const M_WCHAR *keyword) -#else -int vtype(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return BULLET; diff --git a/cde/programs/dthelp/parser/canon1/helptag/fproto.h b/cde/programs/dthelp/parser/canon1/helptag/fproto.h index d02b446a3..346aa92f4 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/fproto.h +++ b/cde/programs/dthelp/parser/canon1/helptag/fproto.h @@ -24,452 +24,186 @@ /* Copyright (c) 1988, 1989, 1990 Hewlett-Packard Co. */ /* Function prototypes for HP Tag/TeX translator */ -void assert_hometopic_exists( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void assert_hometopic_exists(M_NOPAR); /* osf has basename() defined in system header file, change * basename() to fbasename(). --XPG4 standard. */ -void fbasename( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void fbasename(M_NOPAR); -void chapstart( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void chapstart(M_WCHAR *id); -void checkgloss( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void checkgloss(M_NOPAR); -M_WCHAR *checkid( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +M_WCHAR *checkid(M_WCHAR *id); -void checkmsghead ( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void checkmsghead (M_NOPAR); -void dumpxref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void dumpxref(M_NOPAR); -void echohead( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void echohead(M_WCHAR *p); -void mb_echohead( -#if defined(M_PROTO) - char *p -#endif - ) ; +void mb_echohead(char *p); -void endhead( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endhead(M_NOPAR); -void esoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void esoutchar(M_WCHAR textchar); -void vexoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void vexoutchar(M_WCHAR textchar); -void exoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void exoutchar(M_WCHAR textchar); -void imoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void imoutchar(M_WCHAR textchar); -int getqualified ( -#if defined(M_PROTO) - M_WCHAR *qualname, M_WCHAR *unqualname -#endif - ) ; +int getqualified (M_WCHAR *qualname, M_WCHAR *unqualname); -void handle_link_and_graphic( -#if defined(M_PROTO) - M_WCHAR *parent, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink, - M_WCHAR *glinktype, M_WCHAR *gdescription -#endif - ); +void handle_link_and_graphic(M_WCHAR *parent, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink, + M_WCHAR *glinktype, M_WCHAR *gdescription); -void idstring( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void idstring(M_WCHAR *string); -void indexchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void indexchar(M_WCHAR textchar); -void Item( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void Item(M_WCHAR *id); -char *m_itoa( -#if defined(M_PROTO) - int n, char *s -#endif - ) ; +char *m_itoa(int n, char *s); -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_letter(M_WCHAR c); -void loadxref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void loadxref(M_NOPAR); -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); -void options( -#if defined(M_PROTO) - LOGICAL filelenonly -#endif - ) ; +void options(LOGICAL filelenonly); -void outchar( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void outchar(M_WCHAR textchar, FILE *outfile ); -void outpi( -#if defined(M_PROTO) - int enttype, M_WCHAR *pi, M_WCHAR *entname -#endif - ) ; +void outpi(int enttype, M_WCHAR *pi, M_WCHAR *entname); -void realoutchar( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void realoutchar(M_WCHAR textchar, FILE *outfile); -void rsectstart( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void rsectstart(M_WCHAR *id); -void rseqend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void rseqend(M_NOPAR); -M_WCHAR *searchforfile( -#if defined(M_PROTO) - M_WCHAR *file -#endif - ) ; +M_WCHAR *searchforfile(M_WCHAR *file); -void setid( -#if defined(M_PROTO) - M_WCHAR *id, +void setid(M_WCHAR *id, LOGICAL where, LOGICAL csensitive, LOGICAL inchapter, char *chapter, M_WCHAR *xrffile, int xrfline, - LOGICAL xrefable -#endif - ) ; + LOGICAL xrefable ); -void setopt( -#if defined(M_PROTO) - char *string, LOGICAL filelenonly -#endif - ) ; +void setopt(char *string, LOGICAL filelenonly); -LOGICAL setvalopt( -#if defined(M_PROTO) - int thisopt, char *string, LOGICAL filelenonly -#endif - ) ; +LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly); -void shchar( -#if defined(M_PROTO) - M_WCHAR textchar, +void shchar(M_WCHAR textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void mb_shchar( -#if defined(M_PROTO) - char textchar, +void mb_shchar(char textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void shstring( -#if defined(M_PROTO) - M_WCHAR *addstring, +void shstring(M_WCHAR *addstring, int *len, int max, M_WCHAR *storestring, char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void mb_shstring( -#if defined(M_PROTO) - char *addstring, +void mb_shstring(char *addstring, int *len, int max, M_WCHAR *storestring, char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void starthelpnode( -#if defined(M_PROTO) - M_WCHAR *ssi, +void starthelpnode(M_WCHAR *ssi, M_WCHAR *id, - int level -#endif - ) ; + int level); -void mb_starthelpnode( -#if defined(M_PROTO) - char *ssi, +void mb_starthelpnode(char *ssi, char *id, - int level -#endif - ) ; + int level); -void StartLabList( -#if defined(M_PROTO) - M_WCHAR *spacing, - M_WCHAR *longlabel -#endif - ) ; +void StartLabList(M_WCHAR *spacing, + M_WCHAR *longlabel); -void StartList( -#if defined(M_PROTO) - M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont -#endif - ) ; +void StartList(M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont); -void EndList( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void EndList(M_NOPAR); -void strcode( -#if defined(M_PROTO) - M_WCHAR *string, FILE *outfile -#endif - ) ; +void strcode(M_WCHAR *string, FILE *outfile); -void mb_strcode( -#if defined(M_PROTO) - char *string, FILE *outfile -#endif - ) ; +void mb_strcode(char *string, FILE *outfile); -char *strstr( -#if defined(M_PROTO) - const char *s1, const char *s2 -#endif - ) ; +char *strstr(const char *s1, const char *s2); -void svhdstring( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void svhdstring(M_WCHAR *string); -void svtcstring( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void svtcstring(M_WCHAR *string); -void termchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void termchar(M_WCHAR textchar); -void termpi( -#if defined(M_PROTO) - int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname -#endif - ) ; +void termpi(int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname); -void texinit( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void texinit(M_NOPAR); -int vextextsize( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vextextsize(const M_WCHAR *keyword); -int vgloss( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vgloss(const M_WCHAR *keyword); -int vcenter( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vcenter(const M_WCHAR *keyword); -int vnumber( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vnumber(const M_WCHAR *keyword); -LOGICAL vstack( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +LOGICAL vstack(const M_WCHAR *keyword); -int vordertype( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vordertype(const M_WCHAR *keyword); -int vlonglabel( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vlonglabel(const M_WCHAR *keyword); -int vspacing( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vspacing(const M_WCHAR *keyword); -int vtype( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vtype(const M_WCHAR *keyword); -void xrefexpand( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void xrefexpand(M_WCHAR *id); -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -char *GetDefaultHeaderString( -#if defined(M_PROTO) - char *elementName, +char *GetDefaultHeaderString(char *elementName, unsigned char desiredType, - char *defaultString -#endif - ) ; + char *defaultString); -void SetDefaultLocale( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void SetDefaultLocale(M_NOPAR); -char *MakeMByteString( -#if defined(M_PROTO) - const M_WCHAR *from -#endif - ); +char *MakeMByteString(const M_WCHAR *from); -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); -void paragraph( -#if defined(M_PROTO) - M_WCHAR *indent, +void paragraph(M_WCHAR *indent, M_WCHAR *id, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink, M_WCHAR *glinktype, - M_WCHAR *gdescription -#endif - ); + M_WCHAR *gdescription); -void figure( -#if defined(M_PROTO) - M_WCHAR *number, +void figure( M_WCHAR *number, M_WCHAR *tonumber, M_WCHAR *id, M_WCHAR *file, @@ -477,180 +211,70 @@ void figure( M_WCHAR *cappos, M_WCHAR *ghyperlink, M_WCHAR *glinktype, - M_WCHAR *gdescription -#endif - ); + M_WCHAR *gdescription); -void endterm( -#if defined(M_PROTO) - M_WCHAR *base, +void endterm( M_WCHAR *base, M_WCHAR *gloss, - char *linktype -#endif - ); + char *linktype); -M_WCHAR wc_toupper( -#if defined(M_PROTO) - M_WCHAR wc -#endif - ); +M_WCHAR wc_toupper( M_WCHAR wc); -M_WCHAR *wc_stringtoupper( -#if defined(M_PROTO) - M_WCHAR *wcp -#endif - ); +M_WCHAR *wc_stringtoupper( M_WCHAR *wcp); -int NextId( -#if defined(M_PROTO) - M_NOPAR -#endif -); +int NextId(M_NOPAR); -char *GetLanguage( -#if defined(M_PROTO) - M_NOPAR -#endif -); +char *GetLanguage(M_NOPAR); -char *GetCharset( -#if defined(M_PROTO) - M_NOPAR -#endif -); +char *GetCharset(M_NOPAR); -void HandleLink( -#if defined(M_PROTO) - M_WCHAR *hyperlink, +void HandleLink( M_WCHAR *hyperlink, M_WCHAR *type, - M_WCHAR *description -#endif - ); + M_WCHAR *description); -char *mb_realloc( -#if defined(M_PROTO) - char *ptr, long size -#endif - ); +char *mb_realloc( char *ptr, long size); -char *mb_malloc( -#if defined(M_PROTO) - long size -#endif - ); +char *mb_malloc( long size); -void mb_free( -#if defined(M_PROTO) - char **pptr -#endif - ); +void mb_free( char **pptr); -void Add2ToRowVec( -#if defined(M_PROTO) - int *length, char **rowvec, char *id1, char *id2 -#endif - ); +void Add2ToRowVec( int *length, char **rowvec, char *id1, char *id2); -void StartEx( -#if defined(M_PROTO) -M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize -#endif - ); +void StartEx(M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize); -void EndEx( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void EndEx(M_NOPAR); -void StartNCW( -#if defined(M_PROTO) - char *which -#endif - ); +void StartNCW(char *which); -void StartBlock( -#if defined(M_PROTO) - char *pclass, char *ssi, char *id -#endif - ); +void StartBlock(char *pclass, char *ssi, char *id); -void AddToSNB( -#if defined(M_PROTO) - char *id, char *iconName -#endif - ); +void AddToSNB(char *id, char *iconName); -void StartNCWtext( -#if defined(M_PROTO) - char *which, char *iconFile, char *headingString -#endif - ); +void StartNCWtext(char *which, char *iconFile, char *headingString); -void IncludeToss( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void IncludeToss(M_NOPAR); -M_WCHAR *CycleEnt( -#if defined(M_PROTO) - LOGICAL init, +M_WCHAR *CycleEnt( LOGICAL init, unsigned char *type, M_WCHAR ***content, - unsigned char *wheredef -#endif - ); + unsigned char *wheredef); -void ModifyEntities( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void ModifyEntities(M_NOPAR); -void PushForm( -#if defined(M_PROTO) - char *class, +void PushForm(char *class, char *ssi, - char *id -#endif - ) ; + char *id); -void PushForm2( -#if defined(M_PROTO) - char *class, +void PushForm2(char *class, char *ssi, char *id1, - char *id2 -#endif - ) ; + char *id2); -void PopForm( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void PopForm(M_NOPAR); -void PopForm2( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void PopForm2(M_NOPAR); -void PopFormMaybe( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void PopFormMaybe(M_NOPAR); -void EmitSavedAnchors( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void EmitSavedAnchors(M_NOPAR); -void CloseVirpage( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void CloseVirpage(M_NOPAR); diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.c b/cde/programs/dthelp/parser/canon1/helptag/help.c index effe233f3..96e63bd51 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/help.c +++ b/cde/programs/dthelp/parser/canon1/helptag/help.c @@ -349,13 +349,7 @@ m_free(string, "GetDefaultHeaderString return"); /* construct a qualified file name */ -#if defined(M_PROTO) static int mb_getqualified(char *qualname, char *unqualname) -#else -static int mb_getqualified(qualname, unqualname) -char *qualname; -char *unqualname; -#endif { #if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) @@ -689,12 +683,7 @@ if (!ghyperlink && (glinktype || gdescription)) } /* Process an item in a list */ -#if defined(M_PROTO) void Item(M_WCHAR *id) -#else -void Item(id) -M_WCHAR *id; -#endif { char orderString[32]; static char *ROMAN0[] = @@ -998,16 +987,9 @@ return(NULL); /* Start a new helpnode */ -#if defined(M_PROTO) void starthelpnode(M_WCHAR *ssi, M_WCHAR *id, int level) -#else -void starthelpnode(ssi, id, level) -M_WCHAR *ssi; -M_WCHAR *id; -int level; -#endif { int i; char *mbyte, *mb_ssi; @@ -1061,16 +1043,9 @@ snbstart = ftell(outfile); } /* End starthelpnode(id) */ -#if defined(M_PROTO) void mb_starthelpnode(char *ssi, char *id, int level) -#else -void mb_starthelpnode(ssi, id, level) -char *ssi; -char *id; -int level; -#endif { M_WCHAR *wc_ssi, *wc_id; @@ -1131,15 +1106,10 @@ if (list <= MAXLISTLEV) /* Start a list */ -#if defined(M_PROTO) void StartList(M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont) -#else -void StartList(type, order, spacing, cont) -M_WCHAR *type, *order, *spacing, *cont; -#endif { LIST *nextlist; CONTCHAIN *chain; @@ -1420,17 +1390,10 @@ postpreamble = ftell(outfile); the string returned must be m_free'd. */ char * -#if defined(M_PROTO) GetDefaultHeaderString( char *elementName, unsigned char desiredType, char *defaultString ) -#else -GetDefaultHeaderString(elementName, desiredType, defaultString) -char *elementName; -unsigned char desiredType; -char *defaultString; -#endif { unsigned char type,wheredef; M_WCHAR *content; @@ -1497,13 +1460,7 @@ return ""; * standard versions. */ static void -#if defined(M_PROTO) SetStdLocale(char *pLang, char *pCharset) -#else -SetStdLocale(pLang, pCharset) -char *pLang; -char *pCharset; -#endif { static const char *cString = "C"; static const char *isoString = "ISO-8859-1"; @@ -1632,11 +1589,7 @@ _DtLcxCloseDb(&myDb); * fashion. */ static char * -#if defined(M_PROTO) GetStdLocale() -#else -GetStdLocale() -#endif { static char buffer[256]; static char *cString = "C"; @@ -1795,7 +1748,6 @@ if (charset && (charset != (dotPtr+1))) } -#if defined(M_PROTO) void paragraph(M_WCHAR *indent, M_WCHAR *id, M_WCHAR *gentity, @@ -1803,22 +1755,6 @@ void paragraph(M_WCHAR *indent, M_WCHAR *ghyperlink, M_WCHAR *glinktype, M_WCHAR *gdescription) -#else -void paragraph(indent, - id, - gentity, - gposition, - ghyperlink, - glinktype, - gdescription) -M_WCHAR *indent; -M_WCHAR *id; -M_WCHAR *gentity; -M_WCHAR *gposition; -M_WCHAR *ghyperlink; -M_WCHAR *glinktype; -M_WCHAR *gdescription; -#endif { char *firstString, *indentString; @@ -1862,7 +1798,6 @@ handle_link_and_graphic(m_parent(0), } -#if defined(M_PROTO) void figure( M_WCHAR *number, M_WCHAR *tonumber, @@ -1873,28 +1808,6 @@ void figure( M_WCHAR *ghyperlink, M_WCHAR *glinktype, M_WCHAR *gdescription) -#else -void figure( - number, - tonumber, - id, - file, - figpos, - cappos, - ghyperlink, - glinktype, - gdescription) -M_WCHAR *number; -M_WCHAR *tonumber; -M_WCHAR *id; -M_WCHAR *file; -M_WCHAR *figpos; -M_WCHAR *cappos; -M_WCHAR *border; -M_WCHAR *ghyperlink; -M_WCHAR *glinktype; -M_WCHAR *gdescription; -#endif { char snb_id[32]; unsigned char etype,wheredef; @@ -2126,14 +2039,7 @@ if (ftonumber) m_free(string, "default header string return"); } -#if defined(M_PROTO) void endterm(M_WCHAR *base, M_WCHAR *gloss, char *linktype) -#else -void endterm( base, gloss, linktype) -M_WCHAR *base; -M_WCHAR *gloss; -char *linktype; -#endif { M_WCHAR *p; M_WCHAR dterm[MAXTERM+1]; @@ -2253,12 +2159,7 @@ if (vgloss(gloss) == GLOSS) if (echo) mb_echohead("++"); } -#if defined(M_PROTO) M_WCHAR wc_toupper(M_WCHAR wc) -#else -M_WCHAR wc_toupper(wc) -M_WCHAR wc; -#endif { if ((wc >= 0) && (wc <= 255)) { @@ -2267,12 +2168,7 @@ if ((wc >= 0) && (wc <= 255)) return wc; } -#if defined(M_PROTO) M_WCHAR *wc_stringtoupper(M_WCHAR *wcp) -#else -M_WCHAR *wc_stringtoupper(wcp) -M_WCHAR *wcp; -#endif { M_WCHAR *newstring, *nsp; @@ -2322,14 +2218,7 @@ return pCharset; } -#if defined(M_PROTO) void HandleLink(M_WCHAR *hyperlink, M_WCHAR *type, M_WCHAR *description) -#else -void HandleLink(hyperlink, type, description) -M_WCHAR *hyperlink; -M_WCHAR *type; -M_WCHAR *description; -#endif { char *mb_hyperlink, mb_undefined[64]; char buffer[BIGBUF]; @@ -2485,13 +2374,7 @@ mb_strcode(">", outfile); } -#if defined(M_PROTO) char *mb_realloc(char *ptr, long size) -#else -char *mb_realloc(ptr, size) -char *ptr; -long size; -#endif { void *vptr; size_t ssize; @@ -2511,12 +2394,7 @@ return (char *) vptr; } -#if defined(M_PROTO) char *mb_malloc(long size) -#else -char *mb_malloc(size) -long size; -#endif { char *cptr; size_t ssize; @@ -2534,12 +2412,7 @@ return cptr; } -#if defined(M_PROTO) void mb_free(char **pptr) -#else -void *mb_free(pptr) -char **pptr; -#endif { #if DEBUG_MB_MALLOC @@ -2551,14 +2424,7 @@ free((void *) *pptr); *pptr = NULL; } -#if defined(M_PROTO) static void AddToRowVec(int *length, char **rowvec, char *id) -#else -static void AddToRowVec(length, rowvec, id) -int *length; -char **rowvec; -char *id; -#endif { char tempRowVec[BIGBUF]; int rowVecLen; @@ -2571,14 +2437,7 @@ strcpy(*rowvec + *length - 1, tempRowVec); } -#if defined(M_PROTO) void Add2ToRowVec(int *length, char **rowvec, char *id1, char *id2) -#else -void Add2ToRowVec(length, rowvec, id1, id2) -int *length; -char **rowvec; -char *id1, *id2; -#endif { char tempRowVec[BIGBUF]; int rowVecLen; @@ -2591,14 +2450,7 @@ strcpy(*rowvec + *length - 1, tempRowVec); } -#if defined(M_PROTO) void StartEx(M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize) -#else -void StartEx(*notes, *lines, *textsize) -M_WCHAR *notes; -M_WCHAR *lines; -M_WCHAR *textsize; -#endif { exTextSize = vextextsize(textsize); stackex = vstack(notes); @@ -2614,11 +2466,7 @@ svexlen = 1; } -#if defined(M_PROTO) -void EndEx() -#else -void EndEx() -#endif +void EndEx(void) { char *annotation; int annotLen; @@ -2683,24 +2531,14 @@ if (saveexseg) } -#if defined(M_PROTO) void StartNCW(char *which) -#else -void StartNCW(which) -char *which; -#endif { notehead = FALSE; PushForm(NULL, which, NULL); } -#if defined(M_PROTO) void StartBlock(char *pclass, char *ssi, char *id) -#else -void StartBlock(pclass, ssi, id) -char *pclass, *ssi, *id; -#endif { char localId[32]; char *realId; @@ -2739,14 +2577,7 @@ firstPInBlock = TRUE; } -#if defined(M_PROTO) void StartNCWtext(char *which, char *iconFile, char *headingString) -#else -void StartNCWtext(which, iconFile, headingString) -char *which; -char *iconFile; -char *headingString; -#endif { char *icon, *heading; @@ -2777,13 +2608,7 @@ m_free(icon, "icon name"); } -#if defined(M_PROTO) void AddToSNB(char *id, char *xid) -#else -void AddToSNB(id, xid) -char *id; -char *xid; -#endif { char tmpsnb[BIGBUF]; int snblen; @@ -2807,11 +2632,7 @@ else } -#if defined(M_PROTO) void IncludeToss() -#else -void IncludeToss() -#endif { char pathbuf[BIGBUF]; char *try = pathbuf; @@ -2896,18 +2717,10 @@ mb_free(&mb_inputname); /* Cyclent.c contains procedure m_cyclent(), callable by interface designers, to cycle through all defined entities, returning information about them */ -#if defined(M_PROTO) M_WCHAR *CycleEnt(LOGICAL init, unsigned char *type, M_WCHAR ***content, unsigned char *wheredef) -#else -M_WCHAR *m_cyclent(init, type, content, wheredef) - LOGICAL init ; - unsigned char *type ; - M_WCHAR ***content ; - unsigned char *wheredef ; -#endif { static M_TRIE *current ; static M_TRIE *ancestor[M_NAMELEN + 1] ; @@ -2990,14 +2803,7 @@ while (name = CycleEnt(FALSE, &type, &content, &wheredef)); } -#if defined(M_PROTO) void PushForm(char *class, char *ssi, char *id) -#else -void PushForm(class, ssi, id) - char *class; - char *ssi; - char *id; -#endif { char localId[SDLNAMESIZ+10]; char *realId; @@ -3061,15 +2867,7 @@ needFData = TRUE; } -#if defined(M_PROTO) void PushForm2(char *class, char *ssi, char *id1, char *id2) -#else -void PushForm2(class, ssi, id1, id2) - char *class; - char *ssi; - char *id1; - char *id2; -#endif { char id[32]; int stackSize; diff --git a/cde/programs/dthelp/parser/canon1/helptag/option.c b/cde/programs/dthelp/parser/canon1/helptag/option.c index e3ca706be..006384284 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/option.c +++ b/cde/programs/dthelp/parser/canon1/helptag/option.c @@ -37,12 +37,7 @@ #define TAGDOTOPT "helptag.opt" #define DOTOPT ".opt" -#if defined(M_PROTO) void options(LOGICAL filelenonly) -#else -void options(filelenonly) - LOGICAL filelenonly; -#endif { int i; FILE *optfile; @@ -149,13 +144,7 @@ optval = M_NULLVAL; /* Set a single option */ /* Workonly parameter described with function options()*/ -#if defined(M_PROTO) void setopt(char *string, LOGICAL filelenonly) -#else -void setopt(string, filelenonly) -char *string; -LOGICAL filelenonly; -#endif { char *p; int thisopt; @@ -280,14 +269,7 @@ else switch(thisopt + 1) } /* Process a value for a command line option */ -#if defined(M_PROTO) LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly) -#else -LOGICAL setvalopt(thisopt, string, filelenonly) -int thisopt; -char *string; -LOGICAL filelenonly; -#endif { char *p; int i; diff --git a/cde/programs/dthelp/parser/canon1/helptag/out.c b/cde/programs/dthelp/parser/canon1/helptag/out.c index 01c6e2985..29610ae61 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/out.c +++ b/cde/programs/dthelp/parser/canon1/helptag/out.c @@ -121,12 +121,7 @@ if (savesnb) /* Process a character in an environment where spaces must be escaped */ -#if defined(M_PROTO) void esoutchar(M_WCHAR textchar) -#else -void esoutchar(textchar) -M_WCHAR textchar; -#endif { static M_WCHAR wsp = 0; @@ -147,12 +142,7 @@ outchar(textchar, outfile); } /* Process a character in a verbatim example */ -#if defined(M_PROTO) void vexoutchar(M_WCHAR textchar) -#else -void vexoutchar(textchar) -M_WCHAR textchar; -#endif { static M_WCHAR wla = 0; char *holdSaveExSeg; @@ -177,12 +167,7 @@ else } /* Process a character in an example */ -#if defined(M_PROTO) void exoutchar(M_WCHAR textchar) -#else -void exoutchar(textchar) -M_WCHAR textchar; -#endif { char exbuff[32]; /* arbitrarily large */ int bufflen; @@ -212,12 +197,7 @@ savex = holdSavex; } /* Process a character in an image paragraph */ -#if defined(M_PROTO) void imoutchar(M_WCHAR textchar) -#else -void imoutchar(textchar) -M_WCHAR textchar; -#endif { char imbuff[32]; /* arbitrarily large */ int bufflen; @@ -240,12 +220,7 @@ else } /* Write a character to be passed to the index file */ -#if defined(M_PROTO) void indexchar(M_WCHAR textchar) -#else -void indexchar(textchar) -M_WCHAR textchar; -#endif { if (idxsavlen + 4 > (sizeof(idxsav) / sizeof(M_WCHAR))) { @@ -257,13 +232,7 @@ idxsav[idxsavlen++] = textchar; /* Processes a data character */ -#if defined(M_PROTO) void outchar(M_WCHAR textchar, FILE *outfile) -#else -void outchar(textchar, outfile) -M_WCHAR textchar; -FILE *outfile; -#endif { M_WCHAR buffer[2]; static M_WCHAR wnl = 0; @@ -333,13 +302,7 @@ if (echo) /* Really output a character */ -#if defined(M_PROTO) void realoutchar(M_WCHAR textchar, FILE *outfile) -#else -void realoutchar(textchar, outfile) -M_WCHAR textchar; -FILE *outfile; -#endif { char mb_textchar[32]; /* arbitrarily large */ int length, i; @@ -379,22 +342,7 @@ if (savtc) /* Save a character in the array used to store table of contents entries when processing a head */ -#if defined(M_PROTO) void shchar(M_WCHAR textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, LOGICAL *errflg) -#else -void shchar(textchar, len, max, string, proc, msg, errflg) -M_WCHAR textchar; -int *len; -int max; -M_WCHAR *string; -void (*proc)( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ); -char *msg; -LOGICAL *errflg; -#endif { char mb_textchar[32]; /* arbitrarily large */ unsigned char index; @@ -427,27 +375,12 @@ else } -#if defined(M_PROTO) void mb_shchar(char textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, LOGICAL *errflg) -#else -void mb_shchar(textchar, len, max, string, proc, msg, errflg) -char textchar; -int *len; -int max; -M_WCHAR *string; -void (*proc)( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ); -char *msg; -LOGICAL *errflg; -#endif { M_WCHAR wc_textchar; @@ -611,12 +544,7 @@ svtclen += length; } /* Process a character in a term */ -#if defined(M_PROTO) void termchar(M_WCHAR textchar) -#else -void termchar(textchar) -M_WCHAR textchar; -#endif { int length; char mb_textchar[32]; /* arbitrarily large */ diff --git a/cde/programs/dthelp/parser/canon1/helptag/xref.c b/cde/programs/dthelp/parser/canon1/helptag/xref.c index 8bae6a9d2..28fd4ffa0 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/xref.c +++ b/cde/programs/dthelp/parser/canon1/helptag/xref.c @@ -334,20 +334,8 @@ while (TRUE) /* Save a cross-reference ID and associated expansion */ -#if defined(M_PROTO) void setid(M_WCHAR *id, LOGICAL where, LOGICAL csensitive, LOGICAL inchapter, char *chapter, M_WCHAR *xrffile, int xrfline, LOGICAL xrefable) -#else -void setid(id, where, csensitive, inchapter, chapter, xrffile, xrfline, xrefable) -M_WCHAR *id; -LOGICAL where; -LOGICAL csensitive; -LOGICAL inchapter; -char *chapter; -M_WCHAR *xrffile; -int xrfline; -LOGICAL xrefable; -#endif { struct xref *old; struct xref *xref; diff --git a/cde/programs/dthelp/parser/canon1/parser/actutil.c b/cde/programs/dthelp/parser/canon1/parser/actutil.c index 4c228fb3f..385b4b613 100644 --- a/cde/programs/dthelp/parser/canon1/parser/actutil.c +++ b/cde/programs/dthelp/parser/canon1/parser/actutil.c @@ -107,17 +107,7 @@ int m_findact(elt, array) } /* Recursive procedure called by findact() to search m_action */ -#if defined(M_PROTO) void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild) -#else -void m_findchain(stackptr, start, chainin, chainout, index, wild) - M_PARSE *stackptr; - int start; - int chainin; - int *chainout; - int *index; - LOGICAL wild; -#endif { int node; M_PARSE *stackp; @@ -241,14 +231,7 @@ void m_strtaction(m_elt) } /* Output a start-string or end-string */ -#if defined(M_PROTO) void m_textout(char *format, LOGICAL start, LOGICAL end) -#else -void m_textout(format, start, end) - char *format; - LOGICAL start; - LOGICAL end; -#endif { M_WCHAR name[M_NAMELEN + 1]; int i, par; diff --git a/cde/programs/dthelp/parser/canon1/parser/cyclent.c b/cde/programs/dthelp/parser/canon1/parser/cyclent.c index 3a4cdeb77..974fe4f9d 100644 --- a/cde/programs/dthelp/parser/canon1/parser/cyclent.c +++ b/cde/programs/dthelp/parser/canon1/parser/cyclent.c @@ -36,15 +36,7 @@ #include "parser.h" #include "entext.h" -#if defined(M_PROTO) M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, unsigned char *wheredef) -#else -M_WCHAR *m_cyclent(init, type, content, wheredef) - LOGICAL init ; - unsigned char *type ; - M_WCHAR **content ; - unsigned char *wheredef ; -#endif { static M_TRIE *current ; static M_TRIE *ancestor[M_NAMELEN + 1] ; diff --git a/cde/programs/dthelp/parser/canon1/parser/entity.c b/cde/programs/dthelp/parser/canon1/parser/entity.c index 038b3b28a..6ace9b34b 100644 --- a/cde/programs/dthelp/parser/canon1/parser/entity.c +++ b/cde/programs/dthelp/parser/canon1/parser/entity.c @@ -43,13 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "entext.h" /* Process the name in a usemap delaration */ -#if defined(M_PROTO) void m_ckmap(M_WCHAR *name, LOGICAL useoradd) -#else -void m_ckmap(name, useoradd) - M_WCHAR *name ; - LOGICAL useoradd ; -#endif { int mapid ; diff --git a/cde/programs/dthelp/parser/canon1/parser/error.c b/cde/programs/dthelp/parser/canon1/parser/error.c index 4789f855e..c1d02d1d4 100644 --- a/cde/programs/dthelp/parser/canon1/parser/error.c +++ b/cde/programs/dthelp/parser/canon1/parser/error.c @@ -52,15 +52,7 @@ void m_error(text) } /* Issue error message (one argument) */ -#if defined(M_PROTO) -void m_err1( - const char *text, - const M_WCHAR *arg) -#else -void m_err1(text, arg) - char *text; - M_WCHAR *arg; -#endif +void m_err1(const char *text, const M_WCHAR *arg) { char *buffer, *mb_arg; @@ -77,15 +69,9 @@ m_esuffix(); } -#if defined(M_PROTO) void m_mberr1( const char *text, const char *arg) -#else -void m_err1(text, arg) - char *text; - char *arg; -#endif { M_WCHAR *wc_arg; @@ -95,17 +81,10 @@ void m_err1(text, arg) } /* Issue error message (two arguments) */ -#if defined(M_PROTO) void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2) -#else -void m_err2(text, arg1, arg2) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; -#endif { char *buffer; char *mb_arg1,*mb_arg2; @@ -126,19 +105,11 @@ void m_err2(text, arg1, arg2) } /* Issue error message (three arguments) */ -#if defined(M_PROTO) void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void m_err3(text, arg1, arg2, arg3) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3; @@ -164,21 +135,12 @@ void m_err3(text, arg1, arg2, arg3) } /* Issue error message (four arguments) */ -#if defined(M_PROTO) void m_err4( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4) -#else -void m_err4(text, arg1, arg2, arg3, arg4) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; -#endif { char *buffer; char *mb_arg1, *mb_arg2,*mb_arg3,*mb_arg4; @@ -207,7 +169,6 @@ void m_err4(text, arg1, arg2, arg3, arg4) } /* Issue error message (five arguments) */ -#if defined(M_PROTO) void m_err5( char *text, M_WCHAR *arg1, @@ -215,15 +176,6 @@ void m_err5( M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5) -#else -void m_err5(text, arg1, arg2, arg3, arg4, arg5) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5; @@ -261,7 +213,6 @@ void m_err5(text, arg1, arg2, arg3, arg4, arg5) } /* Issue error message (six arguments) */ -#if defined(M_PROTO) void m_err6( char *text, M_WCHAR *arg1, @@ -270,16 +221,6 @@ void m_err6( M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6) -#else -void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; - M_WCHAR *arg6; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6; @@ -321,7 +262,6 @@ void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6) } /* Issue error message (seven arguments) */ -#if defined(M_PROTO) void m_err7( char *text, M_WCHAR *arg1, @@ -331,17 +271,6 @@ void m_err7( M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7) -#else -void m_err7(text, arg1, arg2, arg3, arg4, arg5, arg6, arg7) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; - M_WCHAR *arg6; - M_WCHAR *arg7; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6, *mb_arg7; diff --git a/cde/programs/dthelp/parser/canon1/parser/findpar.c b/cde/programs/dthelp/parser/canon1/parser/findpar.c index ade073c41..d74048fe5 100644 --- a/cde/programs/dthelp/parser/canon1/parser/findpar.c +++ b/cde/programs/dthelp/parser/canon1/parser/findpar.c @@ -41,14 +41,7 @@ Returns 0 if elt is not a valid element name, if param is specified but is not a valid parameter name, or if param is NULL and value is not a valid value of any of elt's parameters. */ -#if defined(M_PROTO) int m_findpar( const char *elt , const char *param , const M_WCHAR *value ) -#else -int m_findpar(elt, param, value) -char *elt ; -char *param ; -M_WCHAR *value ; -#endif /* M_PROTO */ { M_ELEMENT eltid ; int par ; diff --git a/cde/programs/dthelp/parser/canon1/parser/param.c b/cde/programs/dthelp/parser/canon1/parser/param.c index 889c2cad1..1aa606098 100644 --- a/cde/programs/dthelp/parser/canon1/parser/param.c +++ b/cde/programs/dthelp/parser/canon1/parser/param.c @@ -290,13 +290,7 @@ void m_stkparams(M_NOPAR) } /* Update the default of a parameter whose default is #CURRENT */ -#if defined(M_PROTO) void m_updatedefault(const int par , const M_WCHAR *string ) -#else -void m_updatedefault(par, string) - int par ; - M_WCHAR *string ; -#endif /* M_PROTO */ { if (m_parameter[par - 1].deftype != M_CURRENT && m_parameter[par - 1].deftype != M_CHANGEDCUR) return ; diff --git a/cde/programs/dthelp/parser/canon1/parser/parser.h b/cde/programs/dthelp/parser/canon1/parser/parser.h index 7fb216688..663ec17bb 100644 --- a/cde/programs/dthelp/parser/canon1/parser/parser.h +++ b/cde/programs/dthelp/parser/canon1/parser/parser.h @@ -347,8 +347,6 @@ M_PAREXTERN int m_wsused ; /* Temporary pointers to parameter values. Used while scanning start tag before element is placed on parse stack.*/ M_PAREXTERN -#if defined M_PROTO -#endif M_WCHAR *m_poccur[ #if defined(M_PARDEF) M_MAXPAR ? M_MAXPAR : 1 diff --git a/cde/programs/dthelp/parser/canon1/parser/parvalok.c b/cde/programs/dthelp/parser/canon1/parser/parvalok.c index 3a6d28a71..776b7ef8e 100644 --- a/cde/programs/dthelp/parser/canon1/parser/parvalok.c +++ b/cde/programs/dthelp/parser/canon1/parser/parvalok.c @@ -34,14 +34,7 @@ /* Function callable by interface designers. Returns TRUE if specified value is a legal value for the indicated parameter of the given element, FALSE otherwise. */ -#if defined(M_PROTO) LOGICAL m_parvalok( M_WCHAR *elt , M_WCHAR *param , const M_WCHAR *value ) -#else -LOGICAL m_parvalok(elt, param, value) - M_WCHAR *elt ; - M_WCHAR *param ; - M_WCHAR *value ; -#endif /* M_PROTO */ { M_ELEMENT eltid ; int par ; diff --git a/cde/programs/dthelp/parser/canon1/parser/proto.h b/cde/programs/dthelp/parser/canon1/parser/proto.h index c16614afa..2ca9badc8 100644 --- a/cde/programs/dthelp/parser/canon1/parser/proto.h +++ b/cde/programs/dthelp/parser/canon1/parser/proto.h @@ -21,827 +21,283 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 09:42:21 rswiston $ */ -int m_actgetc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_adjuststate( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; - -void m_attval( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL m_attvonly( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -int m_checkstart( -#if defined(M_PROTO) - M_ELEMENT val -#endif - ) ; - -LOGICAL m_ckend( -#if defined(M_PROTO) - M_ELEMENT val, LOGICAL neednet -#endif - ) ; - -void m_ckmap( -#if defined(M_PROTO) - M_WCHAR *name, LOGICAL useoradd -#endif - ) ; - -void m_closent( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -void m_codeent( -#if defined(M_PROTO) - int m_ent -#endif - ) ; - -M_PARSE *m_copystackelt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -M_WCHAR *m_cyclent( -#if defined(M_PROTO) - LOGICAL init, unsigned char *type, M_WCHAR **content, - unsigned char *wheredef -#endif - ) ; - -void m_dispcurelt( -#if defined(M_PROTO) - M_WCHAR *file, int line -#endif - ) ; - -void m_done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_dumpline( -#if defined(M_PROTO) - M_WCHAR *file, int line -#endif - ) ; - -void m_eduptype( -#if defined(M_PROTO) - int type -#endif - ) ; - -M_ELEMENT m_eltname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_endaction( -#if defined(M_PROTO) - M_ELEMENT m_elt -#endif - ) ; - -void m_endcase( -#if defined(M_PROTO) - int m_action -#endif - ) ; - -void m_endtag( -#if defined(M_PROTO) - M_ELEMENT c -#endif - ) ; - -void m_entexpand( -#if defined(M_PROTO) - M_ENTITY *openent -#endif - ) ; - -void m_eprefix( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; - -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; - -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; - -void m_err4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; - -void m_err5( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5 -#endif - ) ; - -void m_err6( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6 -#endif - ) ; - -void m_err7( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7 -#endif - ) ; - -void m_errline( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void m_esuffix( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; - -void m_etcomplete( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_excluded( -#if defined(M_PROTO) - M_ELEMENT elt -#endif - ) ; - -void m_expecting( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_expexpand( -#if defined(M_PROTO) - LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data -#endif - ) ; - -void m_expline( -#if defined(M_PROTO) - LOGICAL *expstart, LOGICAL *data, M_ELEMENT label -#endif - ) ; - -void m_exptend( -#if defined(M_PROTO) - LOGICAL *expstart, M_PARSE *stackptr -#endif - ) ; - -int m_findact( -#if defined(M_PROTO) - M_ELEMENT elt, int *array -#endif - ) ; - -void m_findatt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_findchain( -#if defined(M_PROTO) - M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, - LOGICAL wild -#endif - ) ; - -int m_findpar( -#if defined(M_PROTO) - const char *elt, const char *param, const M_WCHAR *value -#endif - ) ; - -M_ELEMENT m_findunique( -#if defined(M_PROTO) - M_STATE from, int *newleft -#endif - ) ; - -void m_frcend( -#if defined(M_PROTO) - M_ELEMENT val -#endif - ) ; - -void m_frcstart( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; - -void m_freeFSA( -#if defined(M_PROTO) - M_PARSE *stackelt -#endif - ) ; - -void m_freemin( -#if defined(M_PROTO) - M_MIN *min - , char *msg -#endif - ) ; - -void m_freeparam( -#if defined(M_PROTO) - M_PARSE *stackelt -#endif - ) ; - -LOGICAL m_gendelim( -#if defined(M_PROTO) - int srlen, int context -#endif - ) ; - -int m_getachar( -#if defined(M_PROTO) - M_HOLDTYPE *dchar -#endif - ) ; - -int m_getc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -int mb_getwc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -void *m_getdata( -#if defined(M_PROTO) - int n, LOGICAL *flag -#endif - ) ; - -void m_getline( -#if defined(M_PROTO) - M_WCHAR **file, int *line -#endif - ) ; - -void m_getname( -#if defined(M_PROTO) - M_WCHAR first -#endif - ) ; - -void m_getsignon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_gettoken( -#if defined(M_PROTO) - int *c, M_HOLDTYPE *dchar, int context -#endif - ) ; - -void m_globes( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_globss( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_holdproc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_inctest( -#if defined(M_PROTO) - int *count, int limit, char *message -#endif - ) ; - -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_lastchars( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_level( -#if defined(M_PROTO) - M_WCHAR *elt -#endif - ) ; - -int m_mblevel( -#if defined(M_PROTO) - char *elt -#endif - ) ; - -void m_litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; - -void m_longent( -#if defined(M_PROTO) - int context -#endif - ) ; - -LOGICAL m_lookent( -#if defined(M_PROTO) - M_WCHAR *name, unsigned char *type, M_WCHAR **content, - unsigned char *wheredef -#endif - ) ; - -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; - -void m_missingtagc( -#if defined(M_PROTO) - int c, M_HOLDTYPE dchar, LOGICAL start -#endif - ) ; - -LOGICAL m_nextand( -#if defined(M_PROTO) - M_OPENFSA *thisfsa, M_ELEMENT label -#endif - ) ; - -void m_nextdelimchar( -#if defined(M_PROTO) - int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, - unsigned char type -#endif - ) ; - -void m_ntrent( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -void m_nullendtag( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_omitend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_omitstart( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; - -void *m_openent( -#if defined(M_PROTO) - M_WCHAR *entcontent -#endif - ) ; - -void *m_openfirst( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_optstring( -#if defined(M_PROTO) - char *p -#endif - ) ; - -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, M_WCHAR *name -#endif - ) ; - -int m_parcount( -#if defined(M_PROTO) - M_WCHAR *elt -#endif - ) ; - -M_WCHAR *m_pardefault( -#if defined(M_PROTO) - M_WCHAR *elt, M_WCHAR *param, unsigned char *type -#endif - ) ; - -M_WCHAR *m_parent( -#if defined(M_PROTO) - int n -#endif - ) ; - -M_WCHAR *m_parname( -#if defined(M_PROTO) - M_WCHAR *elt, int n -#endif - ) ; - -M_WCHAR *m_mbparname( -#if defined(M_PROTO) - char *elt, int n -#endif - ) ; - -const M_WCHAR *m_partype( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; - -void m_parupper( -#if defined(M_PROTO) - int par, M_WCHAR *string -#endif - ) ; - -LOGICAL m_parvalok( -#if defined(M_PROTO) - M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value -#endif - ) ; - -void m_piaction( -#if defined(M_PROTO) - M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype -#endif - ) ; - -void m_pop( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_push( -#if defined(M_PROTO) - M_ELEMENT elt, M_STATE current, LOGICAL need -#endif - ) ; - -LOGICAL m_putdata( -#if defined(M_PROTO) - void *data, int n -#endif - ) ; - -void m_readcomments( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void *m_realloc( -#if defined(M_PROTO) - void *ptr, int size, char *msg -#endif - ) ; - -int m_scan( -#if defined(M_PROTO) - LOGICAL prolog -#endif - ) ; - -void m_setmap( -#if defined(M_PROTO) - int map, LOGICAL useoradd -#endif - ) ; - -void m_setoptions( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_setparam( -#if defined(M_PROTO) - M_WCHAR **cvar, int par -#endif - ) ; - -void m_shortref( -#if defined(M_PROTO) - int context -#endif - ) ; - -void m_showcurelt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_signmsg( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_sigre( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_startdoc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_startmsg( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stcaction( -#if defined(M_PROTO) - M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END -#endif - ) ; - -void m_stcomplete( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stkdefaultparams( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stkonedef( -#if defined(M_PROTO) - int par, M_ELEMENT scanel, M_WCHAR **poccur, int i -#endif - ) ; - -void m_stkparams( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_strtaction( -#if defined(M_PROTO) - M_ELEMENT m_elt -#endif - ) ; - -void m_strtcase( -#if defined(M_PROTO) - int m_action -#endif - ) ; - -void m_strtcdata( -#if defined(M_PROTO) - int scanval -#endif - ) ; - -LOGICAL m_strtproc( -#if defined(M_PROTO) - M_ELEMENT scanval -#endif - ) ; - -void m_strttag( -#if defined(M_PROTO) - M_ELEMENT val, LOGICAL net -#endif - ) ; - -void m_textaction( -#if defined(M_PROTO) - M_WCHAR m_textchar -#endif - ) ; - -void m_textout( -#if defined(M_PROTO) - char *format, LOGICAL start, LOGICAL end -#endif - ) ; - -LOGICAL m_textpermitted( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -M_WCHAR *m_thisfile( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_thisline( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_trace( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_wctrace( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -LOGICAL m_transition( -#if defined(M_PROTO) - M_ELEMENT label, LOGICAL recur -#endif - ) ; - -void m_undodelim( -#if defined(M_PROTO) - M_WCHAR *delim, LOGICAL flag -#endif - ) ; - -void m_ungetachar( -#if defined(M_PROTO) - int c, M_HOLDTYPE dchar, LOGICAL preread -#endif - ) ; - -void m_updatedefault( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; - -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; - -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; - -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; - -LOGICAL m_validinpar( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL m_vldentref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +int m_actgetc(M_NOPAR); + +void m_adjuststate(M_NOPAR); + +LOGICAL m_allwhite(const M_WCHAR *string); + +void m_attval(M_WCHAR *string); + +LOGICAL m_attvonly(M_WCHAR *string); + +int m_checkstart(M_ELEMENT val); + +LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet); + +void m_ckmap(M_WCHAR *name, LOGICAL useoradd); + +void m_closent(void *m_ptr); + +void m_codeent(int m_ent); + +M_PARSE *m_copystackelt(M_NOPAR); + +M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, + unsigned char *wheredef); + +void m_dispcurelt(M_WCHAR *file, int line); + +void m_done(M_NOPAR); + +void m_dumpline(M_WCHAR *file, int line); + +void m_eduptype(int type); + +M_ELEMENT m_eltname(M_NOPAR); + +void m_endaction(M_ELEMENT m_elt); + +void m_endcase(int m_action); + +void m_endtag(M_ELEMENT c); + +void m_entexpand(M_ENTITY *openent); + +void m_eprefix(M_NOPAR); + +void m_err1(const char *text, const M_WCHAR *arg); + +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); + +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); + +void m_err4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); + +void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5); + +void m_err6(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6); + +void m_err7(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7); + +void m_errline(char *p); + +void m_error(char *text); + +void m_esuffix(M_NOPAR); + +void m_exit(int status); + +void m_etcomplete(M_NOPAR); + +LOGICAL m_excluded(M_ELEMENT elt); + +void m_expecting(M_NOPAR); + +void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data); + +void m_expline(LOGICAL *expstart, LOGICAL *data, M_ELEMENT label); + +void m_exptend(LOGICAL *expstart, M_PARSE *stackptr); + +int m_findact(M_ELEMENT elt, int *array); + +void m_findatt(M_NOPAR); + +void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, + LOGICAL wild); + +int m_findpar(const char *elt, const char *param, const M_WCHAR *value); + +M_ELEMENT m_findunique(M_STATE from, int *newleft); + +void m_frcend(M_ELEMENT val); + +void m_frcstart(M_NOPAR); + +void m_free(void *block, char *msg); + +void m_freeFSA(M_PARSE *stackelt); + +void m_freemin(M_MIN *min + , char *msg); + +void m_freeparam(M_PARSE *stackelt); + +LOGICAL m_gendelim(int srlen, int context); + +int m_getachar(M_HOLDTYPE *dchar); + +int m_getc(void *m_ptr); + +int mb_getwc(void *m_ptr); + +void *m_getdata(int n, LOGICAL *flag); + +void m_getline(M_WCHAR **file, int *line); + +void m_getname(M_WCHAR first); + +void m_getsignon(M_NOPAR); + +int m_gettoken(int *c, M_HOLDTYPE *dchar, int context); + +void m_globes(M_NOPAR); + +void m_globss(M_NOPAR); + +void m_holdproc(M_NOPAR); + +void m_inctest(int *count, int limit, char *message); + +void m_initctype(M_NOPAR); + +void m_initialize(M_NOPAR); + +void m_lastchars(M_NOPAR); + +int m_level(M_WCHAR *elt); + +int m_mblevel(char *elt); + +void m_litproc(int delim); + +void m_longent(int context); + +LOGICAL m_lookent(M_WCHAR *name, unsigned char *type, M_WCHAR **content, + unsigned char *wheredef); + +int main(int argc, char **argv); + +void *m_malloc(int size, char *msg); + +void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start); + +LOGICAL m_nextand(M_OPENFSA *thisfsa, M_ELEMENT label); + +void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, + unsigned char type); + +void m_ntrent(M_WCHAR *p); + +void m_nullendtag(M_NOPAR); + +LOGICAL m_omitend(M_NOPAR); + +LOGICAL m_omitstart(M_NOPAR); + +void m_openchk(FILE **ptr, char *name, char *mode); + +void *m_openent(M_WCHAR *entcontent); + +void *m_openfirst(M_NOPAR); + +void m_optstring(char *p); + +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); + +int m_parcount(M_WCHAR *elt); + +M_WCHAR *m_pardefault(M_WCHAR *elt, M_WCHAR *param, unsigned char *type); + +M_WCHAR *m_parent(int n); + +M_WCHAR *m_parname(M_WCHAR *elt, int n); + +M_WCHAR *m_mbparname(char *elt, int n); + +const M_WCHAR *m_partype(const int par, const M_WCHAR *string); + +void m_parupper(int par, M_WCHAR *string); + +LOGICAL m_parvalok(M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value); + +void m_piaction(M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype); + +void m_pop(M_NOPAR); + +void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need); + +LOGICAL m_putdata(void *data, int n); + +void m_readcomments(M_NOPAR); + +void *m_realloc(void *ptr, int size, char *msg); + +int m_scan(LOGICAL prolog); + +void m_setmap(int map, LOGICAL useoradd); + +void m_setoptions(M_NOPAR); + +void m_setparam(M_WCHAR **cvar, int par); + +void m_shortref(int context); + +void m_showcurelt(M_NOPAR); + +void m_signmsg(char *p); + +void m_sigre(M_NOPAR); + +void m_startdoc(M_NOPAR); + +void m_startmsg(M_NOPAR); + +void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END); + +void m_stcomplete(M_NOPAR); + +void m_stkdefaultparams(M_NOPAR); + +void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i); + +void m_stkparams(M_NOPAR); + +void m_strtaction(M_ELEMENT m_elt); + +void m_strtcase(int m_action); + +void m_strtcdata(int scanval); + +LOGICAL m_strtproc(M_ELEMENT scanval); + +void m_strttag(M_ELEMENT val, LOGICAL net); + +void m_textaction(M_WCHAR m_textchar); + +void m_textout(char *format, LOGICAL start, LOGICAL end); + +LOGICAL m_textpermitted(M_NOPAR); + +M_WCHAR *m_thisfile(M_NOPAR); + +int m_thisline(M_NOPAR); + +void m_trace(char *p); + +void m_wctrace(M_WCHAR *p); + +LOGICAL m_transition(M_ELEMENT label, LOGICAL recur); + +void m_undodelim(M_WCHAR *delim, LOGICAL flag); + +void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread); + +void m_updatedefault(const int par, const M_WCHAR *string); + +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); + +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); + +int m_mbmbupstrcmp(const char *p, const char *q); + +LOGICAL m_validinpar(M_WCHAR *string); + +LOGICAL m_vldentref(M_NOPAR); + +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser/canon1/parser/scan.c b/cde/programs/dthelp/parser/canon1/parser/scan.c index 663492260..d7f765f2e 100644 --- a/cde/programs/dthelp/parser/canon1/parser/scan.c +++ b/cde/programs/dthelp/parser/canon1/parser/scan.c @@ -399,12 +399,7 @@ int m_getachar(dchar) } /* Reads a name token */ -#if defined(M_PROTO) void m_getname(M_WCHAR first) -#else -void m_getname(first) - M_WCHAR first ; -#endif { M_WCHAR *p ; M_HOLDTYPE dchar ; @@ -646,14 +641,7 @@ void m_litproc(delim) } /* Called when a missing tagc delimiter is detected */ -#if defined(M_PROTO) void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start) -#else -void m_missingtagc(c, dchar, start) - int c ; - M_HOLDTYPE dchar ; - LOGICAL start ; -#endif { if (! m_wholetag) { if (start) m_mberr1("Invalid parameter or missing %s", m_tagc); @@ -666,18 +654,8 @@ void m_missingtagc(c, dchar, start) /* Have found one character in a possible short reference delimiter. Prepare to look for the next one */ -#if defined(M_PROTO) void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, unsigned char type) -#else -void m_nextdelimchar(n, i, linestart, newlinestart, skipblank, type) - int *n ; - int i ; - LOGICAL *linestart ; - LOGICAL newlinestart ; - LOGICAL skipblank ; - unsigned char type ; -#endif { int k ; char mb_re,mb_seqchar, mb_rschar; @@ -725,12 +703,7 @@ void m_readcomments(M_NOPAR) } /* Scanner */ -#if defined(M_PROTO) int m_scan(LOGICAL prolog) -#else -int m_scan(prolog) - LOGICAL prolog ; -#endif { int c ; M_HOLDTYPE dchar ; @@ -878,13 +851,7 @@ while (TRUE) /* Process explicit or implied USEMAP or ADDMAP */ -#if defined(M_PROTO) void m_setmap(int map, LOGICAL useoradd) -#else -void m_setmap(map, useoradd) - int map ; - LOGICAL useoradd ; -#endif { int i ; int sref ; @@ -1102,13 +1069,7 @@ void m_sigre(M_NOPAR) /* Returns a context-dependent delimiter string to input stream so characters can be reread one at a time in another context */ -#if defined(M_PROTO) void m_undodelim(M_WCHAR *delim, LOGICAL flag) -#else -void m_undodelim(delim, flag) - M_WCHAR *delim ; - LOGICAL flag ; -#endif { M_WCHAR *p ; @@ -1125,14 +1086,7 @@ void m_undodelim(delim, flag) /* Place a character on the current input stream. The character may have been scanned and determined not to be part of the current token or it may be in the expansion of an entity*/ -#if defined(M_PROTO) void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread) -#else -void m_ungetachar(c, dchar, preread) - int c ; - M_HOLDTYPE dchar ; - LOGICAL preread ; -#endif { char buffer[10] ; int length; diff --git a/cde/programs/dthelp/parser/canon1/parser/string.c b/cde/programs/dthelp/parser/canon1/parser/string.c index c7399727e..ad1697161 100644 --- a/cde/programs/dthelp/parser/canon1/parser/string.c +++ b/cde/programs/dthelp/parser/canon1/parser/string.c @@ -31,14 +31,7 @@ /* Include generated code */ #include "stfile.c" -#if defined(M_PROTO) void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END) -#else -void m_stcaction(m_string, M_START, M_END) - M_WCHAR *m_string ; - LOGICAL M_START ; - LOGICAL M_END ; -#endif { m_stackpar = m_stacktop->stparam ; (*m_sttable[m_stacktop->stccase])(m_string, M_START, M_END) ; diff --git a/cde/programs/dthelp/parser/canon1/parser/struct.c b/cde/programs/dthelp/parser/canon1/parser/struct.c index 9c6d3f153..23b02d2b1 100644 --- a/cde/programs/dthelp/parser/canon1/parser/struct.c +++ b/cde/programs/dthelp/parser/canon1/parser/struct.c @@ -88,13 +88,7 @@ int m_checkstart(val) If VAL is not the element at the top of the parse stack, m_ckend checks to see if the end of VAL can validly end nested elements as well. */ -#if defined(M_PROTO) LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet) -#else -LOGICAL m_ckend(val, neednet) - M_ELEMENT val ; - LOGICAL neednet ; - #endif { M_PARSE *stackptr ; M_OPENFSA *fsastack ; @@ -426,14 +420,7 @@ void m_pop(M_NOPAR) /* Pushes a new item onto the parse stack, setting its element, current, and neednet fields as indicated by the parameters*/ -#if defined(M_PROTO) void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need) -#else -void m_push(elt, current, need) - M_ELEMENT elt ; - M_STATE current ; - LOGICAL need ; - #endif { M_PARSE *newstack ; @@ -654,13 +641,7 @@ LOGICAL m_strtproc(scanval) } /* Processes explicit or implied start tag*/ -#if defined(M_PROTO) void m_strttag(M_ELEMENT val, LOGICAL net) -#else -void m_strttag(val, net) - M_ELEMENT val ; - LOGICAL net ; -#endif { m_transition(val, TRUE) ; if (val) { @@ -726,13 +707,7 @@ LOGICAL m_textpermitted(M_NOPAR) /* Returns TRUE iff LABEL allowed in the current state of the current element (without expanding any minimization). May result in changes to the stack of FSA's for this element if and-groups open or close. */ -#if defined(M_PROTO) LOGICAL m_transition(M_ELEMENT label, LOGICAL recur) -#else -LOGICAL m_transition(label, recur) - M_ELEMENT label ; - LOGICAL recur ; -#endif { M_ARC parc ; M_OPENFSA *newfsa ; diff --git a/cde/programs/dthelp/parser/canon1/parser/text.c b/cde/programs/dthelp/parser/canon1/parser/text.c index 377f8d19f..9bae2a819 100644 --- a/cde/programs/dthelp/parser/canon1/parser/text.c +++ b/cde/programs/dthelp/parser/canon1/parser/text.c @@ -36,12 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "tfile.c" /* When a text character occurs */ -#if defined(M_PROTO) void m_textaction(M_WCHAR m_textchar) -#else -void m_textaction(m_textchar) - M_WCHAR m_textchar ; - #endif { char buffer[10] ; char mb_re; diff --git a/cde/programs/dthelp/parser/canon1/util/allwhite.c b/cde/programs/dthelp/parser/canon1/util/allwhite.c index 9391eba79..f0e612811 100644 --- a/cde/programs/dthelp/parser/canon1/util/allwhite.c +++ b/cde/programs/dthelp/parser/canon1/util/allwhite.c @@ -26,25 +26,12 @@ */ #include "basic.h" -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); /* Test if a string contains only white space characters */ -#if defined(M_PROTO) LOGICAL m_allwhite(const M_WCHAR *string ) -#else -LOGICAL m_allwhite(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { const M_WCHAR *p ; diff --git a/cde/programs/dthelp/parser/canon1/util/basic.h b/cde/programs/dthelp/parser/canon1/util/basic.h index 30706b1c0..ea74d5f18 100644 --- a/cde/programs/dthelp/parser/canon1/util/basic.h +++ b/cde/programs/dthelp/parser/canon1/util/basic.h @@ -46,87 +46,29 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#if defined(hpux) || defined(__aix) || defined(sun) -/* Old unix stuff - *#define void int - *#define M_NOPAR - */ -/* New Ansi style */ -#define M_PROTO + #define M_NOPAR void -#else -#define M_PROTO -#define M_NOPAR void -#endif -char *MakeMByteString( -#if defined(M_PROTO) - const M_WCHAR *from -#endif - ); +char *MakeMByteString(const M_WCHAR *from); -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); -int w_strcmp( -#if defined(M_PROTO) - const M_WCHAR *string1, const M_WCHAR *string2 -#endif - ); +int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2); -M_WCHAR *w_strcpy( -#if defined(M_PROTO) - M_WCHAR *string1, const M_WCHAR *string2 -#endif - ); +M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2); -M_WCHAR *w_strncpy( -#if defined(M_PROTO) - M_WCHAR *string1, const M_WCHAR *string2, int max -#endif - ); +M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max); -int w_strlen( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ); +int w_strlen(const M_WCHAR *string); -M_WCHAR *w_strchr( -#if defined(M_PROTO) - M_WCHAR *string, const M_WCHAR chr -#endif - ); +M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr); -M_WCHAR *w_strstr( -#if defined(M_PROTO) - M_WCHAR *string1, M_WCHAR *string2 -#endif - ); +M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif -) ; +void *m_malloc(int size, char *msg); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -int mb_getwc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; +int mb_getwc(void *m_ptr); diff --git a/cde/programs/dthelp/parser/canon1/util/cont.h b/cde/programs/dthelp/parser/canon1/util/cont.h index b41ce9f50..e4863ce35 100644 --- a/cde/programs/dthelp/parser/canon1/util/cont.h +++ b/cde/programs/dthelp/parser/canon1/util/cont.h @@ -37,179 +37,63 @@ This product and information is proprietary of Tandem Computers Incorporated. #define CONTINIT(a) #endif -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpdlmptr( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void dumpdlmptr(M_NOPAR); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)); -void dumptree( -#if defined(M_PROTO) - LOGICAL sparse -#endif - ) ; +void dumptree(LOGICAL sparse); -void enterdelim( -#if defined(M_PROTO) - int n -#endif - ) ; +void enterdelim(int n); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - char *text, char *arg -#endif - ) ; +void m_err1(char *text, char *arg); -void getcode( -#if defined(M_PROTO) - int n -#endif - ) ; +void getcode(int n); -void getcolon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void getcolon(M_NOPAR); -int getContext( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int getContext(M_NOPAR); -LOGICAL getdname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +LOGICAL getdname(M_NOPAR); -void inccon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void inccon(M_NOPAR); -void incdelim( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void incdelim(M_NOPAR); -void loaddelim( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void loaddelim(M_NOPAR); -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +int main(int argc, char **argv); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void nextcon( -#if defined(M_PROTO) - LOGICAL sparse -#endif - ) ; +void nextcon(LOGICAL sparse); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); -void printval( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void printval(FILE *file, M_TRIE *value); -void prtctxt( -#if defined(M_PROTO) - int column, int value -#endif - ) ; +void prtctxt(int column, int value); -int readchar( -#if defined(M_PROTO) - LOGICAL cap -#endif - ) ; +int readchar(LOGICAL cap); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void unread( -#if defined(M_PROTO) - int c -#endif - ) ; +void unread(int c); -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, char *arg -#endif - ) ; +void warning1(char *text, char *arg); -void warning2( -#if defined(M_PROTO) - char *text, char *arg1, char *arg2 -#endif - ) ; +void warning2(char *text, char *arg1, char *arg2); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); #define NOMORE -1 diff --git a/cde/programs/dthelp/parser/canon1/util/conutil.c b/cde/programs/dthelp/parser/canon1/util/conutil.c index 84fa81dee..6fc6f5bd1 100644 --- a/cde/programs/dthelp/parser/canon1/util/conutil.c +++ b/cde/programs/dthelp/parser/canon1/util/conutil.c @@ -55,12 +55,7 @@ void dumpdlmptr(M_NOPAR) } /* Output the generated data structures */ -#if defined(M_PROTO) void dumptree(LOGICAL sparse) -#else -void dumptree(sparse) - LOGICAL sparse; -#endif { int i, count = 0; @@ -574,12 +569,7 @@ loading = FALSE; } /* Output transition matrix */ -#if defined(M_PROTO) void nextcon(LOGICAL sparse) -#else -void nextcon(sparse) - LOGICAL sparse; -#endif { int i, j; int firstinrow; @@ -646,12 +636,7 @@ void prtctxt(column, value) /* Read the next input character */ -#if defined(M_PROTO) int readchar(LOGICAL cap) -#else -int readchar(cap) - LOGICAL cap; -#endif { int c; M_WCHAR wnl; diff --git a/cde/programs/dthelp/parser/canon1/util/emptyfil.c b/cde/programs/dthelp/parser/canon1/util/emptyfil.c index 08460d96c..3672bd085 100644 --- a/cde/programs/dthelp/parser/canon1/util/emptyfil.c +++ b/cde/programs/dthelp/parser/canon1/util/emptyfil.c @@ -29,11 +29,7 @@ #endif #include "basic.h" -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +void main(int argc, char **argv); void main(argc, argv) int argc ; diff --git a/cde/programs/dthelp/parser/canon1/util/entout.c b/cde/programs/dthelp/parser/canon1/util/entout.c index f731e767f..5191a9cc5 100644 --- a/cde/programs/dthelp/parser/canon1/util/entout.c +++ b/cde/programs/dthelp/parser/canon1/util/entout.c @@ -25,23 +25,11 @@ /* Entout has procedures to write generated entity TRIE */ -void entptr( -#if defined(M_PROTO) - M_ENTITY *data -#endif - ) ; +void entptr(M_ENTITY *data); -char *typetype( -#if defined(M_PROTO) - int n -#endif - ) ; +char *typetype(int n); -char *typewhere( -#if defined(M_PROTO) - unsigned char n -#endif - ) ; +char *typewhere(unsigned char n); /* Macro names written to output file */ char xdbuild[] = "M_DBUILD" ; @@ -212,12 +200,7 @@ char *typetype(n) } /* Typewhere returns a string indicating where the nth entity was defined.*/ -#if defined(M_PROTO) char *typewhere(unsigned char n) -#else -char *typewhere(n) - unsigned char n ; -#endif { switch(n) { case M_DBUILD: return(xdbuild) ; diff --git a/cde/programs/dthelp/parser/canon1/util/error.c b/cde/programs/dthelp/parser/canon1/util/error.c index 42b778ff3..5afdeaa9e 100644 --- a/cde/programs/dthelp/parser/canon1/util/error.c +++ b/cde/programs/dthelp/parser/canon1/util/error.c @@ -33,128 +33,47 @@ extern FILE *m_errfile ; extern int m_line ; extern LOGICAL errexit ; -void eprefix( -#if defined(M_PROTO) - LOGICAL flag -#endif - ) ; +void eprefix(LOGICAL flag); -void m_errline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_errline(char *text); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - char *text, const M_WCHAR *arg -#endif - ) ; +void m_err1(char *text, const M_WCHAR *arg); -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; +void m_mberr1(char *text, const char *arg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void m_err5( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, - M_WCHAR *arg5 -#endif - ) ; +void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, + M_WCHAR *arg5); -void esuffix( -#if defined(M_PROTO) - void -#endif - ) ; +void esuffix(void); -void msgline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void msgline(char *text); -void msg1line( -#if defined(M_PROTO) - char *text, char *arg1 -#endif - ) ; +void msg1line(char *text, char *arg1); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void m_wctrace( -#if defined(M_PROTO) - M_WCHAR *text -#endif - ) ; +void m_wctrace(M_WCHAR *text); -void m_trace( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_trace(char *text); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; +void warning1(char *text, M_WCHAR *arg); -void warning2( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2 -#endif - ) ; +void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2); -void warning3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void warning4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; +void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); /* Write error message prefix */ -#if defined(M_PROTO) void eprefix(LOGICAL flag) -#else -void eprefix(flag) - LOGICAL flag ; -#endif { if (flag) errexit = TRUE ; fprintf(stderr, "\n**** ") ; @@ -184,13 +103,7 @@ void m_error(text) /* Writes an error message with one argument to standard error and file "error" */ -#if defined(M_PROTO) void m_err1(char *text, const M_WCHAR *arg) -#else -void m_err1(text, arg) - char *text; - M_WCHAR *arg ; -#endif { char *mb_arg; @@ -203,13 +116,7 @@ skiptoend() ; m_free(mb_arg,"multi-byte string"); } -#if defined(M_PROTO) void m_mberr1(char *text, const char *arg) -#else -void m_err1(text, arg) - char *text; - char *arg ; -#endif { eprefix(TRUE) ; fprintf(stderr, text, arg) ; @@ -220,13 +127,7 @@ skiptoend() ; /* Writes an error message with two arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2) -#else -void m_err2(text, arg1, arg2) -char *text; -M_WCHAR *arg1, *arg2 ; -#endif { char *mb_arg1, *mb_arg2; @@ -243,13 +144,7 @@ m_free(mb_arg2,"multi-byte string"); /* Writes an error message with three arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void m_err3(text, arg1, arg2, arg3) -char *text; -M_WCHAR *arg1, *arg2, *arg3 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3; @@ -268,14 +163,8 @@ m_free(mb_arg3,"multi-byte string"); /* Writes an error message with five arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err5( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5) -#else -void m_err5(text, arg1, arg2, arg3, arg4, arg5) -char *text; -M_WCHAR *arg1, *arg2, *arg3, *arg4, *arg5 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5; @@ -347,13 +236,7 @@ void warning(text) /* Writes a nonfatal error message with one argument to standard error and file "error" */ -#if defined(M_PROTO) void warning1( char *text, M_WCHAR *arg) -#else -void warning1(text, arg) -char *text; -M_WCHAR *arg ; -#endif { char *mb_arg; @@ -367,13 +250,7 @@ m_free(mb_arg,"multi-byte string"); /* Writes a nonfatal error message with two arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2) -#else -void warning2(text, arg1, arg2) -char *text; -M_WCHAR *arg1, *arg2 ; -#endif { char *mb_arg1, *mb_arg2; @@ -389,13 +266,7 @@ m_free(mb_arg2,"multi-byte string"); /* Writes a nonfatal error message with three arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void warning3(text, arg1, arg2, arg3) -char *text; -M_WCHAR *arg1, *arg2, *arg3 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3; @@ -413,14 +284,8 @@ m_free(mb_arg3,"multi-byte string"); /* Writes a nonfatal error message with four arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4) -#else -void warning4(text, arg1, arg2, arg3, arg4) -char *text; -M_WCHAR *arg1, *arg2, *arg3, *arg4 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4; diff --git a/cde/programs/dthelp/parser/canon1/util/exit.c b/cde/programs/dthelp/parser/canon1/util/exit.c index dc95be5b6..96ec73e5b 100644 --- a/cde/programs/dthelp/parser/canon1/util/exit.c +++ b/cde/programs/dthelp/parser/canon1/util/exit.c @@ -30,11 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #endif #include "basic.h" -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); /* Exit function called by utilities used in PARSER and other programs in the MARKUP system */ diff --git a/cde/programs/dthelp/parser/canon1/util/fclndir.c b/cde/programs/dthelp/parser/canon1/util/fclndir.c index 0216abed9..141592714 100644 --- a/cde/programs/dthelp/parser/canon1/util/fclndir.c +++ b/cde/programs/dthelp/parser/canon1/util/fclndir.c @@ -58,23 +58,11 @@ struct data { char linedir[] = "#line" ; char *p = linedir, *q = linedir + 1 ; -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +void main(int argc, char **argv); -void copyfile( -#if defined(m_proto) - char *pfile1, char *pfile2 -#endif - ) ; +void copyfile(char *pfile1, char *pfile2); -int nextchar( -#if defined (M_PROTO) - FILE *file, struct data *data -#endif - ) ; +int nextchar(FILE *file, struct data *data); void main(argc, argv) int argc ; diff --git a/cde/programs/dthelp/parser/canon1/util/inctest.c b/cde/programs/dthelp/parser/canon1/util/inctest.c index ce658c012..aca54d1af 100644 --- a/cde/programs/dthelp/parser/canon1/util/inctest.c +++ b/cde/programs/dthelp/parser/canon1/util/inctest.c @@ -30,23 +30,11 @@ #endif #include "basic.h" -void m_err1( -#if defined(M_PROTO) - const char *text, const char *arg -#endif - ) ; +void m_err1(const char *text, const char *arg); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_inctest( -#if defined(M_PROTO) - int *count, int limit, char *message -#endif - ) ; +void m_inctest(int *count, int limit, char *message); /* Increment a count and test against a limit */ void m_inctest(count, limit, message) diff --git a/cde/programs/dthelp/parser/canon1/util/initct.c b/cde/programs/dthelp/parser/canon1/util/initct.c index 319234555..4d971c90d 100644 --- a/cde/programs/dthelp/parser/canon1/util/initct.c +++ b/cde/programs/dthelp/parser/canon1/util/initct.c @@ -29,12 +29,6 @@ #include "common.h" extern char m_chartype[M_CHARSETLEN] ; -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - void m_initctype(M_NOPAR) { int i ; diff --git a/cde/programs/dthelp/parser/canon1/util/itoa.c b/cde/programs/dthelp/parser/canon1/util/itoa.c index 1bac0790b..2d5834b8e 100644 --- a/cde/programs/dthelp/parser/canon1/util/itoa.c +++ b/cde/programs/dthelp/parser/canon1/util/itoa.c @@ -27,17 +27,9 @@ #include #include "basic.h" -char *m_itoa( -#if defined(M_PROTO) - int n, char *s -#endif - ) ; +char *m_itoa(int n, char *s); -void reverse( -#if defined(M_PROTO) - char *s -#endif - ) ; +void reverse(char *s); char *m_itoa(n, s) /* convert n to characters in s */ char s[]; diff --git a/cde/programs/dthelp/parser/canon1/util/letter.c b/cde/programs/dthelp/parser/canon1/util/letter.c index 0ce3b1777..29fe3947f 100644 --- a/cde/programs/dthelp/parser/canon1/util/letter.c +++ b/cde/programs/dthelp/parser/canon1/util/letter.c @@ -27,18 +27,7 @@ #include "basic.h" -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; - -#if defined(M_PROTO) LOGICAL m_letter(M_WCHAR c) -#else -LOGICAL m_letter(c) - M_WCHAR c ; -#endif { if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) return(TRUE) ; return(FALSE) ; diff --git a/cde/programs/dthelp/parser/canon1/util/lower.c b/cde/programs/dthelp/parser/canon1/util/lower.c index a313a9b6e..cc593a2a5 100644 --- a/cde/programs/dthelp/parser/canon1/util/lower.c +++ b/cde/programs/dthelp/parser/canon1/util/lower.c @@ -27,11 +27,7 @@ #include "basic.h" -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); diff --git a/cde/programs/dthelp/parser/canon1/util/malloc.c b/cde/programs/dthelp/parser/canon1/util/malloc.c index 33f284873..520a96cef 100644 --- a/cde/programs/dthelp/parser/canon1/util/malloc.c +++ b/cde/programs/dthelp/parser/canon1/util/malloc.c @@ -36,53 +36,21 @@ extern LOGICAL m_heapchk ; extern LOGICAL m_malftrace ; -void m_errline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_errline(char *text); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void m_heapdump( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_heapdump(M_NOPAR); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void *m_realloc( -#if defined(M_PROTO) - void *ptr, int size, char *msg -#endif - ) ; +void *m_realloc(void *ptr, int size, char *msg); -void *m_trace( -#if defined(M_PROTO) - char *text -#endif - ) ; +void *m_trace(char *text); -void *m_wctrace( -#if defined(M_PROTO) - M_WCHAR *text -#endif - ) ; +void *m_wctrace(M_WCHAR *text); void m_free(block, msg) void *block ; diff --git a/cde/programs/dthelp/parser/canon1/util/openchk.c b/cde/programs/dthelp/parser/canon1/util/openchk.c index 824cc1219..2059c7c04 100644 --- a/cde/programs/dthelp/parser/canon1/util/openchk.c +++ b/cde/programs/dthelp/parser/canon1/util/openchk.c @@ -33,17 +33,9 @@ extern FILE *m_errfile ; -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); /* Open a file and check that the open succeeded */ void m_openchk(ptr, name, mode) diff --git a/cde/programs/dthelp/parser/canon1/util/paramu.c b/cde/programs/dthelp/parser/canon1/util/paramu.c index 561c87212..b12886c7e 100644 --- a/cde/programs/dthelp/parser/canon1/util/paramu.c +++ b/cde/programs/dthelp/parser/canon1/util/paramu.c @@ -33,13 +33,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Check to see if string is a valid value for parameter par. If so return a pointer to the keyword if it's a keyword parameter and otherwise a pointer to string. If not valid, return FALSE. */ -#if defined(M_PROTO) const M_WCHAR *m_partype(const int par , const M_WCHAR *string ) -#else -M_WCHAR *m_partype(par, string) - int par ; - M_WCHAR *string ; -#endif /* M_PROTO */ { LOGICAL first = TRUE ; int kw ; diff --git a/cde/programs/dthelp/parser/canon1/util/sparse.h b/cde/programs/dthelp/parser/canon1/util/sparse.h index ddb5a1d25..7ccc55ffd 100644 --- a/cde/programs/dthelp/parser/canon1/util/sparse.h +++ b/cde/programs/dthelp/parser/canon1/util/sparse.h @@ -29,11 +29,7 @@ #if defined(sparse) #define m_newcon(i, j) m_sprscon(i, j) -int m_sprscon( -#if defined(M_PROTO) - int i, int j -#endif - ) ; +int m_sprscon(int i, int j); #else #define m_newcon(i, j) m_nextcon[i][j] diff --git a/cde/programs/dthelp/parser/canon1/util/trie.c b/cde/programs/dthelp/parser/canon1/util/trie.c index b27e5ecea..fe3876224 100644 --- a/cde/programs/dthelp/parser/canon1/util/trie.c +++ b/cde/programs/dthelp/parser/canon1/util/trie.c @@ -45,26 +45,12 @@ extern FILE *m_errfile ; extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ; -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void m_entercharintrie( -#if defined(M_PROTO) - M_TRIE **currentnode, M_WCHAR c -#endif - ) ; +void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c); /* Enters the next character of a string into a trie */ -#if defined(M_PROTO) void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c) -#else -void m_entercharintrie(currentnode, c) - M_TRIE **currentnode ; - M_WCHAR c ; -#endif { M_TRIE *newnode ; @@ -112,13 +98,7 @@ M_TRIE *m_gettrienode(M_NOPAR) /* M_lookfortrie(p, xtrie) looks for string p in the specified trie, returning its data value if found and otherwise FALSE */ -#if defined(M_PROTO) void *m_lookfortrie( const M_WCHAR *p , const M_TRIE *xtrie ) -#else -void *m_lookfortrie(p, xtrie) - M_WCHAR *p ; - M_TRIE *xtrie ; -#endif /* M_PROTO */ { M_TRIE *currentnode ; diff --git a/cde/programs/dthelp/parser/canon1/util/trie.h b/cde/programs/dthelp/parser/canon1/util/trie.h index 648a9843f..0755b8a6b 100644 --- a/cde/programs/dthelp/parser/canon1/util/trie.h +++ b/cde/programs/dthelp/parser/canon1/util/trie.h @@ -51,26 +51,10 @@ struct m_ptrie { } ; -M_TRIE *m_gettrienode( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +M_TRIE *m_gettrienode(M_NOPAR); -void *m_lookfortrie( -#if defined(M_PROTO) - const M_WCHAR *p, const M_TRIE *xtrie -#endif - ) ; +void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie); -void *m_ntrtrie( -#if defined(M_PROTO) - M_WCHAR *p, M_TRIE *xtrie, void *dataval -#endif - ) ; +void *m_ntrtrie(M_WCHAR *p, M_TRIE *xtrie, void *dataval); -void *m_resettrie( -#if defined(M_PROTO) - M_TRIE *xtrie, M_WCHAR *p, void *value -#endif - ) ; +void *m_resettrie(M_TRIE *xtrie, M_WCHAR *p, void *value); diff --git a/cde/programs/dthelp/parser/canon1/util/triecnt.c b/cde/programs/dthelp/parser/canon1/util/triecnt.c index a27e3a9fb..155e1d684 100644 --- a/cde/programs/dthelp/parser/canon1/util/triecnt.c +++ b/cde/programs/dthelp/parser/canon1/util/triecnt.c @@ -31,24 +31,12 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, + void (*proc)(FILE *file, void *value)); -void printval( -#if defined(M_PROTO) - FILE *file, void *value -#endif - ) ; +void printval(FILE *file, void *value); /* Count the descendants of a node in order to generate declarations for the packed form of a trie*/ @@ -71,12 +59,7 @@ void dumpnode(first, file, trieptr, count, proc) FILE *file ; M_TRIE *trieptr ; int *count ; - void (*proc) ( -#if defined (M_PROTO) - FILE *file, - void *value -#endif - ) ; + void (*proc) (FILE *file, void *value); { M_TRIE *p ; int savecount ; diff --git a/cde/programs/dthelp/parser/canon1/util/triedump.c b/cde/programs/dthelp/parser/canon1/util/triedump.c index d2a41703e..3fc1d16e3 100644 --- a/cde/programs/dthelp/parser/canon1/util/triedump.c +++ b/cde/programs/dthelp/parser/canon1/util/triedump.c @@ -29,18 +29,9 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(void *value) -#endif - ) ; +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, void (*proc)(void *value)); /* Write the C declaration of a trie */ void m_dumptrie(file, xtrie, extname, count, proc) @@ -48,11 +39,7 @@ void m_dumptrie(file, xtrie, extname, count, proc) M_TRIE *xtrie ; char *extname ; int *count ; - void (*proc)( -#if defined(M_PROTO) - void *value -#endif - ) ; + void (*proc)(void *value); { int firstson ; M_TRIE *p ; diff --git a/cde/programs/dthelp/parser/canon1/util/triepdmp.c b/cde/programs/dthelp/parser/canon1/util/triepdmp.c index 1ac30ae01..04618ef66 100644 --- a/cde/programs/dthelp/parser/canon1/util/triepdmp.c +++ b/cde/programs/dthelp/parser/canon1/util/triepdmp.c @@ -29,25 +29,13 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, + void (*proc)(FILE *file, void *value)); -void dumpptrie( -#if defined(M_PROTO) - M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, + void (*proc)(FILE *file, void *value)); /* Write the declaration of a packed trie to the specified files */ void dumpptrie(intname, extname, file, externdef, defdef, proc) @@ -56,12 +44,7 @@ void dumpptrie(intname, extname, file, externdef, defdef, proc) FILE *file ; char *externdef ; char *defdef ; - void (*proc) ( -#if defined (M_PROTO) - FILE *file, - void *value -#endif - ) ; + void (*proc) (FILE *file, void *value) ; { LOGICAL first = TRUE ; int count = 0 ; diff --git a/cde/programs/dthelp/parser/canon1/util/trieplk.c b/cde/programs/dthelp/parser/canon1/util/trieplk.c index 0c2451a34..3f6164195 100644 --- a/cde/programs/dthelp/parser/canon1/util/trieplk.c +++ b/cde/programs/dthelp/parser/canon1/util/trieplk.c @@ -36,12 +36,7 @@ extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ; -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, - M_WCHAR *name -#endif - ) ; +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); /* Look for the string NAME in the packed trie PTRIE */ int m_packedlook(xptrie, name) diff --git a/cde/programs/dthelp/parser/canon1/util/upcmp8.c b/cde/programs/dthelp/parser/canon1/util/upcmp8.c index a2b4268dc..2e4aa006a 100644 --- a/cde/programs/dthelp/parser/canon1/util/upcmp8.c +++ b/cde/programs/dthelp/parser/canon1/util/upcmp8.c @@ -32,30 +32,13 @@ #include "common.h" extern M_CHARTYPE m_ctarray[256] ; -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; +int m_mbmbupstrcmp(const char *p, const char *q); -#if defined(M_PROTO) int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q ) -#else -int m_wcupstrcmp(p, q) - M_WCHAR *p, *q ; -#endif /* M_PROTO */ { do { if (m_ctupper(*p) < m_ctupper(*q)) return(-1) ; @@ -65,13 +48,7 @@ int m_wcupstrcmp(p, q) return(0) ; } -#if defined(M_PROTO) int m_wcmbupstrcmp(const M_WCHAR *p, const char *q) -#else -int m_wcmbupstrcmp(p, q) - M_WCHAR *p; - char *q ; -#endif { M_WCHAR *wc; int retval; @@ -82,13 +59,7 @@ int m_wcmbupstrcmp(p, q) return retval; } -#if defined(M_PROTO) int m_mbmbupstrcmp(const char *p, const char *q) -#else -int m_mbmbupstrcmp(p, q) - char *p; - char *q ; -#endif { M_WCHAR *w_p, *w_q; int retval; diff --git a/cde/programs/dthelp/parser/canon1/util/upper.c b/cde/programs/dthelp/parser/canon1/util/upper.c index df1ac6f52..0515984eb 100644 --- a/cde/programs/dthelp/parser/canon1/util/upper.c +++ b/cde/programs/dthelp/parser/canon1/util/upper.c @@ -29,14 +29,7 @@ #include "basic.h" -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; - -int m_upper(c) - int c ; +int m_upper(int c) { if (c >= 'a' && c <= 'z') c += 'A' - 'a' ; return(c) ; diff --git a/cde/programs/dthelp/parser/canon1/util/upstrcmp.c b/cde/programs/dthelp/parser/canon1/util/upstrcmp.c index e3a7f5617..3e8254a69 100644 --- a/cde/programs/dthelp/parser/canon1/util/upstrcmp.c +++ b/cde/programs/dthelp/parser/canon1/util/upstrcmp.c @@ -29,20 +29,9 @@ #include "basic.h" -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -int m_upstrcmp( -#if defined(M_PROTO) - char *p, char *q -#endif - ) ; - -int m_upstrcmp(p, q) - char *p, *q ; +int m_upstrcmp(char *p, char *q) { do { if (m_upper((int) *p) < m_upper((int) *q)) return(-1) ; diff --git a/cde/programs/dthelp/parser/canon1/util/wchar.c b/cde/programs/dthelp/parser/canon1/util/wchar.c index 3a1ae0d20..a897d5862 100644 --- a/cde/programs/dthelp/parser/canon1/util/wchar.c +++ b/cde/programs/dthelp/parser/canon1/util/wchar.c @@ -32,13 +32,7 @@ /* compare two wide character strings */ -#if defined(M_PROTO) int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2) -#else -int w_strcmp(string1, string2) -M_WCHAR *string1; -M_WCHAR *string2; -#endif { M_WCHAR c1, c2, null; @@ -60,13 +54,7 @@ while (1) /* copy a wide character string */ -#if defined(M_PROTO) M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2) -#else -M_WCHAR *w_strcpy(string1, string2) -M_WCHAR *string1; -M_WCHAR *string2; -#endif { M_WCHAR *string1start; @@ -79,14 +67,7 @@ return string1start; /* copy a wide character string, stopping after "max" moves */ -#if defined(M_PROTO) M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max) -#else -M_WCHAR *w_strncpy(string1, string2, max) -M_WCHAR *string1; -M_WCHAR *string2; -int max; -#endif { M_WCHAR *string1start; @@ -99,12 +80,7 @@ return string1start; /* get the length of a wide character string */ -#if defined(M_PROTO) int w_strlen(const M_WCHAR *string) -#else -int w_strlen(string) -M_WCHAR *string; -#endif { int length; @@ -117,12 +93,7 @@ return length; /* find wide character "chr" in wide string "string" */ -#if defined(M_PROTO) M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr) -#else -M_WCHAR *w_strchr(string, chr) -M_WCHAR *string, chr; -#endif { M_WCHAR *where; @@ -142,12 +113,7 @@ else /* find wide character "chr" in wide string "string" */ -#if defined(M_PROTO) M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2) -#else -M_WCHAR *w_strstr(string1, string2) -M_WCHAR *string1, *string2; -#endif { M_WCHAR *where1, *where2; @@ -182,12 +148,7 @@ return NULL; /* make a multi-byte string from a wide character string */ -#if defined(M_PROTO) char *MakeMByteString(const M_WCHAR *wc_string) -#else -char *MakeMByteString(wc_string) -M_WCHAR *wc_string; -#endif { char *mb_string; int length, retVal; @@ -217,12 +178,7 @@ return mb_string; /* make a wide character string from a multi-byte string */ -#if defined(M_PROTO) M_WCHAR *MakeWideCharString(const char *mb_string) -#else -M_WCHAR *MakeWideCharString(mb_string) -char *mb_string; -#endif { M_WCHAR *wc_string, *wc_stringStart; int length, incr; diff --git a/cde/programs/dthelp/parser/canon1/util/whitesp.c b/cde/programs/dthelp/parser/canon1/util/whitesp.c index 07e08d682..8b9c8b469 100644 --- a/cde/programs/dthelp/parser/canon1/util/whitesp.c +++ b/cde/programs/dthelp/parser/canon1/util/whitesp.c @@ -27,19 +27,10 @@ #include "basic.h" -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); /* Test if character c is a blank, tab, or carriage return */ -#if defined(M_PROTO) LOGICAL m_whitespace(M_WCHAR c) -#else -LOGICAL m_whitespace(c) - M_WCHAR c ; -#endif { char mb_c[32]; /* arbitrarily large */ int length; diff --git a/cde/programs/dthelp/parser/pass1/build/build.h b/cde/programs/dthelp/parser/pass1/build/build.h index bebdf1fd0..023896a57 100644 --- a/cde/programs/dthelp/parser/pass1/build/build.h +++ b/cde/programs/dthelp/parser/pass1/build/build.h @@ -421,8 +421,4 @@ BUILDEXTERN LOGICAL entrule BUILDINIT(FALSE) ; BUILDEXTERN M_WCHAR genname[M_NAMELEN + sizeof(M_PREFIX)] ; -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); diff --git a/cde/programs/dthelp/parser/pass1/build/fsa.c b/cde/programs/dthelp/parser/pass1/build/fsa.c index a4d3b5b07..aeb14383c 100644 --- a/cde/programs/dthelp/parser/pass1/build/fsa.c +++ b/cde/programs/dthelp/parser/pass1/build/fsa.c @@ -37,18 +37,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Addarc adds an arc from FSA state to state setting other fields as indicated by the other parameters.*/ -#if defined(M_PROTO) int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, int id, LOGICAL minim, ELTSTRUCT **errelt) -#else -int addarc(from, to, label, and, optional, id, minim, errelt) - STATE *from, *to ; - ELTSTRUCT *label ; - ANDGROUP *and ; - LOGICAL optional ; - int id ; - LOGICAL minim ; - ELTSTRUCT **errelt ; -#endif { ARC *parc, *qarc ; int determ ; @@ -630,12 +619,7 @@ LOGICAL samelabelarc(a, s) /* Saves the name of an element appearing on the left-hand side of a grammar rule */ -#if defined(M_PROTO) void savelhs(LOGICAL param) -#else -void savelhs(param) - LOGICAL param ; -#endif { STATE *end ; ELTSTRUCT *errelt ; diff --git a/cde/programs/dthelp/parser/pass1/build/param.c b/cde/programs/dthelp/parser/pass1/build/param.c index 837c649af..16f76a3b8 100644 --- a/cde/programs/dthelp/parser/pass1/build/param.c +++ b/cde/programs/dthelp/parser/pass1/build/param.c @@ -124,12 +124,7 @@ newpar->ptypep = NULL ; /* Check that specified default value is legal parameter value */ -#if defined(M_PROTO) LOGICAL checkdefault( const M_WCHAR *string ) -#else -LOGICAL checkdefault(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { const M_WCHAR *p ; int len ; @@ -205,12 +200,7 @@ switch (newpar->type) /* Normalize parameter default. Change tabs and RE's to spaces, capitalize all letters (unless type is CDATA), remove extra space in lists */ -#if defined(M_PROTO) void normdefault(M_WCHAR *string ) -#else -void normdefault(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { M_WCHAR *p, *q ; int i, ret ; @@ -296,12 +286,7 @@ ruleinit() ; } /* Make string the default for the current parameter of the current element */ -#if defined(M_PROTO) void setdefault(const M_WCHAR *string) -#else -void setdefault() -M_WCHAR *string; -#endif /* M_PROTO */ { PTYPE *kw ; int keycount ; diff --git a/cde/programs/dthelp/parser/pass1/build/proto.h b/cde/programs/dthelp/parser/pass1/build/proto.h index 01a931769..0573aa9ba 100644 --- a/cde/programs/dthelp/parser/pass1/build/proto.h +++ b/cde/programs/dthelp/parser/pass1/build/proto.h @@ -28,587 +28,203 @@ /* Proto.h contains function prototypes for program BUILD. */ -int addarc( -#if defined(M_PROTO) - STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, - int id, LOGICAL minim, ELTSTRUCT **errelt -#endif - ) ; +int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, + int id, LOGICAL minim, ELTSTRUCT **errelt); -void adddefent( -#if defined(M_PROTO) - M_WCHAR *mapname -#endif - ) ; +void adddefent(M_WCHAR *mapname); -LOGICAL addent( -#if defined(M_PROTO) - M_WCHAR *name -#endif - ) ; +LOGICAL addent(M_WCHAR *name); -void addex( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addex(M_NOPAR); -void addkeyword( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addkeyword(M_NOPAR); -LOGICAL addmapname( -#if defined(M_PROTO) - M_WCHAR *p, LOGICAL define -#endif - ) ; +LOGICAL addmapname(M_WCHAR *p, LOGICAL define); -void addndent( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void addndent(M_WCHAR *p); -void addpar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addpar(M_NOPAR); -void addsref( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void addsref(M_WCHAR *p); -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -void checkand( -#if defined(M_PROTO) - ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root, - ELTSTRUCT **errelt -#endif - ) ; +void checkand(ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root, + ELTSTRUCT **errelt); -LOGICAL checkdefault( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL checkdefault(const M_WCHAR *string); -int checkdfsa( -#if defined(M_PROTO) - STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt -#endif - ) ; +int checkdfsa(STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt); -int checkrepeat( -#if defined(M_PROTO) - STATE *from, ANDGROUP *and, ELTSTRUCT **errelt -#endif - ) ; +int checkrepeat(STATE *from, ANDGROUP *and, ELTSTRUCT **errelt); -void copyintolist( -#if defined(M_PROTO) - STATELIST *from, STATELIST **to -#endif - ) ; +void copyintolist(STATELIST *from, STATELIST **to); -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void defmapname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void defmapname(M_NOPAR); -char *deftype( -#if defined(M_PROTO) - int n -#endif - ) ; +char *deftype(int n); -void dellist( -#if defined(M_PROTO) - STATELIST **list -#endif - ) ; +void dellist(STATELIST **list); -void delstartarcs( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void delstartarcs(M_NOPAR); -void done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void done(M_NOPAR); -void dumpentnode( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void dumpentnode(FILE *file, M_TRIE *value); -void dumpmapnode( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void dumpmapnode(FILE *file, M_TRIE *value); -void dumpsrefnode( -#if defined(M_PROTO) - FILE *file, - M_TRIE *value -#endif - ) ; +void dumpsrefnode(FILE *file, + M_TRIE *value); -void dumpptrie( -#if defined(M_PROTO) - M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, - void (*proc)( FILE *, M_TRIE *) -#endif - ) ; +void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, + void (*proc)( FILE *, M_TRIE *)); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(M_ENTITY *) -#endif - ) ; - -void eltblocks( -#if defined(M_PROTO) - FILE *tempfile -#endif - ) ; - -void eltreeout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void endmodel( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void entout( -#if defined(M_PROTO) - char *fname -#endif - ) ; - -char *enttype( -#if defined(M_PROTO) - int n -#endif - ) ; - -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; - -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; - -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; - -void exout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; - -void freetree( -#if defined(M_PROTO) - TREE *ruletree -#endif - ) ; - -void found( -#if defined(M_PROTO) - LOGICAL *flag, char *delim -#endif - ) ; - -void fsa( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int getachar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -ANDGROUP *getand( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL getname( -#if defined(M_PROTO) - int first -#endif - ) ; - -STATE *getstate( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int gettoken( -#if defined(M_PROTO) - int *c, int context -#endif - ) ; - -TREE *gettreenode( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; - -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void makeand( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root, int optional -#endif - ) ; - -LOGICAL makefsa( -#if defined(M_PROTO) - TREE *root, int optional -#endif - ) ; - -void makeor( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root -#endif - ) ; - -void makeseq( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root, int optional -#endif - ) ; - -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; - -void msgline( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void msg1line( -#if defined(M_PROTO) - char *text, char *arg1 -#endif - ) ; - -void nondeterm( -#if defined(M_PROTO) - TREE *root, int c, ELTSTRUCT *eltp -#endif - ) ; - -void normdefault( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL notinlist( -#if defined(M_PROTO) - STATELIST *item, STATELIST *list -#endif - ) ; - -ELTSTRUCT *ntrelt( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; - -void parout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -char *partype( -#if defined(M_PROTO) - int n -#endif - ) ; - -LOGICAL permitspcd( -#if defined(M_PROTO) - ARC *a -#endif - ) ; - -void pop( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void prulend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void push( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL regenerate( -#if defined(M_PROTO) - TREE *start, TREE *stop -#endif - ) ; - -void repeat( -#if defined(M_PROTO) - TREE *root -#endif - ) ; - -void ruleinit( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void rulend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL samelabelarc( -#if defined(M_PROTO) - ARC *a, STATE *s -#endif - ) ; - -void savelhs( -#if defined(M_PROTO) - LOGICAL param -#endif - ) ; - -void savestartarcs( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void setdefault( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; - -void simplebranch( -#if defined(M_PROTO) - TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional -#endif - ) ; - -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_sprscon( -#if defined(M_PROTO) - int i, int j -#endif - ) ; - -void srefout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -STATE *startfsa( -#if defined(M_PROTO) - TREE *root, LOGICAL *canbenull -#endif - ) ; - -void tempelt( -#if defined(M_PROTO) - ELTSTRUCT *eltp, FILE *tempfile -#endif - ) ; - -void template( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -char *typecon( -#if defined(M_PROTO) - int n -#endif - ) ; - -void undodelim( -#if defined(M_PROTO) - M_WCHAR *delim -#endif - ) ; - -void ungetachar( -#if defined(M_PROTO) - int c -#endif - ) ; - -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; - -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; - -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; - -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; - -void warning2( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2 -#endif - ) ; - -void warning3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; - -void warning4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; - -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; + void (*proc)(M_ENTITY *)); + +void eltblocks(FILE *tempfile); + +void eltreeout(M_NOPAR); + +void endmodel(M_NOPAR); + +void entout(char *fname); + +char *enttype(int n); + +void m_error(char *text); + +void m_err1(const char *text, const M_WCHAR *arg); + +void m_mberr1(char *text, const char *arg); + +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); + +void exout(M_NOPAR); + +void m_free(void *block, char *msg); + +void freetree(TREE *ruletree); + +void found(LOGICAL *flag, char *delim); + +void fsa(M_NOPAR); + +int getachar(M_NOPAR); + +ANDGROUP *getand(M_NOPAR); + +LOGICAL getname(int first); + +STATE *getstate(M_NOPAR); + +int gettoken(int *c, int context); + +TREE *gettreenode(M_NOPAR); + +void m_initctype(M_NOPAR); + +void initialize(M_NOPAR); + +LOGICAL litproc(int delim); + +int main(int argc, char **argv); + +void makeand(LOGICAL *canbenull, TREE *root, int optional); + +LOGICAL makefsa(TREE *root, int optional); + +void makeor(LOGICAL *canbenull, TREE *root); + +void makeseq(LOGICAL *canbenull, TREE *root, int optional); + +void *m_malloc(int size, char *msg); + +void msgline(char *text); + +void msg1line(char *text, char *arg1); + +void nondeterm(TREE *root, int c, ELTSTRUCT *eltp); + +void normdefault(M_WCHAR *string); + +LOGICAL notinlist(STATELIST *item, STATELIST *list); + +ELTSTRUCT *ntrelt(M_WCHAR *p); + +void m_openchk(FILE **ptr, char *name, char *mode); + +void parout(M_NOPAR); + +char *partype(int n); + +LOGICAL permitspcd(ARC *a); + +void pop(M_NOPAR); + +void prulend(M_NOPAR); + +void push(M_NOPAR); + +LOGICAL regenerate(TREE *start, TREE *stop); + +void repeat(TREE *root); + +void ruleinit(M_NOPAR); + +void rulend(M_NOPAR); + +LOGICAL samelabelarc(ARC *a, STATE *s); + +void savelhs(LOGICAL param); + +void savestartarcs(M_NOPAR); + +int scan(M_NOPAR); + +void setdefault(const M_WCHAR *string); + +void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional); + +void skiptoend(M_NOPAR); + +int m_sprscon(int i, int j); + +void srefout(M_NOPAR); + +STATE *startfsa(TREE *root, LOGICAL *canbenull); + +void tempelt(ELTSTRUCT *eltp, FILE *tempfile); + +void template(M_NOPAR); + +char *typecon(int n); + +void undodelim(M_WCHAR *delim); + +void ungetachar(int c); + +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); + +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); + +int m_mbmbupstrcmp(const char *p, const char *q); + +void warning(char *text); + +void warning1(char *text, M_WCHAR *arg); + +void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2); + +void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); + +void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); + +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser/pass1/build/sref.c b/cde/programs/dthelp/parser/pass1/build/sref.c index 85e9067bf..78581d7b8 100644 --- a/cde/programs/dthelp/parser/pass1/build/sref.c +++ b/cde/programs/dthelp/parser/pass1/build/sref.c @@ -101,13 +101,7 @@ return(TRUE); } /* Add a short reference map name */ -#if defined(M_PROTO) LOGICAL addmapname(M_WCHAR* p, LOGICAL define) -#else -LOGICAL addmapname(p, define) -M_WCHAR *p; -LOGICAL define; -#endif { MAP *old; MAP *new; diff --git a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c index 9c438d01c..19b90905a 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c @@ -66,23 +66,14 @@ void actptrout(array, name) /* Close a code file and write jump table at the end */ -#if defined(M_PROTO) void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto) -#else -void closeiffile(flag, file, count, table, proto) - LOGICAL flag; - FILE *file; - int count; - char *table; - char *proto; -#endif { int i; endcode(flag, file); if (count) { fprintf(file, - "void (*m_%stable[])(\n#if defined(M_PROTO)\n %s\n#endif\n ) = {\n", + "void (*m_%stable[])(%s) = {\n", table, proto); fprintf(file, " m_%s1, /* Place holder for 1-based indexing */\n", table); @@ -94,7 +85,7 @@ void closeiffile(flag, file, count, table, proto) } else fprintf(file, - "void (*m_%stable[1])(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n", + "void (*m_%stable[1])(%s) ;\n", table, proto); fclose(file); } @@ -193,13 +184,7 @@ void done(M_NOPAR) } /* Called when finished reading a section of code from the input file */ -#if defined(M_PROTO) void endcode(LOGICAL flag, FILE *file) -#else -void endcode(flag, file) - LOGICAL flag; - FILE *file; -#endif { if (flag) fprintf(file, "}}\n\n"); } @@ -563,21 +548,13 @@ endcode(*flag, file); *flag = TRUE; /* protoype */ fprintf(file, - "void m_%s%d(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n", + "void m_%s%d(%s) ;\n", prefix, caseno, proto); /* ANSI defines */ -fputs("#if defined(M_PROTO)\n", file); -fprintf(file, "void m_%s%d(%s)\n", prefix, caseno, proto); -fputs("#else\n", file); -fprintf(file, - "void m_%s%d(%s)\n%s\n#endif\n {\n", /* balance the "}" */ - prefix, - caseno, - formal, - formtype); +fprintf(file, "void m_%s%d(%s)\n {\n", prefix, caseno, proto); for (cvarp = cvarlist ; cvarp ; cvarp = cvarp->next) { diff --git a/cde/programs/dthelp/parser/pass1/eltdef/proto.h b/cde/programs/dthelp/parser/pass1/eltdef/proto.h index 6c63ee8b0..0211bba93 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/proto.h +++ b/cde/programs/dthelp/parser/pass1/eltdef/proto.h @@ -28,334 +28,118 @@ /* Proto.h contains function prototypes for program ELTDEF. */ -void actptrout( -#if defined(M_PROTO) - ACTION **array, char *name -#endif - ) ; +void actptrout(ACTION **array, char *name); -void addent( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addent(M_NOPAR); -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -void closeiffile( -#if defined(M_PROTO) - LOGICAL flag, FILE *file, int count, char *table, char *proto -#endif - ) ; +void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto); -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void cvalue( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void cvalue(M_NOPAR); -void done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void done(M_NOPAR); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(M_ENTITY *) -#endif - ) ; + void (*proc)(M_ENTITY *)); -void endcode( -#if defined(M_PROTO) - LOGICAL flag, FILE *file -#endif - ) ; +void endcode(LOGICAL flag, FILE *file); -void endini( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endini(M_NOPAR); -void endsignon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endsignon(M_NOPAR); -void endstring( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endstring(M_NOPAR); -void entout( -#if defined(M_PROTO) - char *fname -#endif - ) ; +void entout(char *fname); -void enttype( -#if defined(M_PROTO) - int type -#endif - ) ; +void enttype(int type); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; +void m_err1(const char *text, const M_WCHAR *arg); -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; +void m_mberr1(char *text, const char *arg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void m_err5( -#if defined(M_PROTO) - char *text, - M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5 -#endif - ) ; +void m_err5(char *text, + M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void freechain( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void freechain(M_NOPAR); -int getachar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int getachar(M_NOPAR); -int *getaction( -#if defined(M_PROTO) - ACTION **array -#endif - ) ; +int *getaction(ACTION **array); -ACTION *getactstruct( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +ACTION *getactstruct(M_NOPAR); -void getname( -#if defined(M_PROTO) - int first -#endif - ) ; +void getname(int first); -int gettoken( -#if defined(M_PROTO) - int *c, int context -#endif - ) ; +int gettoken(int *c, int context); -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_initctype(M_NOPAR); -void initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void initialize(M_NOPAR); -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_letter(M_WCHAR c); -LOGICAL litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; +LOGICAL litproc(int delim); -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +int main(int argc, char **argv); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); -void outpval( -#if defined(M_PROTO) - M_TRIE *p -#endif - ) ; +void outpval(M_TRIE *p); -void outstring( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void outstring(M_NOPAR); -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, M_WCHAR *name -#endif - ) ; +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); -const M_WCHAR *m_partype( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; +const M_WCHAR *m_partype(const int par, const M_WCHAR *string); -int scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int scan(M_NOPAR); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void startcode( -#if defined(M_PROTO) - int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, - char *formal, char *formtype -#endif - ) ; +void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, + char *formal, char *formtype); -void startelement( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void startelement(M_NOPAR); -void storecvar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void storecvar(M_NOPAR); -void storepname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void storepname(M_NOPAR); -void undodelim( -#if defined(M_PROTO) - M_WCHAR *delim -#endif - ) ; +void undodelim(M_WCHAR *delim); -void ungetachar( -#if defined(M_PROTO) - int c -#endif - ) ; +void ungetachar(int c); -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; +int m_mbmbupstrcmp(const char *p, const char *q); -void value( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void value(M_WCHAR *p); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; +void warning1(char *text, M_WCHAR *arg); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser/pass1/helptag/default.c b/cde/programs/dthelp/parser/pass1/helptag/default.c index d04c41f5b..11c542882 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/default.c +++ b/cde/programs/dthelp/parser/pass1/helptag/default.c @@ -30,12 +30,7 @@ Copyright 1988, 1989, 1992 Hewlett-Packard Co. #include "userinc.h" #include "globdec.h" -#if defined(M_PROTO) int vextextsize(const M_WCHAR *keyword) -#else -int vextextsize(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return NORMAL; @@ -47,12 +42,7 @@ m_err1("Unexpected value for ex/vex textsize parameter: %s", keyword); return NORMAL; } -#if defined(M_PROTO) int vgloss(const M_WCHAR *keyword) -#else -int vgloss(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return GLOSS; @@ -63,12 +53,7 @@ m_err1("Unexpected value for gloss parameter: %s", keyword); return GLOSS; } -#if defined(M_PROTO) int vcenter(const M_WCHAR *keyword) -#else -int vcenter(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return CENTER; @@ -80,12 +65,7 @@ m_err1("Unexpected value for center parameter: %s", keyword); return CENTER; } -#if defined(M_PROTO) int vnumber(const M_WCHAR *keyword) -#else -int vnumber(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return NONUMBER; @@ -96,12 +76,7 @@ m_err1("Unexpected value for number parameter: %s", keyword); return NONUMBER; } -#if defined(M_PROTO) LOGICAL vstack(const M_WCHAR *keyword) -#else -LOGICAL vnumber(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return FALSE; @@ -112,12 +87,7 @@ m_err1("Unexpected value for number parameter: %s", keyword); return FALSE; } -#if defined(M_PROTO) int vordertype(const M_WCHAR *keyword) -#else -int vordertype(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return ARABIC; @@ -131,12 +101,7 @@ m_err1("Unexpected list order type: %s", keyword); return ARABIC; } -#if defined(M_PROTO) int vrsectpage(const M_WCHAR *keyword) -#else -int vrsectpage(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return NEWPAGE; @@ -147,12 +112,7 @@ m_err1("Unexpected value for rsectpage parameter: %s", keyword); return NEWPAGE; } -#if defined(M_PROTO) int vlonglabel(const M_WCHAR *keyword) -#else -int vlonglabel(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return WRAP; @@ -163,12 +123,7 @@ m_err1("Unexpected value for longlabel parameter: %s", keyword); return WRAP; } -#if defined(M_PROTO) int vspacing(const M_WCHAR *keyword) -#else -int vspacing(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return LOOSE; @@ -179,12 +134,7 @@ m_err1("Unexpected value for spacing parameter: %s", keyword); return LOOSE; } -#if defined(M_PROTO) int vtype(const M_WCHAR *keyword) -#else -int vtype(keyword) -M_WCHAR *keyword; -#endif /* M_PROTO */ { if (!keyword) return BULLET; diff --git a/cde/programs/dthelp/parser/pass1/helptag/fproto.h b/cde/programs/dthelp/parser/pass1/helptag/fproto.h index a763134f6..e6acb18c2 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/fproto.h +++ b/cde/programs/dthelp/parser/pass1/helptag/fproto.h @@ -24,451 +24,185 @@ /* Copyright (c) 1988, 1989, 1990 Hewlett-Packard Co. */ /* Function prototypes for HP Tag/TeX translator */ -void assert_hometopic_exists( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void assert_hometopic_exists(M_NOPAR); /* conflict with prototype defined for basename() in on osf, so use fbasename */ -void fbasename( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void fbasename(M_NOPAR); -void chapstart( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void chapstart(M_WCHAR *id); -void checkgloss( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void checkgloss(M_NOPAR); -M_WCHAR *checkid( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +M_WCHAR *checkid(M_WCHAR *id); -void checkmsghead ( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void checkmsghead (M_NOPAR); -void dumpxref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void dumpxref(M_NOPAR); -void echohead( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void echohead(M_WCHAR *p); -void mb_echohead( -#if defined(M_PROTO) - char *p -#endif - ) ; +void mb_echohead(char *p); -void endhead( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endhead(M_NOPAR); -void esoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void esoutchar(M_WCHAR textchar); -void vexoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void vexoutchar(M_WCHAR textchar); -void exoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void exoutchar(M_WCHAR textchar); -void imoutchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void imoutchar(M_WCHAR textchar); -int getqualified ( -#if defined(M_PROTO) - M_WCHAR *qualname, M_WCHAR *unqualname -#endif - ) ; +int getqualified (M_WCHAR *qualname, M_WCHAR *unqualname); -void handle_link_and_graphic( -#if defined(M_PROTO) - M_WCHAR *parent, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink, - M_WCHAR *glinktype, M_WCHAR *gdescription -#endif - ); +void handle_link_and_graphic(M_WCHAR *parent, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink, + M_WCHAR *glinktype, M_WCHAR *gdescription); -void idstring( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void idstring(M_WCHAR *string); -void indexchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void indexchar(M_WCHAR textchar); -void Item( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void Item(M_WCHAR *id); -char *m_itoa( -#if defined(M_PROTO) - int n, char *s -#endif - ) ; +char *m_itoa(int n, char *s); -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_letter(M_WCHAR c); -void loadxref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void loadxref(M_NOPAR); -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); -void options( -#if defined(M_PROTO) - LOGICAL filelenonly -#endif - ) ; +void options(LOGICAL filelenonly); -void outchar( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void outchar(M_WCHAR textchar, FILE *outfile ); -void outpi( -#if defined(M_PROTO) - int enttype, M_WCHAR *pi, M_WCHAR *entname -#endif - ) ; +void outpi(int enttype, M_WCHAR *pi, M_WCHAR *entname); -void realoutchar( -#if defined(M_PROTO) - M_WCHAR textchar, FILE *outfile -#endif - ) ; +void realoutchar(M_WCHAR textchar, FILE *outfile); -void rsectstart( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void rsectstart(M_WCHAR *id); -void rseqend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void rseqend(M_NOPAR); -M_WCHAR *searchforfile( -#if defined(M_PROTO) - M_WCHAR *file -#endif - ) ; +M_WCHAR *searchforfile(M_WCHAR *file); -void setid( -#if defined(M_PROTO) - M_WCHAR *id, +void setid(M_WCHAR *id, LOGICAL where, LOGICAL csensitive, LOGICAL inchapter, char *chapter, M_WCHAR *xrffile, int xrfline, - LOGICAL xrefable -#endif - ) ; + LOGICAL xrefable); -void setopt( -#if defined(M_PROTO) - char *string, LOGICAL filelenonly -#endif - ) ; +void setopt(char *string, LOGICAL filelenonly); -LOGICAL setvalopt( -#if defined(M_PROTO) - int thisopt, char *string, LOGICAL filelenonly -#endif - ) ; +LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly); -void shchar( -#if defined(M_PROTO) - M_WCHAR textchar, +void shchar(M_WCHAR textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void mb_shchar( -#if defined(M_PROTO) - char textchar, +void mb_shchar(char textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void shstring( -#if defined(M_PROTO) - M_WCHAR *addstring, +void shstring(M_WCHAR *addstring, int *len, int max, M_WCHAR *storestring, char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void mb_shstring( -#if defined(M_PROTO) - char *addstring, +void mb_shstring(char *addstring, int *len, int max, M_WCHAR *storestring, char *msg, - LOGICAL *errflg -#endif - ) ; + LOGICAL *errflg); -void starthelpnode( -#if defined(M_PROTO) - M_WCHAR *ssi, +void starthelpnode(M_WCHAR *ssi, M_WCHAR *id, - int level -#endif - ) ; + int level); -void mb_starthelpnode( -#if defined(M_PROTO) - char *ssi, +void mb_starthelpnode(char *ssi, char *id, - int level -#endif - ) ; + int level); -void StartLabList( -#if defined(M_PROTO) - M_WCHAR *spacing, - M_WCHAR *longlabel -#endif - ) ; +void StartLabList(M_WCHAR *spacing, + M_WCHAR *longlabel); -void StartList( -#if defined(M_PROTO) - M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont -#endif - ) ; +void StartList(M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont); -void EndList( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void EndList(M_NOPAR); -void strcode( -#if defined(M_PROTO) - M_WCHAR *string, FILE *outfile -#endif - ) ; +void strcode(M_WCHAR *string, FILE *outfile); -void mb_strcode( -#if defined(M_PROTO) - char *string, FILE *outfile -#endif - ) ; +void mb_strcode(char *string, FILE *outfile); -char *strstr( -#if defined(M_PROTO) - const char *s1, const char *s2 -#endif - ) ; +char *strstr(const char *s1, const char *s2); -void svhdstring( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void svhdstring(M_WCHAR *string); -void svtcstring( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void svtcstring(M_WCHAR *string); -void termchar( -#if defined(M_PROTO) - M_WCHAR textchar -#endif - ) ; +void termchar(M_WCHAR textchar); -void termpi( -#if defined(M_PROTO) - int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname -#endif - ) ; +void termpi(int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname); -void texinit( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void texinit(M_NOPAR); -int vextextsize( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vextextsize(const M_WCHAR *keyword); -int vgloss( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vgloss(const M_WCHAR *keyword); -int vcenter( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vcenter(const M_WCHAR *keyword); -int vnumber( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vnumber(const M_WCHAR *keyword); -LOGICAL vstack( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +LOGICAL vstack(const M_WCHAR *keyword); -int vordertype( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vordertype(const M_WCHAR *keyword); -int vlonglabel( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vlonglabel(const M_WCHAR *keyword); -int vspacing( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vspacing(const M_WCHAR *keyword); -int vtype( -#if defined(M_PROTO) - const M_WCHAR *keyword -#endif - ) ; +int vtype(const M_WCHAR *keyword); -void xrefexpand( -#if defined(M_PROTO) - M_WCHAR *id -#endif - ) ; +void xrefexpand(M_WCHAR *id); -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -char *GetDefaultHeaderString( -#if defined(M_PROTO) - char *elementName, +char *GetDefaultHeaderString(char *elementName, unsigned char desiredType, - char *defaultString -#endif - ) ; + char *defaultString); -void SetDefaultLocale( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void SetDefaultLocale(M_NOPAR); -char *MakeMByteString( -#if defined(M_PROTO) - const M_WCHAR *from -#endif - ); +char *MakeMByteString(const M_WCHAR *from); -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); -void paragraph( -#if defined(M_PROTO) - M_WCHAR *indent, +void paragraph(M_WCHAR *indent, M_WCHAR *id, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink, M_WCHAR *glinktype, - M_WCHAR *gdescription -#endif - ); + M_WCHAR *gdescription); -void figure( -#if defined(M_PROTO) - M_WCHAR *number, +void figure( M_WCHAR *number, M_WCHAR *tonumber, M_WCHAR *id, M_WCHAR *file, @@ -476,180 +210,70 @@ void figure( M_WCHAR *cappos, M_WCHAR *ghyperlink, M_WCHAR *glinktype, - M_WCHAR *gdescription -#endif - ); + M_WCHAR *gdescription); -void endterm( -#if defined(M_PROTO) - M_WCHAR *base, +void endterm( M_WCHAR *base, M_WCHAR *gloss, - char *linktype -#endif - ); + char *linktype); -M_WCHAR wc_toupper( -#if defined(M_PROTO) - M_WCHAR wc -#endif - ); +M_WCHAR wc_toupper( M_WCHAR wc); -M_WCHAR *wc_stringtoupper( -#if defined(M_PROTO) - M_WCHAR *wcp -#endif - ); +M_WCHAR *wc_stringtoupper( M_WCHAR *wcp); -int NextId( -#if defined(M_PROTO) - M_NOPAR -#endif -); +int NextId(M_NOPAR); -char *GetLanguage( -#if defined(M_PROTO) - M_NOPAR -#endif -); +char *GetLanguage(M_NOPAR); -char *GetCharset( -#if defined(M_PROTO) - M_NOPAR -#endif -); +char *GetCharset(M_NOPAR); -void HandleLink( -#if defined(M_PROTO) - M_WCHAR *hyperlink, +void HandleLink( M_WCHAR *hyperlink, M_WCHAR *type, - M_WCHAR *description -#endif - ); + M_WCHAR *description); -char *mb_realloc( -#if defined(M_PROTO) - char *ptr, long size -#endif - ); +char *mb_realloc( char *ptr, long size); -char *mb_malloc( -#if defined(M_PROTO) - long size -#endif - ); +char *mb_malloc( long size); -void mb_free( -#if defined(M_PROTO) - char **pptr -#endif - ); +void mb_free( char **pptr); -void Add2ToRowVec( -#if defined(M_PROTO) - int *length, char **rowvec, char *id1, char *id2 -#endif - ); +void Add2ToRowVec( int *length, char **rowvec, char *id1, char *id2); -void StartEx( -#if defined(M_PROTO) -M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize -#endif - ); +void StartEx(M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize); -void EndEx( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void EndEx(M_NOPAR); -void StartNCW( -#if defined(M_PROTO) - char *which -#endif - ); +void StartNCW(char *which); -void StartBlock( -#if defined(M_PROTO) - char *pclass, char *ssi, char *id -#endif - ); +void StartBlock(char *pclass, char *ssi, char *id); -void AddToSNB( -#if defined(M_PROTO) - char *id, char *iconName -#endif - ); +void AddToSNB(char *id, char *iconName); -void StartNCWtext( -#if defined(M_PROTO) - char *which, char *iconFile, char *headingString -#endif - ); +void StartNCWtext(char *which, char *iconFile, char *headingString); -void IncludeToss( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void IncludeToss(M_NOPAR); -M_WCHAR *CycleEnt( -#if defined(M_PROTO) - LOGICAL init, +M_WCHAR *CycleEnt( LOGICAL init, unsigned char *type, M_WCHAR ***content, - unsigned char *wheredef -#endif - ); + unsigned char *wheredef); -void ModifyEntities( -#if defined(M_PROTO) - M_NOPAR -#endif - ); +void ModifyEntities(M_NOPAR); -void PushForm( -#if defined(M_PROTO) - char *class, +void PushForm(char *class, char *ssi, - char *id -#endif - ) ; + char *id); -void PushForm2( -#if defined(M_PROTO) - char *class, +void PushForm2(char *class, char *ssi, char *id1, - char *id2 -#endif - ) ; + char *id2); -void PopForm( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void PopForm(M_NOPAR); -void PopForm2( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void PopForm2(M_NOPAR); -void PopFormMaybe( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void PopFormMaybe(M_NOPAR); -void EmitSavedAnchors( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void EmitSavedAnchors(M_NOPAR); -void CloseVirpage( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void CloseVirpage(M_NOPAR); diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.c b/cde/programs/dthelp/parser/pass1/helptag/help.c index e01c96f5d..3d44ef4e0 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/help.c +++ b/cde/programs/dthelp/parser/pass1/helptag/help.c @@ -349,13 +349,7 @@ m_free(string, "GetDefaultHeaderString return"); /* construct a qualified file name */ -#if defined(M_PROTO) static int mb_getqualified(char *qualname, char *unqualname) -#else -static int mb_getqualified(qualname, unqualname) -char *qualname; -char *unqualname; -#endif { #if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED) FILE *f; @@ -686,12 +680,7 @@ if (!ghyperlink && (glinktype || gdescription)) } /* Process an item in a list */ -#if defined(M_PROTO) void Item(M_WCHAR *id) -#else -void Item(id) -M_WCHAR *id; -#endif { char orderString[32]; static char *ROMAN0[] = @@ -989,16 +978,9 @@ return(NULL); /* Start a new helpnode */ -#if defined(M_PROTO) void starthelpnode(M_WCHAR *ssi, M_WCHAR *id, int level) -#else -void starthelpnode(ssi, id, level) -M_WCHAR *ssi; -M_WCHAR *id; -int level; -#endif { int i; char *mbyte, *mb_ssi; @@ -1052,16 +1034,9 @@ snbstart = ftell(outfile); } /* End starthelpnode(id) */ -#if defined(M_PROTO) void mb_starthelpnode(char *ssi, char *id, int level) -#else -void mb_starthelpnode(ssi, id, level) -char *ssi; -char *id; -int level; -#endif { M_WCHAR *wc_ssi, *wc_id; @@ -1122,15 +1097,10 @@ if (list <= MAXLISTLEV) /* Start a list */ -#if defined(M_PROTO) void StartList(M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont) -#else -void StartList(type, order, spacing, cont) -M_WCHAR *type, *order, *spacing, *cont; -#endif { LIST *nextlist; CONTCHAIN *chain; @@ -1411,17 +1381,10 @@ postpreamble = ftell(outfile); the string returned must be m_free'd. */ char * -#if defined(M_PROTO) GetDefaultHeaderString( char *elementName, unsigned char desiredType, char *defaultString ) -#else -GetDefaultHeaderString(elementName, desiredType, defaultString) -char *elementName; -unsigned char desiredType; -char *defaultString; -#endif { unsigned char type,wheredef; M_WCHAR *content; @@ -1488,13 +1451,7 @@ return ""; * standard versions. */ static void -#if defined(M_PROTO) SetStdLocale(char *pLang, char *pCharset) -#else -SetStdLocale(pLang, pCharset) -char *pLang; -char *pCharset; -#endif { static const char *cString = "C"; static const char *isoString = "ISO-8859-1"; @@ -1621,11 +1578,7 @@ free(lang); * fashion. */ static char * -#if defined(M_PROTO) -GetStdLocale() -#else -GetStdLocale() -#endif +GetStdLocale(void) { static char buffer[256]; static char *cString = "C"; @@ -1784,7 +1737,6 @@ if (charset && (charset != (dotPtr+1))) } -#if defined(M_PROTO) void paragraph(M_WCHAR *indent, M_WCHAR *id, M_WCHAR *gentity, @@ -1792,22 +1744,6 @@ void paragraph(M_WCHAR *indent, M_WCHAR *ghyperlink, M_WCHAR *glinktype, M_WCHAR *gdescription) -#else -void paragraph(indent, - id, - gentity, - gposition, - ghyperlink, - glinktype, - gdescription) -M_WCHAR *indent; -M_WCHAR *id; -M_WCHAR *gentity; -M_WCHAR *gposition; -M_WCHAR *ghyperlink; -M_WCHAR *glinktype; -M_WCHAR *gdescription; -#endif { char *firstString, *indentString; @@ -1851,7 +1787,6 @@ handle_link_and_graphic(m_parent(0), } -#if defined(M_PROTO) void figure( M_WCHAR *number, M_WCHAR *tonumber, @@ -1862,28 +1797,6 @@ void figure( M_WCHAR *ghyperlink, M_WCHAR *glinktype, M_WCHAR *gdescription) -#else -void figure( - number, - tonumber, - id, - file, - figpos, - cappos, - ghyperlink, - glinktype, - gdescription) -M_WCHAR *number; -M_WCHAR *tonumber; -M_WCHAR *id; -M_WCHAR *file; -M_WCHAR *figpos; -M_WCHAR *cappos; -M_WCHAR *border; -M_WCHAR *ghyperlink; -M_WCHAR *glinktype; -M_WCHAR *gdescription; -#endif { char snb_id[32]; unsigned char etype,wheredef; @@ -2113,14 +2026,7 @@ if (ftonumber) m_free(string, "default header string return"); } -#if defined(M_PROTO) void endterm(M_WCHAR *base, M_WCHAR *gloss, char *linktype) -#else -void endterm( base, gloss, linktype) -M_WCHAR *base; -M_WCHAR *gloss; -char *linktype; -#endif { M_WCHAR *p; M_WCHAR dterm[MAXTERM+1]; @@ -2240,12 +2146,7 @@ if (vgloss(gloss) == GLOSS) if (echo) mb_echohead("++"); } -#if defined(M_PROTO) M_WCHAR wc_toupper(M_WCHAR wc) -#else -M_WCHAR wc_toupper(wc) -M_WCHAR wc; -#endif { if ((wc >= 0) && (wc <= 255)) { @@ -2254,12 +2155,7 @@ if ((wc >= 0) && (wc <= 255)) return wc; } -#if defined(M_PROTO) M_WCHAR *wc_stringtoupper(M_WCHAR *wcp) -#else -M_WCHAR *wc_stringtoupper(wcp) -M_WCHAR *wcp; -#endif { M_WCHAR *newstring, *nsp; @@ -2309,14 +2205,7 @@ return pCharset; } -#if defined(M_PROTO) void HandleLink(M_WCHAR *hyperlink, M_WCHAR *type, M_WCHAR *description) -#else -void HandleLink(hyperlink, type, description) -M_WCHAR *hyperlink; -M_WCHAR *type; -M_WCHAR *description; -#endif { char *mb_hyperlink, mb_undefined[64]; char buffer[BIGBUF]; @@ -2472,13 +2361,7 @@ mb_strcode(">", outfile); } -#if defined(M_PROTO) char *mb_realloc(char *ptr, long size) -#else -char *mb_realloc(ptr, size) -char *ptr; -long size; -#endif { void *vptr; size_t ssize; @@ -2498,12 +2381,7 @@ return (char *) vptr; } -#if defined(M_PROTO) char *mb_malloc(long size) -#else -char *mb_malloc(size) -long size; -#endif { char *cptr; size_t ssize; @@ -2521,12 +2399,7 @@ return cptr; } -#if defined(M_PROTO) void mb_free(char **pptr) -#else -void *mb_free(pptr) -char **pptr; -#endif { #if DEBUG_MB_MALLOC @@ -2538,14 +2411,7 @@ free((void *) *pptr); *pptr = NULL; } -#if defined(M_PROTO) static void AddToRowVec(int *length, char **rowvec, char *id) -#else -static void AddToRowVec(length, rowvec, id) -int *length; -char **rowvec; -char *id; -#endif { char tempRowVec[BIGBUF]; int rowVecLen; @@ -2558,14 +2424,7 @@ strcpy(*rowvec + *length - 1, tempRowVec); } -#if defined(M_PROTO) void Add2ToRowVec(int *length, char **rowvec, char *id1, char *id2) -#else -void Add2ToRowVec(length, rowvec, id1, id2) -int *length; -char **rowvec; -char *id1, *id2; -#endif { char tempRowVec[BIGBUF]; int rowVecLen; @@ -2578,14 +2437,7 @@ strcpy(*rowvec + *length - 1, tempRowVec); } -#if defined(M_PROTO) void StartEx(M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize) -#else -void StartEx(*notes, *lines, *textsize) -M_WCHAR *notes; -M_WCHAR *lines; -M_WCHAR *textsize; -#endif { exTextSize = vextextsize(textsize); stackex = vstack(notes); @@ -2601,11 +2453,7 @@ svexlen = 1; } -#if defined(M_PROTO) -void EndEx() -#else -void EndEx() -#endif +void EndEx(void) { char *annotation; int annotLen; @@ -2670,24 +2518,14 @@ if (saveexseg) } -#if defined(M_PROTO) void StartNCW(char *which) -#else -void StartNCW(which) -char *which; -#endif { notehead = FALSE; PushForm(NULL, which, NULL); } -#if defined(M_PROTO) void StartBlock(char *pclass, char *ssi, char *id) -#else -void StartBlock(pclass, ssi, id) -char *pclass, *ssi, *id; -#endif { char localId[32]; char *realId; @@ -2726,14 +2564,7 @@ firstPInBlock = TRUE; } -#if defined(M_PROTO) void StartNCWtext(char *which, char *iconFile, char *headingString) -#else -void StartNCWtext(which, iconFile, headingString) -char *which; -char *iconFile; -char *headingString; -#endif { char *icon, *heading; @@ -2764,13 +2595,7 @@ m_free(icon, "icon name"); } -#if defined(M_PROTO) void AddToSNB(char *id, char *xid) -#else -void AddToSNB(id, xid) -char *id; -char *xid; -#endif { char tmpsnb[BIGBUF]; int snblen; @@ -2794,11 +2619,7 @@ else } -#if defined(M_PROTO) -void IncludeToss() -#else -void IncludeToss() -#endif +void IncludeToss(void) { char pathbuf[BIGBUF]; char *try = pathbuf; @@ -2883,18 +2704,10 @@ mb_free(&mb_inputname); /* Cyclent.c contains procedure m_cyclent(), callable by interface designers, to cycle through all defined entities, returning information about them */ -#if defined(M_PROTO) M_WCHAR *CycleEnt(LOGICAL init, unsigned char *type, M_WCHAR ***content, unsigned char *wheredef) -#else -M_WCHAR *m_cyclent(init, type, content, wheredef) - LOGICAL init ; - unsigned char *type ; - M_WCHAR ***content ; - unsigned char *wheredef ; -#endif { static M_TRIE *current ; static M_TRIE *ancestor[M_NAMELEN + 1] ; @@ -2977,14 +2790,7 @@ while (name = CycleEnt(FALSE, &type, &content, &wheredef)); } -#if defined(M_PROTO) void PushForm(char *class, char *ssi, char *id) -#else -void PushForm(class, ssi, id) - char *class; - char *ssi; - char *id; -#endif { char localId[SDLNAMESIZ+10]; char *realId; @@ -3048,15 +2854,7 @@ needFData = TRUE; } -#if defined(M_PROTO) void PushForm2(char *class, char *ssi, char *id1, char *id2) -#else -void PushForm2(class, ssi, id1, id2) - char *class; - char *ssi; - char *id1; - char *id2; -#endif { char id[32]; int stackSize; diff --git a/cde/programs/dthelp/parser/pass1/helptag/option.c b/cde/programs/dthelp/parser/pass1/helptag/option.c index a10226b70..8c0a187fb 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/option.c +++ b/cde/programs/dthelp/parser/pass1/helptag/option.c @@ -37,12 +37,7 @@ #define TAGDOTOPT "helptag.opt" #define DOTOPT ".opt" -#if defined(M_PROTO) void options(LOGICAL filelenonly) -#else -void options(filelenonly) - LOGICAL filelenonly; -#endif { int i; FILE *optfile; @@ -149,13 +144,7 @@ optval = M_NULLVAL; /* Set a single option */ /* Workonly parameter described with function options()*/ -#if defined(M_PROTO) void setopt(char *string, LOGICAL filelenonly) -#else -void setopt(string, filelenonly) -char *string; -LOGICAL filelenonly; -#endif { char *p; int thisopt; @@ -280,14 +269,7 @@ else switch(thisopt + 1) } /* Process a value for a command line option */ -#if defined(M_PROTO) LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly) -#else -LOGICAL setvalopt(thisopt, string, filelenonly) -int thisopt; -char *string; -LOGICAL filelenonly; -#endif { char *p; int i; diff --git a/cde/programs/dthelp/parser/pass1/helptag/out.c b/cde/programs/dthelp/parser/pass1/helptag/out.c index 3f5ea61e6..e7c5500fc 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/out.c +++ b/cde/programs/dthelp/parser/pass1/helptag/out.c @@ -121,12 +121,7 @@ if (savesnb) /* Process a character in an environment where spaces must be escaped */ -#if defined(M_PROTO) void esoutchar(M_WCHAR textchar) -#else -void esoutchar(textchar) -M_WCHAR textchar; -#endif { static M_WCHAR wsp = 0; @@ -147,12 +142,7 @@ outchar(textchar, outfile); } /* Process a character in a verbatim example */ -#if defined(M_PROTO) void vexoutchar(M_WCHAR textchar) -#else -void vexoutchar(textchar) -M_WCHAR textchar; -#endif { static M_WCHAR wla = 0; char *holdSaveExSeg; @@ -177,12 +167,7 @@ else } /* Process a character in an example */ -#if defined(M_PROTO) void exoutchar(M_WCHAR textchar) -#else -void exoutchar(textchar) -M_WCHAR textchar; -#endif { char exbuff[32]; /* arbitrarily large */ int bufflen; @@ -212,12 +197,7 @@ savex = holdSavex; } /* Process a character in an image paragraph */ -#if defined(M_PROTO) void imoutchar(M_WCHAR textchar) -#else -void imoutchar(textchar) -M_WCHAR textchar; -#endif { char imbuff[32]; /* arbitrarily large */ int bufflen; @@ -240,12 +220,7 @@ else } /* Write a character to be passed to the index file */ -#if defined(M_PROTO) void indexchar(M_WCHAR textchar) -#else -void indexchar(textchar) -M_WCHAR textchar; -#endif { if (idxsavlen + 4 > (sizeof(idxsav) / sizeof(M_WCHAR))) { @@ -257,13 +232,7 @@ idxsav[idxsavlen++] = textchar; /* Processes a data character */ -#if defined(M_PROTO) void outchar(M_WCHAR textchar, FILE *outfile) -#else -void outchar(textchar, outfile) -M_WCHAR textchar; -FILE *outfile; -#endif { M_WCHAR buffer[2]; static M_WCHAR wnl = 0; @@ -333,13 +302,7 @@ if (echo) /* Really output a character */ -#if defined(M_PROTO) void realoutchar(M_WCHAR textchar, FILE *outfile) -#else -void realoutchar(textchar, outfile) -M_WCHAR textchar; -FILE *outfile; -#endif { char mb_textchar[32]; /* arbitrarily large */ int length, i; @@ -379,22 +342,7 @@ if (savtc) /* Save a character in the array used to store table of contents entries when processing a head */ -#if defined(M_PROTO) void shchar(M_WCHAR textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, LOGICAL *errflg) -#else -void shchar(textchar, len, max, string, proc, msg, errflg) -M_WCHAR textchar; -int *len; -int max; -M_WCHAR *string; -void (*proc)( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ); -char *msg; -LOGICAL *errflg; -#endif { char mb_textchar[32]; /* arbitrarily large */ unsigned char index; @@ -427,27 +375,12 @@ else } -#if defined(M_PROTO) void mb_shchar(char textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, LOGICAL *errflg) -#else -void mb_shchar(textchar, len, max, string, proc, msg, errflg) -char textchar; -int *len; -int max; -M_WCHAR *string; -void (*proc)( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ); -char *msg; -LOGICAL *errflg; -#endif { M_WCHAR wc_textchar; @@ -611,12 +544,7 @@ svtclen += length; } /* Process a character in a term */ -#if defined(M_PROTO) void termchar(M_WCHAR textchar) -#else -void termchar(textchar) -M_WCHAR textchar; -#endif { int length; char mb_textchar[32]; /* arbitrarily large */ diff --git a/cde/programs/dthelp/parser/pass1/helptag/xref.c b/cde/programs/dthelp/parser/pass1/helptag/xref.c index be0aac82e..45ad69283 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/xref.c +++ b/cde/programs/dthelp/parser/pass1/helptag/xref.c @@ -339,20 +339,8 @@ while (TRUE) /* Save a cross-reference ID and associated expansion */ -#if defined(M_PROTO) void setid(M_WCHAR *id, LOGICAL where, LOGICAL csensitive, LOGICAL inchapter, char *chapter, M_WCHAR *xrffile, int xrfline, LOGICAL xrefable) -#else -void setid(id, where, csensitive, inchapter, chapter, xrffile, xrfline, xrefable) -M_WCHAR *id; -LOGICAL where; -LOGICAL csensitive; -LOGICAL inchapter; -char *chapter; -M_WCHAR *xrffile; -int xrfline; -LOGICAL xrefable; -#endif { struct xref *old; struct xref *xref; diff --git a/cde/programs/dthelp/parser/pass1/parser/actutil.c b/cde/programs/dthelp/parser/pass1/parser/actutil.c index 04718a302..16092600a 100644 --- a/cde/programs/dthelp/parser/pass1/parser/actutil.c +++ b/cde/programs/dthelp/parser/pass1/parser/actutil.c @@ -107,17 +107,7 @@ int m_findact(elt, array) } /* Recursive procedure called by findact() to search m_action */ -#if defined(M_PROTO) void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild) -#else -void m_findchain(stackptr, start, chainin, chainout, index, wild) - M_PARSE *stackptr; - int start; - int chainin; - int *chainout; - int *index; - LOGICAL wild; -#endif { int node; M_PARSE *stackp; @@ -241,14 +231,7 @@ void m_strtaction(m_elt) } /* Output a start-string or end-string */ -#if defined(M_PROTO) void m_textout(char *format, LOGICAL start, LOGICAL end) -#else -void m_textout(format, start, end) - char *format; - LOGICAL start; - LOGICAL end; -#endif { M_WCHAR name[M_NAMELEN + 1]; int i, par; diff --git a/cde/programs/dthelp/parser/pass1/parser/cyclent.c b/cde/programs/dthelp/parser/pass1/parser/cyclent.c index c6bbddec2..eaa6532f7 100644 --- a/cde/programs/dthelp/parser/pass1/parser/cyclent.c +++ b/cde/programs/dthelp/parser/pass1/parser/cyclent.c @@ -36,15 +36,7 @@ #include "parser.h" #include "entext.h" -#if defined(M_PROTO) M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, unsigned char *wheredef) -#else -M_WCHAR *m_cyclent(init, type, content, wheredef) - LOGICAL init ; - unsigned char *type ; - M_WCHAR **content ; - unsigned char *wheredef ; -#endif { static M_TRIE *current ; static M_TRIE *ancestor[M_NAMELEN + 1] ; diff --git a/cde/programs/dthelp/parser/pass1/parser/entity.c b/cde/programs/dthelp/parser/pass1/parser/entity.c index d747297bc..89390b016 100644 --- a/cde/programs/dthelp/parser/pass1/parser/entity.c +++ b/cde/programs/dthelp/parser/pass1/parser/entity.c @@ -43,13 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "entext.h" /* Process the name in a usemap delaration */ -#if defined(M_PROTO) void m_ckmap(M_WCHAR *name, LOGICAL useoradd) -#else -void m_ckmap(name, useoradd) - M_WCHAR *name ; - LOGICAL useoradd ; -#endif { int mapid ; diff --git a/cde/programs/dthelp/parser/pass1/parser/error.c b/cde/programs/dthelp/parser/pass1/parser/error.c index 8314738ba..58d50cd81 100644 --- a/cde/programs/dthelp/parser/pass1/parser/error.c +++ b/cde/programs/dthelp/parser/pass1/parser/error.c @@ -52,15 +52,9 @@ void m_error(text) } /* Issue error message (one argument) */ -#if defined(M_PROTO) void m_err1( const char *text, const M_WCHAR *arg) -#else -void m_err1(text, arg) - char *text; - M_WCHAR *arg; -#endif { char *buffer, *mb_arg; @@ -77,15 +71,9 @@ m_esuffix(); } -#if defined(M_PROTO) void m_mberr1( const char *text, const char *arg) -#else -void m_err1(text, arg) - char *text; - char *arg; -#endif { M_WCHAR *wc_arg; @@ -95,17 +83,10 @@ void m_err1(text, arg) } /* Issue error message (two arguments) */ -#if defined(M_PROTO) void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2) -#else -void m_err2(text, arg1, arg2) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; -#endif { char *buffer; char *mb_arg1,*mb_arg2; @@ -126,19 +107,11 @@ void m_err2(text, arg1, arg2) } /* Issue error message (three arguments) */ -#if defined(M_PROTO) void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void m_err3(text, arg1, arg2, arg3) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3; @@ -164,21 +137,12 @@ void m_err3(text, arg1, arg2, arg3) } /* Issue error message (four arguments) */ -#if defined(M_PROTO) void m_err4( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4) -#else -void m_err4(text, arg1, arg2, arg3, arg4) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; -#endif { char *buffer; char *mb_arg1, *mb_arg2,*mb_arg3,*mb_arg4; @@ -207,7 +171,6 @@ void m_err4(text, arg1, arg2, arg3, arg4) } /* Issue error message (five arguments) */ -#if defined(M_PROTO) void m_err5( char *text, M_WCHAR *arg1, @@ -215,15 +178,6 @@ void m_err5( M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5) -#else -void m_err5(text, arg1, arg2, arg3, arg4, arg5) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5; @@ -261,7 +215,6 @@ void m_err5(text, arg1, arg2, arg3, arg4, arg5) } /* Issue error message (six arguments) */ -#if defined(M_PROTO) void m_err6( char *text, M_WCHAR *arg1, @@ -270,16 +223,6 @@ void m_err6( M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6) -#else -void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; - M_WCHAR *arg6; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6; @@ -321,7 +264,6 @@ void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6) } /* Issue error message (seven arguments) */ -#if defined(M_PROTO) void m_err7( char *text, M_WCHAR *arg1, @@ -331,17 +273,6 @@ void m_err7( M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7) -#else -void m_err7(text, arg1, arg2, arg3, arg4, arg5, arg6, arg7) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; - M_WCHAR *arg6; - M_WCHAR *arg7; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6, *mb_arg7; diff --git a/cde/programs/dthelp/parser/pass1/parser/findpar.c b/cde/programs/dthelp/parser/pass1/parser/findpar.c index 2a27a0680..7aa28f8b5 100644 --- a/cde/programs/dthelp/parser/pass1/parser/findpar.c +++ b/cde/programs/dthelp/parser/pass1/parser/findpar.c @@ -41,14 +41,7 @@ Returns 0 if elt is not a valid element name, if param is specified but is not a valid parameter name, or if param is NULL and value is not a valid value of any of elt's parameters. */ -#if defined(M_PROTO) int m_findpar( const char *elt , const char *param , const M_WCHAR *value ) -#else -int m_findpar(elt, param, value) -char *elt ; -char *param ; -M_WCHAR *value ; -#endif /* M_PROTO */ { M_ELEMENT eltid ; int par ; diff --git a/cde/programs/dthelp/parser/pass1/parser/param.c b/cde/programs/dthelp/parser/pass1/parser/param.c index 6dd97930a..6d33cbe50 100644 --- a/cde/programs/dthelp/parser/pass1/parser/param.c +++ b/cde/programs/dthelp/parser/pass1/parser/param.c @@ -290,13 +290,7 @@ void m_stkparams(M_NOPAR) } /* Update the default of a parameter whose default is #CURRENT */ -#if defined(M_PROTO) void m_updatedefault(const int par , const M_WCHAR *string ) -#else -void m_updatedefault(par, string) - int par ; - M_WCHAR *string ; -#endif /* M_PROTO */ { if (m_parameter[par - 1].deftype != M_CURRENT && m_parameter[par - 1].deftype != M_CHANGEDCUR) return ; diff --git a/cde/programs/dthelp/parser/pass1/parser/parser.h b/cde/programs/dthelp/parser/pass1/parser/parser.h index b431484f1..3d721d110 100644 --- a/cde/programs/dthelp/parser/pass1/parser/parser.h +++ b/cde/programs/dthelp/parser/pass1/parser/parser.h @@ -345,8 +345,6 @@ M_PAREXTERN int m_wsused ; /* Temporary pointers to parameter values. Used while scanning start tag before element is placed on parse stack.*/ M_PAREXTERN -#if defined M_PROTO -#endif M_WCHAR *m_poccur[ #if defined(M_PARDEF) M_MAXPAR ? M_MAXPAR : 1 diff --git a/cde/programs/dthelp/parser/pass1/parser/parvalok.c b/cde/programs/dthelp/parser/pass1/parser/parvalok.c index 58a124b18..a9aa78455 100644 --- a/cde/programs/dthelp/parser/pass1/parser/parvalok.c +++ b/cde/programs/dthelp/parser/pass1/parser/parvalok.c @@ -34,14 +34,7 @@ /* Function callable by interface designers. Returns TRUE if specified value is a legal value for the indicated parameter of the given element, FALSE otherwise. */ -#if defined(M_PROTO) LOGICAL m_parvalok( M_WCHAR *elt , M_WCHAR *param , const M_WCHAR *value ) -#else -LOGICAL m_parvalok(elt, param, value) - M_WCHAR *elt ; - M_WCHAR *param ; - M_WCHAR *value ; -#endif /* M_PROTO */ { M_ELEMENT eltid ; int par ; diff --git a/cde/programs/dthelp/parser/pass1/parser/proto.h b/cde/programs/dthelp/parser/pass1/parser/proto.h index 2cfe20090..c4abd3070 100644 --- a/cde/programs/dthelp/parser/pass1/parser/proto.h +++ b/cde/programs/dthelp/parser/pass1/parser/proto.h @@ -21,827 +21,283 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 10:24:42 rswiston $ */ -int m_actgetc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_adjuststate( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; - -void m_attval( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL m_attvonly( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -int m_checkstart( -#if defined(M_PROTO) - M_ELEMENT val -#endif - ) ; - -LOGICAL m_ckend( -#if defined(M_PROTO) - M_ELEMENT val, LOGICAL neednet -#endif - ) ; - -void m_ckmap( -#if defined(M_PROTO) - M_WCHAR *name, LOGICAL useoradd -#endif - ) ; - -void m_closent( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -void m_codeent( -#if defined(M_PROTO) - int m_ent -#endif - ) ; - -M_PARSE *m_copystackelt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -M_WCHAR *m_cyclent( -#if defined(M_PROTO) - LOGICAL init, unsigned char *type, M_WCHAR **content, - unsigned char *wheredef -#endif - ) ; - -void m_dispcurelt( -#if defined(M_PROTO) - M_WCHAR *file, int line -#endif - ) ; - -void m_done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_dumpline( -#if defined(M_PROTO) - M_WCHAR *file, int line -#endif - ) ; - -void m_eduptype( -#if defined(M_PROTO) - int type -#endif - ) ; - -M_ELEMENT m_eltname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_endaction( -#if defined(M_PROTO) - M_ELEMENT m_elt -#endif - ) ; - -void m_endcase( -#if defined(M_PROTO) - int m_action -#endif - ) ; - -void m_endtag( -#if defined(M_PROTO) - M_ELEMENT c -#endif - ) ; - -void m_entexpand( -#if defined(M_PROTO) - M_ENTITY *openent -#endif - ) ; - -void m_eprefix( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; - -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; - -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; - -void m_err4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; - -void m_err5( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5 -#endif - ) ; - -void m_err6( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6 -#endif - ) ; - -void m_err7( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7 -#endif - ) ; - -void m_errline( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void m_esuffix( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; - -void m_etcomplete( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_excluded( -#if defined(M_PROTO) - M_ELEMENT elt -#endif - ) ; - -void m_expecting( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_expexpand( -#if defined(M_PROTO) - LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data -#endif - ) ; - -void m_expline( -#if defined(M_PROTO) - LOGICAL *expstart, LOGICAL *data, M_ELEMENT label -#endif - ) ; - -void m_exptend( -#if defined(M_PROTO) - LOGICAL *expstart, M_PARSE *stackptr -#endif - ) ; - -int m_findact( -#if defined(M_PROTO) - M_ELEMENT elt, int *array -#endif - ) ; - -void m_findatt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_findchain( -#if defined(M_PROTO) - M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, - LOGICAL wild -#endif - ) ; - -int m_findpar( -#if defined(M_PROTO) - const char *elt, const char *param, const M_WCHAR *value -#endif - ) ; - -M_ELEMENT m_findunique( -#if defined(M_PROTO) - M_STATE from, int *newleft -#endif - ) ; - -void m_frcend( -#if defined(M_PROTO) - M_ELEMENT val -#endif - ) ; - -void m_frcstart( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; - -void m_freeFSA( -#if defined(M_PROTO) - M_PARSE *stackelt -#endif - ) ; - -void m_freemin( -#if defined(M_PROTO) - M_MIN *min - , char *msg -#endif - ) ; - -void m_freeparam( -#if defined(M_PROTO) - M_PARSE *stackelt -#endif - ) ; - -LOGICAL m_gendelim( -#if defined(M_PROTO) - int srlen, int context -#endif - ) ; - -int m_getachar( -#if defined(M_PROTO) - M_HOLDTYPE *dchar -#endif - ) ; - -int m_getc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -int mb_getwc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -void *m_getdata( -#if defined(M_PROTO) - int n, LOGICAL *flag -#endif - ) ; - -void m_getline( -#if defined(M_PROTO) - M_WCHAR **file, int *line -#endif - ) ; - -void m_getname( -#if defined(M_PROTO) - M_WCHAR first -#endif - ) ; - -void m_getsignon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_gettoken( -#if defined(M_PROTO) - int *c, M_HOLDTYPE *dchar, int context -#endif - ) ; - -void m_globes( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_globss( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_holdproc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_inctest( -#if defined(M_PROTO) - int *count, int limit, char *message -#endif - ) ; - -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_lastchars( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_level( -#if defined(M_PROTO) - M_WCHAR *elt -#endif - ) ; - -int m_mblevel( -#if defined(M_PROTO) - char *elt -#endif - ) ; - -void m_litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; - -void m_longent( -#if defined(M_PROTO) - int context -#endif - ) ; - -LOGICAL m_lookent( -#if defined(M_PROTO) - M_WCHAR *name, unsigned char *type, M_WCHAR **content, - unsigned char *wheredef -#endif - ) ; - -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; - -void m_missingtagc( -#if defined(M_PROTO) - int c, M_HOLDTYPE dchar, LOGICAL start -#endif - ) ; - -LOGICAL m_nextand( -#if defined(M_PROTO) - M_OPENFSA *thisfsa, M_ELEMENT label -#endif - ) ; - -void m_nextdelimchar( -#if defined(M_PROTO) - int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, - unsigned char type -#endif - ) ; - -void m_ntrent( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -void m_nullendtag( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_omitend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_omitstart( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; - -void *m_openent( -#if defined(M_PROTO) - M_WCHAR *entcontent -#endif - ) ; - -void *m_openfirst( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_optstring( -#if defined(M_PROTO) - char *p -#endif - ) ; - -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, M_WCHAR *name -#endif - ) ; - -int m_parcount( -#if defined(M_PROTO) - M_WCHAR *elt -#endif - ) ; - -M_WCHAR *m_pardefault( -#if defined(M_PROTO) - M_WCHAR *elt, M_WCHAR *param, unsigned char *type -#endif - ) ; - -M_WCHAR *m_parent( -#if defined(M_PROTO) - int n -#endif - ) ; - -M_WCHAR *m_parname( -#if defined(M_PROTO) - M_WCHAR *elt, int n -#endif - ) ; - -M_WCHAR *m_mbparname( -#if defined(M_PROTO) - char *elt, int n -#endif - ) ; - -const M_WCHAR *m_partype( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; - -void m_parupper( -#if defined(M_PROTO) - int par, M_WCHAR *string -#endif - ) ; - -LOGICAL m_parvalok( -#if defined(M_PROTO) - M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value -#endif - ) ; - -void m_piaction( -#if defined(M_PROTO) - M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype -#endif - ) ; - -void m_pop( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_push( -#if defined(M_PROTO) - M_ELEMENT elt, M_STATE current, LOGICAL need -#endif - ) ; - -LOGICAL m_putdata( -#if defined(M_PROTO) - void *data, int n -#endif - ) ; - -void m_readcomments( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void *m_realloc( -#if defined(M_PROTO) - void *ptr, int size, char *msg -#endif - ) ; - -int m_scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_setmap( -#if defined(M_PROTO) - int map, LOGICAL useoradd -#endif - ) ; - -void m_setoptions( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_setparam( -#if defined(M_PROTO) - M_WCHAR **cvar, int par -#endif - ) ; - -void m_shortref( -#if defined(M_PROTO) - int context -#endif - ) ; - -void m_showcurelt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_signmsg( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_sigre( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_startdoc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_startmsg( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stcaction( -#if defined(M_PROTO) - M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END -#endif - ) ; - -void m_stcomplete( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stkdefaultparams( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stkonedef( -#if defined(M_PROTO) - int par, M_ELEMENT scanel, M_WCHAR **poccur, int i -#endif - ) ; - -void m_stkparams( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_strtaction( -#if defined(M_PROTO) - M_ELEMENT m_elt -#endif - ) ; - -void m_strtcase( -#if defined(M_PROTO) - int m_action -#endif - ) ; - -void m_strtcdata( -#if defined(M_PROTO) - int scanval -#endif - ) ; - -LOGICAL m_strtproc( -#if defined(M_PROTO) - M_ELEMENT scanval -#endif - ) ; - -void m_strttag( -#if defined(M_PROTO) - M_ELEMENT val, LOGICAL net -#endif - ) ; - -void m_textaction( -#if defined(M_PROTO) - M_WCHAR m_textchar -#endif - ) ; - -void m_textout( -#if defined(M_PROTO) - char *format, LOGICAL start, LOGICAL end -#endif - ) ; - -LOGICAL m_textpermitted( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -M_WCHAR *m_thisfile( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_thisline( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_trace( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_wctrace( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -LOGICAL m_transition( -#if defined(M_PROTO) - M_ELEMENT label, LOGICAL recur -#endif - ) ; - -void m_undodelim( -#if defined(M_PROTO) - M_WCHAR *delim, LOGICAL flag -#endif - ) ; - -void m_ungetachar( -#if defined(M_PROTO) - int c, M_HOLDTYPE dchar, LOGICAL preread -#endif - ) ; - -void m_updatedefault( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; - -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; - -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; - -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; - -LOGICAL m_validinpar( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL m_vldentref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +int m_actgetc(M_NOPAR); + +void m_adjuststate(M_NOPAR); + +LOGICAL m_allwhite(const M_WCHAR *string); + +void m_attval(M_WCHAR *string); + +LOGICAL m_attvonly(M_WCHAR *string); + +int m_checkstart(M_ELEMENT val); + +LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet); + +void m_ckmap(M_WCHAR *name, LOGICAL useoradd); + +void m_closent(void *m_ptr); + +void m_codeent(int m_ent); + +M_PARSE *m_copystackelt(M_NOPAR); + +M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, + unsigned char *wheredef); + +void m_dispcurelt(M_WCHAR *file, int line); + +void m_done(M_NOPAR); + +void m_dumpline(M_WCHAR *file, int line); + +void m_eduptype(int type); + +M_ELEMENT m_eltname(M_NOPAR); + +void m_endaction(M_ELEMENT m_elt); + +void m_endcase(int m_action); + +void m_endtag(M_ELEMENT c); + +void m_entexpand(M_ENTITY *openent); + +void m_eprefix(M_NOPAR); + +void m_err1(const char *text, const M_WCHAR *arg); + +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); + +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); + +void m_err4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); + +void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5); + +void m_err6(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6); + +void m_err7(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7); + +void m_errline(char *p); + +void m_error(char *text); + +void m_esuffix(M_NOPAR); + +void m_exit(int status); + +void m_etcomplete(M_NOPAR); + +LOGICAL m_excluded(M_ELEMENT elt); + +void m_expecting(M_NOPAR); + +void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data); + +void m_expline(LOGICAL *expstart, LOGICAL *data, M_ELEMENT label); + +void m_exptend(LOGICAL *expstart, M_PARSE *stackptr); + +int m_findact(M_ELEMENT elt, int *array); + +void m_findatt(M_NOPAR); + +void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, + LOGICAL wild); + +int m_findpar(const char *elt, const char *param, const M_WCHAR *value); + +M_ELEMENT m_findunique(M_STATE from, int *newleft); + +void m_frcend(M_ELEMENT val); + +void m_frcstart(M_NOPAR); + +void m_free(void *block, char *msg); + +void m_freeFSA(M_PARSE *stackelt); + +void m_freemin(M_MIN *min + , char *msg); + +void m_freeparam(M_PARSE *stackelt); + +LOGICAL m_gendelim(int srlen, int context); + +int m_getachar(M_HOLDTYPE *dchar); + +int m_getc(void *m_ptr); + +int mb_getwc(void *m_ptr); + +void *m_getdata(int n, LOGICAL *flag); + +void m_getline(M_WCHAR **file, int *line); + +void m_getname(M_WCHAR first); + +void m_getsignon(M_NOPAR); + +int m_gettoken(int *c, M_HOLDTYPE *dchar, int context); + +void m_globes(M_NOPAR); + +void m_globss(M_NOPAR); + +void m_holdproc(M_NOPAR); + +void m_inctest(int *count, int limit, char *message); + +void m_initctype(M_NOPAR); + +void m_initialize(M_NOPAR); + +void m_lastchars(M_NOPAR); + +int m_level(M_WCHAR *elt); + +int m_mblevel(char *elt); + +void m_litproc(int delim); + +void m_longent(int context); + +LOGICAL m_lookent(M_WCHAR *name, unsigned char *type, M_WCHAR **content, + unsigned char *wheredef); + +int main(int argc, char **argv); + +void *m_malloc(int size, char *msg); + +void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start); + +LOGICAL m_nextand(M_OPENFSA *thisfsa, M_ELEMENT label); + +void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, + unsigned char type); + +void m_ntrent(M_WCHAR *p); + +void m_nullendtag(M_NOPAR); + +LOGICAL m_omitend(M_NOPAR); + +LOGICAL m_omitstart(M_NOPAR); + +void m_openchk(FILE **ptr, char *name, char *mode); + +void *m_openent(M_WCHAR *entcontent); + +void *m_openfirst(M_NOPAR); + +void m_optstring(char *p); + +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); + +int m_parcount(M_WCHAR *elt); + +M_WCHAR *m_pardefault(M_WCHAR *elt, M_WCHAR *param, unsigned char *type); + +M_WCHAR *m_parent(int n); + +M_WCHAR *m_parname(M_WCHAR *elt, int n); + +M_WCHAR *m_mbparname(char *elt, int n); + +const M_WCHAR *m_partype(const int par, const M_WCHAR *string); + +void m_parupper(int par, M_WCHAR *string); + +LOGICAL m_parvalok(M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value); + +void m_piaction(M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype); + +void m_pop(M_NOPAR); + +void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need); + +LOGICAL m_putdata(void *data, int n); + +void m_readcomments(M_NOPAR); + +void *m_realloc(void *ptr, int size, char *msg); + +int m_scan(M_NOPAR); + +void m_setmap(int map, LOGICAL useoradd); + +void m_setoptions(M_NOPAR); + +void m_setparam(M_WCHAR **cvar, int par); + +void m_shortref(int context); + +void m_showcurelt(M_NOPAR); + +void m_signmsg(char *p); + +void m_sigre(M_NOPAR); + +void m_startdoc(M_NOPAR); + +void m_startmsg(M_NOPAR); + +void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END); + +void m_stcomplete(M_NOPAR); + +void m_stkdefaultparams(M_NOPAR); + +void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i); + +void m_stkparams(M_NOPAR); + +void m_strtaction(M_ELEMENT m_elt); + +void m_strtcase(int m_action); + +void m_strtcdata(int scanval); + +LOGICAL m_strtproc(M_ELEMENT scanval); + +void m_strttag(M_ELEMENT val, LOGICAL net); + +void m_textaction(M_WCHAR m_textchar); + +void m_textout(char *format, LOGICAL start, LOGICAL end); + +LOGICAL m_textpermitted(M_NOPAR); + +M_WCHAR *m_thisfile(M_NOPAR); + +int m_thisline(M_NOPAR); + +void m_trace(char *p); + +void m_wctrace(M_WCHAR *p); + +LOGICAL m_transition(M_ELEMENT label, LOGICAL recur); + +void m_undodelim(M_WCHAR *delim, LOGICAL flag); + +void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread); + +void m_updatedefault(const int par, const M_WCHAR *string); + +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); + +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); + +int m_mbmbupstrcmp(const char *p, const char *q); + +LOGICAL m_validinpar(M_WCHAR *string); + +LOGICAL m_vldentref(M_NOPAR); + +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser/pass1/parser/scan.c b/cde/programs/dthelp/parser/pass1/parser/scan.c index 324019abf..3ee0a6d0e 100644 --- a/cde/programs/dthelp/parser/pass1/parser/scan.c +++ b/cde/programs/dthelp/parser/pass1/parser/scan.c @@ -399,12 +399,7 @@ int m_getachar(dchar) } /* Reads a name token */ -#if defined(M_PROTO) void m_getname(M_WCHAR first) -#else -void m_getname(first) - M_WCHAR first ; -#endif { M_WCHAR *p ; M_HOLDTYPE dchar ; @@ -646,14 +641,7 @@ void m_litproc(delim) } /* Called when a missing tagc delimiter is detected */ -#if defined(M_PROTO) void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start) -#else -void m_missingtagc(c, dchar, start) - int c ; - M_HOLDTYPE dchar ; - LOGICAL start ; -#endif { if (! m_wholetag) { if (start) m_mberr1("Invalid parameter or missing %s", m_tagc); @@ -666,18 +654,8 @@ void m_missingtagc(c, dchar, start) /* Have found one character in a possible short reference delimiter. Prepare to look for the next one */ -#if defined(M_PROTO) void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, unsigned char type) -#else -void m_nextdelimchar(n, i, linestart, newlinestart, skipblank, type) - int *n ; - int i ; - LOGICAL *linestart ; - LOGICAL newlinestart ; - LOGICAL skipblank ; - unsigned char type ; -#endif { int k ; char mb_re,mb_seqchar, mb_rschar; @@ -860,13 +838,7 @@ int m_scan(M_NOPAR) /* Process explicit or implied USEMAP or ADDMAP */ -#if defined(M_PROTO) void m_setmap(int map, LOGICAL useoradd) -#else -void m_setmap(map, useoradd) - int map ; - LOGICAL useoradd ; -#endif { int i ; int sref ; @@ -1084,13 +1056,7 @@ void m_sigre(M_NOPAR) /* Returns a context-dependent delimiter string to input stream so characters can be reread one at a time in another context */ -#if defined(M_PROTO) void m_undodelim(M_WCHAR *delim, LOGICAL flag) -#else -void m_undodelim(delim, flag) - M_WCHAR *delim ; - LOGICAL flag ; -#endif { M_WCHAR *p ; @@ -1107,14 +1073,7 @@ void m_undodelim(delim, flag) /* Place a character on the current input stream. The character may have been scanned and determined not to be part of the current token or it may be in the expansion of an entity*/ -#if defined(M_PROTO) void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread) -#else -void m_ungetachar(c, dchar, preread) - int c ; - M_HOLDTYPE dchar ; - LOGICAL preread ; -#endif { char buffer[10] ; int length; diff --git a/cde/programs/dthelp/parser/pass1/parser/string.c b/cde/programs/dthelp/parser/pass1/parser/string.c index 7efec4fa9..9f2b9c981 100644 --- a/cde/programs/dthelp/parser/pass1/parser/string.c +++ b/cde/programs/dthelp/parser/pass1/parser/string.c @@ -31,14 +31,7 @@ /* Include generated code */ #include "stfile.c" -#if defined(M_PROTO) void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END) -#else -void m_stcaction(m_string, M_START, M_END) - M_WCHAR *m_string ; - LOGICAL M_START ; - LOGICAL M_END ; -#endif { m_stackpar = m_stacktop->stparam ; (*m_sttable[m_stacktop->stccase])(m_string, M_START, M_END) ; diff --git a/cde/programs/dthelp/parser/pass1/parser/struct.c b/cde/programs/dthelp/parser/pass1/parser/struct.c index 9d2a60d7c..ebec96901 100644 --- a/cde/programs/dthelp/parser/pass1/parser/struct.c +++ b/cde/programs/dthelp/parser/pass1/parser/struct.c @@ -88,13 +88,7 @@ int m_checkstart(val) If VAL is not the element at the top of the parse stack, m_ckend checks to see if the end of VAL can validly end nested elements as well. */ -#if defined(M_PROTO) LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet) -#else -LOGICAL m_ckend(val, neednet) - M_ELEMENT val ; - LOGICAL neednet ; - #endif { M_PARSE *stackptr ; M_OPENFSA *fsastack ; @@ -426,14 +420,7 @@ void m_pop(M_NOPAR) /* Pushes a new item onto the parse stack, setting its element, current, and neednet fields as indicated by the parameters*/ -#if defined(M_PROTO) void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need) -#else -void m_push(elt, current, need) - M_ELEMENT elt ; - M_STATE current ; - LOGICAL need ; - #endif { M_PARSE *newstack ; @@ -654,13 +641,7 @@ LOGICAL m_strtproc(scanval) } /* Processes explicit or implied start tag*/ -#if defined(M_PROTO) void m_strttag(M_ELEMENT val, LOGICAL net) -#else -void m_strttag(val, net) - M_ELEMENT val ; - LOGICAL net ; -#endif { m_transition(val, TRUE) ; if (val) { @@ -726,13 +707,7 @@ LOGICAL m_textpermitted(M_NOPAR) /* Returns TRUE iff LABEL allowed in the current state of the current element (without expanding any minimization). May result in changes to the stack of FSA's for this element if and-groups open or close. */ -#if defined(M_PROTO) LOGICAL m_transition(M_ELEMENT label, LOGICAL recur) -#else -LOGICAL m_transition(label, recur) - M_ELEMENT label ; - LOGICAL recur ; -#endif { M_ARC parc ; M_OPENFSA *newfsa ; diff --git a/cde/programs/dthelp/parser/pass1/parser/text.c b/cde/programs/dthelp/parser/pass1/parser/text.c index 6708c6e01..b82148e9c 100644 --- a/cde/programs/dthelp/parser/pass1/parser/text.c +++ b/cde/programs/dthelp/parser/pass1/parser/text.c @@ -36,12 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "tfile.c" /* When a text character occurs */ -#if defined(M_PROTO) void m_textaction(M_WCHAR m_textchar) -#else -void m_textaction(m_textchar) - M_WCHAR m_textchar ; - #endif { char buffer[10] ; char mb_re; diff --git a/cde/programs/dthelp/parser/pass1/util/allwhite.c b/cde/programs/dthelp/parser/pass1/util/allwhite.c index bbe242cb0..7822cf948 100644 --- a/cde/programs/dthelp/parser/pass1/util/allwhite.c +++ b/cde/programs/dthelp/parser/pass1/util/allwhite.c @@ -26,25 +26,12 @@ */ #include "basic.h" -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); /* Test if a string contains only white space characters */ -#if defined(M_PROTO) LOGICAL m_allwhite(const M_WCHAR *string ) -#else -LOGICAL m_allwhite(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { const M_WCHAR *p ; diff --git a/cde/programs/dthelp/parser/pass1/util/basic.h b/cde/programs/dthelp/parser/pass1/util/basic.h index 88cc5c608..9af49823c 100644 --- a/cde/programs/dthelp/parser/pass1/util/basic.h +++ b/cde/programs/dthelp/parser/pass1/util/basic.h @@ -46,87 +46,29 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#if defined(hpux) || defined(__aix) || defined(sun) -/* Old unix stuff - *#define void int - *#define M_NOPAR - */ -/* New Ansi style */ -#define M_PROTO + #define M_NOPAR void -#else -#define M_PROTO -#define M_NOPAR void -#endif -char *MakeMByteString( -#if defined(M_PROTO) - const M_WCHAR *from -#endif - ); +char *MakeMByteString(const M_WCHAR *from); -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); -int w_strcmp( -#if defined(M_PROTO) - const M_WCHAR *string1, const M_WCHAR *string2 -#endif - ); +int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2); -M_WCHAR *w_strcpy( -#if defined(M_PROTO) - M_WCHAR *string1, const M_WCHAR *string2 -#endif - ); +M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2); -M_WCHAR *w_strncpy( -#if defined(M_PROTO) - M_WCHAR *string1, const M_WCHAR *string2, int max -#endif - ); +M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max); -int w_strlen( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ); +int w_strlen(const M_WCHAR *string); -M_WCHAR *w_strchr( -#if defined(M_PROTO) - M_WCHAR *string, const M_WCHAR chr -#endif - ); +M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr); -M_WCHAR *w_strstr( -#if defined(M_PROTO) - M_WCHAR *string1, M_WCHAR *string2 -#endif - ); +M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -int mb_getwc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; +int mb_getwc(void *m_ptr); diff --git a/cde/programs/dthelp/parser/pass1/util/cont.h b/cde/programs/dthelp/parser/pass1/util/cont.h index 598bf91dc..691aa26bf 100644 --- a/cde/programs/dthelp/parser/pass1/util/cont.h +++ b/cde/programs/dthelp/parser/pass1/util/cont.h @@ -37,179 +37,63 @@ This product and information is proprietary of Tandem Computers Incorporated. #define CONTINIT(a) #endif -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpdlmptr( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void dumpdlmptr(M_NOPAR); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)); -void dumptree( -#if defined(M_PROTO) - LOGICAL sparse -#endif - ) ; +void dumptree(LOGICAL sparse); -void enterdelim( -#if defined(M_PROTO) - int n -#endif - ) ; +void enterdelim(int n); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - char *text, char *arg -#endif - ) ; +void m_err1(char *text, char *arg); -void getcode( -#if defined(M_PROTO) - int n -#endif - ) ; +void getcode(int n); -void getcolon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void getcolon(M_NOPAR); -int getContext( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int getContext(M_NOPAR); -LOGICAL getdname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +LOGICAL getdname(M_NOPAR); -void inccon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void inccon(M_NOPAR); -void incdelim( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void incdelim(M_NOPAR); -void loaddelim( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void loaddelim(M_NOPAR); -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +int main(int argc, char **argv); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void nextcon( -#if defined(M_PROTO) - LOGICAL sparse -#endif - ) ; +void nextcon(LOGICAL sparse); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); -void printval( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void printval(FILE *file, M_TRIE *value); -void prtctxt( -#if defined(M_PROTO) - int column, int value -#endif - ) ; +void prtctxt(int column, int value); -int readchar( -#if defined(M_PROTO) - LOGICAL cap -#endif - ) ; +int readchar(LOGICAL cap); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void unread( -#if defined(M_PROTO) - int c -#endif - ) ; +void unread(int c); -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, char *arg -#endif - ) ; +void warning1(char *text, char *arg); -void warning2( -#if defined(M_PROTO) - char *text, char *arg1, char *arg2 -#endif - ) ; +void warning2(char *text, char *arg1, char *arg2); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); #define NOMORE -1 diff --git a/cde/programs/dthelp/parser/pass1/util/conutil.c b/cde/programs/dthelp/parser/pass1/util/conutil.c index bb92fa894..8872d9052 100644 --- a/cde/programs/dthelp/parser/pass1/util/conutil.c +++ b/cde/programs/dthelp/parser/pass1/util/conutil.c @@ -55,12 +55,7 @@ void dumpdlmptr(M_NOPAR) } /* Output the generated data structures */ -#if defined(M_PROTO) void dumptree(LOGICAL sparse) -#else -void dumptree(sparse) - LOGICAL sparse; -#endif { int i, count = 0; @@ -570,12 +565,7 @@ loading = FALSE; } /* Output transition matrix */ -#if defined(M_PROTO) void nextcon(LOGICAL sparse) -#else -void nextcon(sparse) - LOGICAL sparse; -#endif { int i, j; int firstinrow; @@ -642,12 +632,7 @@ void prtctxt(column, value) /* Read the next input character */ -#if defined(M_PROTO) int readchar(LOGICAL cap) -#else -int readchar(cap) - LOGICAL cap; -#endif { int c; M_WCHAR wnl; diff --git a/cde/programs/dthelp/parser/pass1/util/emptyfil.c b/cde/programs/dthelp/parser/pass1/util/emptyfil.c index efd886bd2..1efb397a7 100644 --- a/cde/programs/dthelp/parser/pass1/util/emptyfil.c +++ b/cde/programs/dthelp/parser/pass1/util/emptyfil.c @@ -29,15 +29,7 @@ #endif #include "basic.h" -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void main(argc, argv) - int argc ; - char **argv ; +void main(int argc, char **argv) { if (argc != 2) { fprintf(stderr, "Usage: emptyfil filename\n") ; diff --git a/cde/programs/dthelp/parser/pass1/util/entout.c b/cde/programs/dthelp/parser/pass1/util/entout.c index 2a09dbfc7..5a50fb66e 100644 --- a/cde/programs/dthelp/parser/pass1/util/entout.c +++ b/cde/programs/dthelp/parser/pass1/util/entout.c @@ -25,23 +25,11 @@ /* Entout has procedures to write generated entity TRIE */ -void entptr( -#if defined(M_PROTO) - M_ENTITY *data -#endif - ) ; +void entptr(M_ENTITY *data); -char *typetype( -#if defined(M_PROTO) - int n -#endif - ) ; +char *typetype(int n); -char *typewhere( -#if defined(M_PROTO) - unsigned char n -#endif - ) ; +char *typewhere(unsigned char n); /* Macro names written to output file */ char xdbuild[] = "M_DBUILD" ; @@ -212,12 +200,7 @@ char *typetype(n) } /* Typewhere returns a string indicating where the nth entity was defined.*/ -#if defined(M_PROTO) char *typewhere(unsigned char n) -#else -char *typewhere(n) - unsigned char n ; -#endif { switch(n) { case M_DBUILD: return(xdbuild) ; diff --git a/cde/programs/dthelp/parser/pass1/util/error.c b/cde/programs/dthelp/parser/pass1/util/error.c index 17b36d105..d9274c4c8 100644 --- a/cde/programs/dthelp/parser/pass1/util/error.c +++ b/cde/programs/dthelp/parser/pass1/util/error.c @@ -33,128 +33,47 @@ extern FILE *m_errfile ; extern int m_line ; extern LOGICAL errexit ; -void eprefix( -#if defined(M_PROTO) - LOGICAL flag -#endif - ) ; +void eprefix(LOGICAL flag); -void m_errline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_errline(char *text); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - char *text, const M_WCHAR *arg -#endif - ) ; +void m_err1(char *text, const M_WCHAR *arg); -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; +void m_mberr1(char *text, const char *arg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void m_err5( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, - M_WCHAR *arg5 -#endif - ) ; +void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, + M_WCHAR *arg5); -void esuffix( -#if defined(M_PROTO) - void -#endif - ) ; +void esuffix(void); -void msgline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void msgline(char *text); -void msg1line( -#if defined(M_PROTO) - char *text, char *arg1 -#endif - ) ; +void msg1line(char *text, char *arg1); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void m_wctrace( -#if defined(M_PROTO) - M_WCHAR *text -#endif - ) ; +void m_wctrace(M_WCHAR *text); -void m_trace( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_trace(char *text); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; +void warning1(char *text, M_WCHAR *arg); -void warning2( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2 -#endif - ) ; +void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2); -void warning3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void warning4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; +void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); /* Write error message prefix */ -#if defined(M_PROTO) void eprefix(LOGICAL flag) -#else -void eprefix(flag) - LOGICAL flag ; -#endif { if (flag) errexit = TRUE ; fprintf(stderr, "\n**** ") ; @@ -184,13 +103,7 @@ void m_error(text) /* Writes an error message with one argument to standard error and file "error" */ -#if defined(M_PROTO) void m_err1(char *text, const M_WCHAR *arg) -#else -void m_err1(text, arg) - char *text; - M_WCHAR *arg ; -#endif { char *mb_arg; @@ -203,13 +116,7 @@ skiptoend() ; m_free(mb_arg,"multi-byte string"); } -#if defined(M_PROTO) void m_mberr1(char *text, const char *arg) -#else -void m_err1(text, arg) - char *text; - char *arg ; -#endif { eprefix(TRUE) ; fprintf(stderr, text, arg) ; @@ -220,13 +127,7 @@ skiptoend() ; /* Writes an error message with two arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2) -#else -void m_err2(text, arg1, arg2) -char *text; -M_WCHAR *arg1, *arg2 ; -#endif { char *mb_arg1, *mb_arg2; @@ -243,13 +144,7 @@ m_free(mb_arg2,"multi-byte string"); /* Writes an error message with three arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void m_err3(text, arg1, arg2, arg3) -char *text; -M_WCHAR *arg1, *arg2, *arg3 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3; @@ -268,14 +163,8 @@ m_free(mb_arg3,"multi-byte string"); /* Writes an error message with five arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err5( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5) -#else -void m_err5(text, arg1, arg2, arg3, arg4, arg5) -char *text; -M_WCHAR *arg1, *arg2, *arg3, *arg4, *arg5 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5; @@ -347,13 +236,7 @@ void warning(text) /* Writes a nonfatal error message with one argument to standard error and file "error" */ -#if defined(M_PROTO) void warning1( char *text, M_WCHAR *arg) -#else -void warning1(text, arg) -char *text; -M_WCHAR *arg ; -#endif { char *mb_arg; @@ -367,13 +250,7 @@ m_free(mb_arg,"multi-byte string"); /* Writes a nonfatal error message with two arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2) -#else -void warning2(text, arg1, arg2) -char *text; -M_WCHAR *arg1, *arg2 ; -#endif { char *mb_arg1, *mb_arg2; @@ -389,13 +266,7 @@ m_free(mb_arg2,"multi-byte string"); /* Writes a nonfatal error message with three arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void warning3(text, arg1, arg2, arg3) -char *text; -M_WCHAR *arg1, *arg2, *arg3 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3; @@ -413,14 +284,8 @@ m_free(mb_arg3,"multi-byte string"); /* Writes a nonfatal error message with four arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4) -#else -void warning4(text, arg1, arg2, arg3, arg4) -char *text; -M_WCHAR *arg1, *arg2, *arg3, *arg4 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4; diff --git a/cde/programs/dthelp/parser/pass1/util/exit.c b/cde/programs/dthelp/parser/pass1/util/exit.c index 148d1ece7..04506ec5a 100644 --- a/cde/programs/dthelp/parser/pass1/util/exit.c +++ b/cde/programs/dthelp/parser/pass1/util/exit.c @@ -30,11 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #endif #include "basic.h" -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); /* Exit function called by utilities used in PARSER and other programs in the MARKUP system */ diff --git a/cde/programs/dthelp/parser/pass1/util/fclndir.c b/cde/programs/dthelp/parser/pass1/util/fclndir.c index 771880061..58d2c8498 100644 --- a/cde/programs/dthelp/parser/pass1/util/fclndir.c +++ b/cde/programs/dthelp/parser/pass1/util/fclndir.c @@ -58,23 +58,11 @@ struct data { char linedir[] = "#line" ; char *p = linedir, *q = linedir + 1 ; -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +int main(int argc, char **argv); -void copyfile( -#if defined(m_proto) - char *pfile1, char *pfile2 -#endif - ) ; +void copyfile(char *pfile1, char *pfile2); -int nextchar( -#if defined (M_PROTO) - FILE *file, struct data *data -#endif - ) ; +int nextchar(FILE *file, struct data *data); int main(argc, argv) int argc ; diff --git a/cde/programs/dthelp/parser/pass1/util/inctest.c b/cde/programs/dthelp/parser/pass1/util/inctest.c index a248b7ea8..ee462a27d 100644 --- a/cde/programs/dthelp/parser/pass1/util/inctest.c +++ b/cde/programs/dthelp/parser/pass1/util/inctest.c @@ -30,23 +30,11 @@ #endif #include "basic.h" -void m_err1( -#if defined(M_PROTO) - const char *text, const char *arg -#endif - ) ; +void m_err1(const char *text, const char *arg); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_inctest( -#if defined(M_PROTO) - int *count, int limit, char *message -#endif - ) ; +void m_inctest(int *count, int limit, char *message); /* Increment a count and test against a limit */ void m_inctest(count, limit, message) diff --git a/cde/programs/dthelp/parser/pass1/util/initct.c b/cde/programs/dthelp/parser/pass1/util/initct.c index a51a30081..e655b3d97 100644 --- a/cde/programs/dthelp/parser/pass1/util/initct.c +++ b/cde/programs/dthelp/parser/pass1/util/initct.c @@ -29,12 +29,6 @@ #include "common.h" extern char m_chartype[M_CHARSETLEN] ; -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - void m_initctype(M_NOPAR) { int i ; diff --git a/cde/programs/dthelp/parser/pass1/util/itoa.c b/cde/programs/dthelp/parser/pass1/util/itoa.c index 76f7885e6..9a4e0d95a 100644 --- a/cde/programs/dthelp/parser/pass1/util/itoa.c +++ b/cde/programs/dthelp/parser/pass1/util/itoa.c @@ -27,17 +27,9 @@ #include #include "basic.h" -char *m_itoa( -#if defined(M_PROTO) - int n, char *s -#endif - ) ; +char *m_itoa(int n, char *s); -void reverse( -#if defined(M_PROTO) - char *s -#endif - ) ; +void reverse(char *s); char *m_itoa(n, s) /* convert n to characters in s */ char s[]; diff --git a/cde/programs/dthelp/parser/pass1/util/letter.c b/cde/programs/dthelp/parser/pass1/util/letter.c index f67e9fa52..3f47ccae2 100644 --- a/cde/programs/dthelp/parser/pass1/util/letter.c +++ b/cde/programs/dthelp/parser/pass1/util/letter.c @@ -27,18 +27,7 @@ #include "basic.h" -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; - -#if defined(M_PROTO) LOGICAL m_letter(M_WCHAR c) -#else -LOGICAL m_letter(c) - M_WCHAR c ; -#endif { if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) return(TRUE) ; return(FALSE) ; diff --git a/cde/programs/dthelp/parser/pass1/util/lower.c b/cde/programs/dthelp/parser/pass1/util/lower.c index 22100df94..8dbf041a4 100644 --- a/cde/programs/dthelp/parser/pass1/util/lower.c +++ b/cde/programs/dthelp/parser/pass1/util/lower.c @@ -27,11 +27,7 @@ #include "basic.h" -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); diff --git a/cde/programs/dthelp/parser/pass1/util/malloc.c b/cde/programs/dthelp/parser/pass1/util/malloc.c index ffcdb1c66..69e54ce76 100644 --- a/cde/programs/dthelp/parser/pass1/util/malloc.c +++ b/cde/programs/dthelp/parser/pass1/util/malloc.c @@ -36,53 +36,21 @@ extern LOGICAL m_heapchk ; extern LOGICAL m_malftrace ; -void m_errline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_errline(char *text); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void m_heapdump( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_heapdump(M_NOPAR); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void *m_realloc( -#if defined(M_PROTO) - void *ptr, int size, char *msg -#endif - ) ; +void *m_realloc(void *ptr, int size, char *msg); -void *m_trace( -#if defined(M_PROTO) - char *text -#endif - ) ; +void *m_trace(char *text); -void *m_wctrace( -#if defined(M_PROTO) - M_WCHAR *text -#endif - ) ; +void *m_wctrace(M_WCHAR *text); void m_free(block, msg) void *block ; diff --git a/cde/programs/dthelp/parser/pass1/util/openchk.c b/cde/programs/dthelp/parser/pass1/util/openchk.c index bc97a54e2..4020434c4 100644 --- a/cde/programs/dthelp/parser/pass1/util/openchk.c +++ b/cde/programs/dthelp/parser/pass1/util/openchk.c @@ -33,17 +33,9 @@ extern FILE *m_errfile ; -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); /* Open a file and check that the open succeeded */ void m_openchk(ptr, name, mode) diff --git a/cde/programs/dthelp/parser/pass1/util/paramu.c b/cde/programs/dthelp/parser/pass1/util/paramu.c index d3839b958..5ed0518f0 100644 --- a/cde/programs/dthelp/parser/pass1/util/paramu.c +++ b/cde/programs/dthelp/parser/pass1/util/paramu.c @@ -33,13 +33,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Check to see if string is a valid value for parameter par. If so return a pointer to the keyword if it's a keyword parameter and otherwise a pointer to string. If not valid, return FALSE. */ -#if defined(M_PROTO) const M_WCHAR *m_partype(const int par , const M_WCHAR *string ) -#else -M_WCHAR *m_partype(par, string) - int par ; - M_WCHAR *string ; -#endif /* M_PROTO */ { LOGICAL first = TRUE ; int kw ; diff --git a/cde/programs/dthelp/parser/pass1/util/sparse.h b/cde/programs/dthelp/parser/pass1/util/sparse.h index 8f2645567..7c1df9554 100644 --- a/cde/programs/dthelp/parser/pass1/util/sparse.h +++ b/cde/programs/dthelp/parser/pass1/util/sparse.h @@ -29,11 +29,7 @@ #if defined(sparse) #define m_newcon(i, j) m_sprscon(i, j) -int m_sprscon( -#if defined(M_PROTO) - int i, int j -#endif - ) ; +int m_sprscon(int i, int j); #else #define m_newcon(i, j) m_nextcon[i][j] diff --git a/cde/programs/dthelp/parser/pass1/util/trie.c b/cde/programs/dthelp/parser/pass1/util/trie.c index 109cfe416..629ead8a7 100644 --- a/cde/programs/dthelp/parser/pass1/util/trie.c +++ b/cde/programs/dthelp/parser/pass1/util/trie.c @@ -45,26 +45,12 @@ extern FILE *m_errfile ; extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ; -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void m_entercharintrie( -#if defined(M_PROTO) - M_TRIE **currentnode, M_WCHAR c -#endif - ) ; +void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c); /* Enters the next character of a string into a trie */ -#if defined(M_PROTO) void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c) -#else -void m_entercharintrie(currentnode, c) - M_TRIE **currentnode ; - M_WCHAR c ; -#endif { M_TRIE *newnode ; @@ -112,13 +98,7 @@ M_TRIE *m_gettrienode(M_NOPAR) /* M_lookfortrie(p, xtrie) looks for string p in the specified trie, returning its data value if found and otherwise FALSE */ -#if defined(M_PROTO) void *m_lookfortrie( const M_WCHAR *p , const M_TRIE *xtrie ) -#else -void *m_lookfortrie(p, xtrie) - M_WCHAR *p ; - M_TRIE *xtrie ; -#endif /* M_PROTO */ { M_TRIE *currentnode ; diff --git a/cde/programs/dthelp/parser/pass1/util/trie.h b/cde/programs/dthelp/parser/pass1/util/trie.h index c147fdfeb..a9c595f02 100644 --- a/cde/programs/dthelp/parser/pass1/util/trie.h +++ b/cde/programs/dthelp/parser/pass1/util/trie.h @@ -51,26 +51,10 @@ struct m_ptrie { } ; -M_TRIE *m_gettrienode( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +M_TRIE *m_gettrienode(M_NOPAR); -void *m_lookfortrie( -#if defined(M_PROTO) - const M_WCHAR *p, const M_TRIE *xtrie -#endif - ) ; +void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie); -void *m_ntrtrie( -#if defined(M_PROTO) - M_WCHAR *p, M_TRIE *xtrie, void *dataval -#endif - ) ; +void *m_ntrtrie(M_WCHAR *p, M_TRIE *xtrie, void *dataval); -void *m_resettrie( -#if defined(M_PROTO) - M_TRIE *xtrie, M_WCHAR *p, void *value -#endif - ) ; +void *m_resettrie(M_TRIE *xtrie, M_WCHAR *p, void *value); diff --git a/cde/programs/dthelp/parser/pass1/util/triecnt.c b/cde/programs/dthelp/parser/pass1/util/triecnt.c index 9b7fee2bf..a4d256f50 100644 --- a/cde/programs/dthelp/parser/pass1/util/triecnt.c +++ b/cde/programs/dthelp/parser/pass1/util/triecnt.c @@ -31,24 +31,12 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, + void (*proc)(FILE *file, void *value)); -void printval( -#if defined(M_PROTO) - FILE *file, void *value -#endif - ) ; +void printval(FILE *file, void *value); /* Count the descendants of a node in order to generate declarations for the packed form of a trie*/ @@ -71,12 +59,7 @@ void dumpnode(first, file, trieptr, count, proc) FILE *file ; M_TRIE *trieptr ; int *count ; - void (*proc) ( -#if defined (M_PROTO) - FILE *file, - void *value -#endif - ) ; + void (*proc) (FILE *file, void *value); { M_TRIE *p ; int savecount ; diff --git a/cde/programs/dthelp/parser/pass1/util/triedump.c b/cde/programs/dthelp/parser/pass1/util/triedump.c index 1e62280bc..4a16ceff8 100644 --- a/cde/programs/dthelp/parser/pass1/util/triedump.c +++ b/cde/programs/dthelp/parser/pass1/util/triedump.c @@ -29,18 +29,10 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(void *value) -#endif - ) ; +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, + void (*proc)(void *value)); /* Write the C declaration of a trie */ void m_dumptrie(file, xtrie, extname, count, proc) @@ -48,11 +40,7 @@ void m_dumptrie(file, xtrie, extname, count, proc) M_TRIE *xtrie ; char *extname ; int *count ; - void (*proc)( -#if defined(M_PROTO) - void *value -#endif - ) ; + void (*proc)(void *value); { int firstson ; M_TRIE *p ; diff --git a/cde/programs/dthelp/parser/pass1/util/triepdmp.c b/cde/programs/dthelp/parser/pass1/util/triepdmp.c index 83be1c831..2b2e72e68 100644 --- a/cde/programs/dthelp/parser/pass1/util/triepdmp.c +++ b/cde/programs/dthelp/parser/pass1/util/triepdmp.c @@ -29,25 +29,13 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, + void (*proc)(FILE *file, void *value)); -void dumpptrie( -#if defined(M_PROTO) - M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, + void (*proc)(FILE *file, void *value)); /* Write the declaration of a packed trie to the specified files */ void dumpptrie(intname, extname, file, externdef, defdef, proc) @@ -56,12 +44,7 @@ void dumpptrie(intname, extname, file, externdef, defdef, proc) FILE *file ; char *externdef ; char *defdef ; - void (*proc) ( -#if defined (M_PROTO) - FILE *file, - void *value -#endif - ) ; + void (*proc) (FILE *file, void *value); { LOGICAL first = TRUE ; int count = 0 ; diff --git a/cde/programs/dthelp/parser/pass1/util/trieplk.c b/cde/programs/dthelp/parser/pass1/util/trieplk.c index 5754f5201..129a86524 100644 --- a/cde/programs/dthelp/parser/pass1/util/trieplk.c +++ b/cde/programs/dthelp/parser/pass1/util/trieplk.c @@ -36,12 +36,8 @@ extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ; -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, - M_WCHAR *name -#endif - ) ; +int m_packedlook(M_PTRIE *xptrie, + M_WCHAR *name); /* Look for the string NAME in the packed trie PTRIE */ int m_packedlook(xptrie, name) diff --git a/cde/programs/dthelp/parser/pass1/util/upcmp8.c b/cde/programs/dthelp/parser/pass1/util/upcmp8.c index c221a7f42..a176ccc71 100644 --- a/cde/programs/dthelp/parser/pass1/util/upcmp8.c +++ b/cde/programs/dthelp/parser/pass1/util/upcmp8.c @@ -32,30 +32,13 @@ #include "common.h" extern M_CHARTYPE m_ctarray[256] ; -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; +int m_mbmbupstrcmp(const char *p, const char *q); -#if defined(M_PROTO) int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q ) -#else -int m_wcupstrcmp(p, q) - M_WCHAR *p, *q ; -#endif /* M_PROTO */ { do { if (m_ctupper(*p) < m_ctupper(*q)) return(-1) ; @@ -65,13 +48,7 @@ int m_wcupstrcmp(p, q) return(0) ; } -#if defined(M_PROTO) int m_wcmbupstrcmp(const M_WCHAR *p, const char *q) -#else -int m_wcmbupstrcmp(p, q) - M_WCHAR *p; - char *q ; -#endif { M_WCHAR *wc; int retval; @@ -82,13 +59,7 @@ int m_wcmbupstrcmp(p, q) return retval; } -#if defined(M_PROTO) int m_mbmbupstrcmp(const char *p, const char *q) -#else -int m_mbmbupstrcmp(p, q) - char *p; - char *q ; -#endif { M_WCHAR *w_p, *w_q; int retval; diff --git a/cde/programs/dthelp/parser/pass1/util/upper.c b/cde/programs/dthelp/parser/pass1/util/upper.c index 3463346b3..160e932c9 100644 --- a/cde/programs/dthelp/parser/pass1/util/upper.c +++ b/cde/programs/dthelp/parser/pass1/util/upper.c @@ -29,14 +29,7 @@ #include "basic.h" -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; - -int m_upper(c) - int c ; +int m_upper(int c) { if (c >= 'a' && c <= 'z') c += 'A' - 'a' ; return(c) ; diff --git a/cde/programs/dthelp/parser/pass1/util/upstrcmp.c b/cde/programs/dthelp/parser/pass1/util/upstrcmp.c index 3eaa6a64a..753d52f65 100644 --- a/cde/programs/dthelp/parser/pass1/util/upstrcmp.c +++ b/cde/programs/dthelp/parser/pass1/util/upstrcmp.c @@ -29,20 +29,9 @@ #include "basic.h" -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -int m_upstrcmp( -#if defined(M_PROTO) - char *p, char *q -#endif - ) ; - -int m_upstrcmp(p, q) - char *p, *q ; +int m_upstrcmp(char *p, char *q) { do { if (m_upper((int) *p) < m_upper((int) *q)) return(-1) ; diff --git a/cde/programs/dthelp/parser/pass1/util/wchar.c b/cde/programs/dthelp/parser/pass1/util/wchar.c index 556d41159..4d2167f33 100644 --- a/cde/programs/dthelp/parser/pass1/util/wchar.c +++ b/cde/programs/dthelp/parser/pass1/util/wchar.c @@ -32,13 +32,7 @@ /* compare two wide character strings */ -#if defined(M_PROTO) int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2) -#else -int w_strcmp(string1, string2) -M_WCHAR *string1; -M_WCHAR *string2; -#endif { M_WCHAR c1, c2, null; @@ -60,13 +54,7 @@ while (1) /* copy a wide character string */ -#if defined(M_PROTO) M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2) -#else -M_WCHAR *w_strcpy(string1, string2) -M_WCHAR *string1; -M_WCHAR *string2; -#endif { M_WCHAR *string1start; @@ -79,14 +67,7 @@ return string1start; /* copy a wide character string, stopping after "max" moves */ -#if defined(M_PROTO) M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max) -#else -M_WCHAR *w_strncpy(string1, string2, max) -M_WCHAR *string1; -M_WCHAR *string2; -int max; -#endif { M_WCHAR *string1start; @@ -99,12 +80,7 @@ return string1start; /* get the length of a wide character string */ -#if defined(M_PROTO) int w_strlen(const M_WCHAR *string) -#else -int w_strlen(string) -M_WCHAR *string; -#endif { int length; @@ -117,12 +93,7 @@ return length; /* find wide character "chr" in wide string "string" */ -#if defined(M_PROTO) M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr) -#else -M_WCHAR *w_strchr(string, chr) -M_WCHAR *string, chr; -#endif { M_WCHAR *where; @@ -142,12 +113,7 @@ else /* find wide character "chr" in wide string "string" */ -#if defined(M_PROTO) M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2) -#else -M_WCHAR *w_strstr(string1, string2) -M_WCHAR *string1, *string2; -#endif { M_WCHAR *where1, *where2; @@ -182,12 +148,7 @@ return NULL; /* make a multi-byte string from a wide character string */ -#if defined(M_PROTO) char *MakeMByteString(const M_WCHAR *wc_string) -#else -char *MakeMByteString(wc_string) -M_WCHAR *wc_string; -#endif { char *mb_string; int length, retVal; @@ -217,12 +178,7 @@ return mb_string; /* make a wide character string from a multi-byte string */ -#if defined(M_PROTO) M_WCHAR *MakeWideCharString(const char *mb_string) -#else -M_WCHAR *MakeWideCharString(mb_string) -char *mb_string; -#endif { M_WCHAR *wc_string, *wc_stringStart; int length, incr; diff --git a/cde/programs/dthelp/parser/pass1/util/whitesp.c b/cde/programs/dthelp/parser/pass1/util/whitesp.c index 4fec412c2..cf410bcdc 100644 --- a/cde/programs/dthelp/parser/pass1/util/whitesp.c +++ b/cde/programs/dthelp/parser/pass1/util/whitesp.c @@ -27,19 +27,8 @@ #include "basic.h" -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; - /* Test if character c is a blank, tab, or carriage return */ -#if defined(M_PROTO) LOGICAL m_whitespace(M_WCHAR c) -#else -LOGICAL m_whitespace(c) - M_WCHAR c ; -#endif { char mb_c[32]; /* arbitrarily large */ int length; diff --git a/cde/programs/dthelp/parser/pass2/build/build.h b/cde/programs/dthelp/parser/pass2/build/build.h index 07f60ab6e..7a917f0b3 100644 --- a/cde/programs/dthelp/parser/pass2/build/build.h +++ b/cde/programs/dthelp/parser/pass2/build/build.h @@ -421,8 +421,4 @@ BUILDEXTERN LOGICAL entrule BUILDINIT(FALSE) ; BUILDEXTERN M_WCHAR genname[M_NAMELEN + sizeof(M_PREFIX)] ; -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); diff --git a/cde/programs/dthelp/parser/pass2/build/fsa.c b/cde/programs/dthelp/parser/pass2/build/fsa.c index c19875cd1..ad8067f84 100644 --- a/cde/programs/dthelp/parser/pass2/build/fsa.c +++ b/cde/programs/dthelp/parser/pass2/build/fsa.c @@ -37,18 +37,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Addarc adds an arc from FSA state to state setting other fields as indicated by the other parameters.*/ -#if defined(M_PROTO) int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, int id, LOGICAL minim, ELTSTRUCT **errelt) -#else -int addarc(from, to, label, and, optional, id, minim, errelt) - STATE *from, *to ; - ELTSTRUCT *label ; - ANDGROUP *and ; - LOGICAL optional ; - int id ; - LOGICAL minim ; - ELTSTRUCT **errelt ; -#endif { ARC *parc, *qarc ; int determ ; @@ -630,12 +619,7 @@ LOGICAL samelabelarc(a, s) /* Saves the name of an element appearing on the left-hand side of a grammar rule */ -#if defined(M_PROTO) void savelhs(LOGICAL param) -#else -void savelhs(param) - LOGICAL param ; -#endif { STATE *end ; ELTSTRUCT *errelt ; diff --git a/cde/programs/dthelp/parser/pass2/build/param.c b/cde/programs/dthelp/parser/pass2/build/param.c index b852e2310..d46f7bb67 100644 --- a/cde/programs/dthelp/parser/pass2/build/param.c +++ b/cde/programs/dthelp/parser/pass2/build/param.c @@ -124,12 +124,7 @@ newpar->ptypep = NULL ; /* Check that specified default value is legal parameter value */ -#if defined(M_PROTO) LOGICAL checkdefault( const M_WCHAR *string ) -#else -LOGICAL checkdefault(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { const M_WCHAR *p ; int len ; @@ -205,12 +200,7 @@ switch (newpar->type) /* Normalize parameter default. Change tabs and RE's to spaces, capitalize all letters (unless type is CDATA), remove extra space in lists */ -#if defined(M_PROTO) void normdefault(M_WCHAR *string ) -#else -void normdefault(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { M_WCHAR *p, *q ; int i, ret ; @@ -296,12 +286,7 @@ ruleinit() ; } /* Make string the default for the current parameter of the current element */ -#if defined(M_PROTO) void setdefault(const M_WCHAR *string) -#else -void setdefault() -M_WCHAR *string; -#endif /* M_PROTO */ { PTYPE *kw ; int keycount ; diff --git a/cde/programs/dthelp/parser/pass2/build/proto.h b/cde/programs/dthelp/parser/pass2/build/proto.h index 0bd0eb0c1..115f1e9a0 100644 --- a/cde/programs/dthelp/parser/pass2/build/proto.h +++ b/cde/programs/dthelp/parser/pass2/build/proto.h @@ -28,587 +28,203 @@ /* Proto.h contains function prototypes for program BUILD. */ -int addarc( -#if defined(M_PROTO) - STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, - int id, LOGICAL minim, ELTSTRUCT **errelt -#endif - ) ; +int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, + int id, LOGICAL minim, ELTSTRUCT **errelt); -void adddefent( -#if defined(M_PROTO) - M_WCHAR *mapname -#endif - ) ; +void adddefent(M_WCHAR *mapname); -LOGICAL addent( -#if defined(M_PROTO) - M_WCHAR *name -#endif - ) ; +LOGICAL addent(M_WCHAR *name); -void addex( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addex(M_NOPAR); -void addkeyword( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addkeyword(M_NOPAR); -LOGICAL addmapname( -#if defined(M_PROTO) - M_WCHAR *p, LOGICAL define -#endif - ) ; +LOGICAL addmapname(M_WCHAR *p, LOGICAL define); -void addndent( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void addndent(M_WCHAR *p); -void addpar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addpar(M_NOPAR); -void addsref( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void addsref(M_WCHAR *p); -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -void checkand( -#if defined(M_PROTO) - ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root, - ELTSTRUCT **errelt -#endif - ) ; +void checkand(ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root, + ELTSTRUCT **errelt); -LOGICAL checkdefault( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL checkdefault(const M_WCHAR *string); -int checkdfsa( -#if defined(M_PROTO) - STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt -#endif - ) ; +int checkdfsa(STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt); -int checkrepeat( -#if defined(M_PROTO) - STATE *from, ANDGROUP *and, ELTSTRUCT **errelt -#endif - ) ; +int checkrepeat(STATE *from, ANDGROUP *and, ELTSTRUCT **errelt); -void copyintolist( -#if defined(M_PROTO) - STATELIST *from, STATELIST **to -#endif - ) ; +void copyintolist(STATELIST *from, STATELIST **to); -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void defmapname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void defmapname(M_NOPAR); -char *deftype( -#if defined(M_PROTO) - int n -#endif - ) ; +char *deftype(int n); -void dellist( -#if defined(M_PROTO) - STATELIST **list -#endif - ) ; +void dellist(STATELIST **list); -void delstartarcs( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void delstartarcs(M_NOPAR); -void done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void done(M_NOPAR); -void dumpentnode( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void dumpentnode(FILE *file, M_TRIE *value); -void dumpmapnode( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void dumpmapnode(FILE *file, M_TRIE *value); -void dumpsrefnode( -#if defined(M_PROTO) - FILE *file, - M_TRIE *value -#endif - ) ; +void dumpsrefnode(FILE *file, + M_TRIE *value); -void dumpptrie( -#if defined(M_PROTO) - M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, - void (*proc)( FILE *, M_TRIE *) -#endif - ) ; +void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, + void (*proc)( FILE *, M_TRIE *)); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(M_ENTITY *) -#endif - ) ; - -void eltblocks( -#if defined(M_PROTO) - FILE *tempfile -#endif - ) ; - -void eltreeout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void endmodel( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void entout( -#if defined(M_PROTO) - char *fname -#endif - ) ; - -char *enttype( -#if defined(M_PROTO) - int n -#endif - ) ; - -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; - -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; - -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; - -void exout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; - -void freetree( -#if defined(M_PROTO) - TREE *ruletree -#endif - ) ; - -void found( -#if defined(M_PROTO) - LOGICAL *flag, char *delim -#endif - ) ; - -void fsa( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int getachar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -ANDGROUP *getand( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL getname( -#if defined(M_PROTO) - int first -#endif - ) ; - -STATE *getstate( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int gettoken( -#if defined(M_PROTO) - int *c, int context -#endif - ) ; - -TREE *gettreenode( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; - -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void makeand( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root, int optional -#endif - ) ; - -LOGICAL makefsa( -#if defined(M_PROTO) - TREE *root, int optional -#endif - ) ; - -void makeor( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root -#endif - ) ; - -void makeseq( -#if defined(M_PROTO) - LOGICAL *canbenull, TREE *root, int optional -#endif - ) ; - -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; - -void msgline( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void msg1line( -#if defined(M_PROTO) - char *text, char *arg1 -#endif - ) ; - -void nondeterm( -#if defined(M_PROTO) - TREE *root, int c, ELTSTRUCT *eltp -#endif - ) ; - -void normdefault( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL notinlist( -#if defined(M_PROTO) - STATELIST *item, STATELIST *list -#endif - ) ; - -ELTSTRUCT *ntrelt( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; - -void parout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -char *partype( -#if defined(M_PROTO) - int n -#endif - ) ; - -LOGICAL permitspcd( -#if defined(M_PROTO) - ARC *a -#endif - ) ; - -void pop( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void prulend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void push( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL regenerate( -#if defined(M_PROTO) - TREE *start, TREE *stop -#endif - ) ; - -void repeat( -#if defined(M_PROTO) - TREE *root -#endif - ) ; - -void ruleinit( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void rulend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL samelabelarc( -#if defined(M_PROTO) - ARC *a, STATE *s -#endif - ) ; - -void savelhs( -#if defined(M_PROTO) - LOGICAL param -#endif - ) ; - -void savestartarcs( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void setdefault( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; - -void simplebranch( -#if defined(M_PROTO) - TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional -#endif - ) ; - -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_sprscon( -#if defined(M_PROTO) - int i, int j -#endif - ) ; - -void srefout( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -STATE *startfsa( -#if defined(M_PROTO) - TREE *root, LOGICAL *canbenull -#endif - ) ; - -void tempelt( -#if defined(M_PROTO) - ELTSTRUCT *eltp, FILE *tempfile -#endif - ) ; - -void template( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -char *typecon( -#if defined(M_PROTO) - int n -#endif - ) ; - -void undodelim( -#if defined(M_PROTO) - M_WCHAR *delim -#endif - ) ; - -void ungetachar( -#if defined(M_PROTO) - int c -#endif - ) ; - -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; - -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; - -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; - -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; - -void warning2( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2 -#endif - ) ; - -void warning3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; - -void warning4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; - -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; + void (*proc)(M_ENTITY *)); + +void eltblocks(FILE *tempfile); + +void eltreeout(M_NOPAR); + +void endmodel(M_NOPAR); + +void entout(char *fname); + +char *enttype(int n); + +void m_error(char *text); + +void m_err1(const char *text, const M_WCHAR *arg); + +void m_mberr1(char *text, const char *arg); + +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); + +void exout(M_NOPAR); + +void m_free(void *block, char *msg); + +void freetree(TREE *ruletree); + +void found(LOGICAL *flag, char *delim); + +void fsa(M_NOPAR); + +int getachar(M_NOPAR); + +ANDGROUP *getand(M_NOPAR); + +LOGICAL getname(int first); + +STATE *getstate(M_NOPAR); + +int gettoken(int *c, int context); + +TREE *gettreenode(M_NOPAR); + +void m_initctype(M_NOPAR); + +void initialize(M_NOPAR); + +LOGICAL litproc(int delim); + +int main(int argc, char **argv); + +void makeand(LOGICAL *canbenull, TREE *root, int optional); + +LOGICAL makefsa(TREE *root, int optional); + +void makeor(LOGICAL *canbenull, TREE *root); + +void makeseq(LOGICAL *canbenull, TREE *root, int optional); + +void *m_malloc(int size, char *msg); + +void msgline(char *text); + +void msg1line(char *text, char *arg1); + +void nondeterm(TREE *root, int c, ELTSTRUCT *eltp); + +void normdefault(M_WCHAR *string); + +LOGICAL notinlist(STATELIST *item, STATELIST *list); + +ELTSTRUCT *ntrelt(M_WCHAR *p); + +void m_openchk(FILE **ptr, char *name, char *mode); + +void parout(M_NOPAR); + +char *partype(int n); + +LOGICAL permitspcd(ARC *a); + +void pop(M_NOPAR); + +void prulend(M_NOPAR); + +void push(M_NOPAR); + +LOGICAL regenerate(TREE *start, TREE *stop); + +void repeat(TREE *root); + +void ruleinit(M_NOPAR); + +void rulend(M_NOPAR); + +LOGICAL samelabelarc(ARC *a, STATE *s); + +void savelhs(LOGICAL param); + +void savestartarcs(M_NOPAR); + +int scan(M_NOPAR); + +void setdefault(const M_WCHAR *string); + +void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional); + +void skiptoend(M_NOPAR); + +int m_sprscon(int i, int j); + +void srefout(M_NOPAR); + +STATE *startfsa(TREE *root, LOGICAL *canbenull); + +void tempelt(ELTSTRUCT *eltp, FILE *tempfile); + +void template(M_NOPAR); + +char *typecon(int n); + +void undodelim(M_WCHAR *delim); + +void ungetachar(int c); + +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); + +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); + +int m_mbmbupstrcmp(const char *p, const char *q); + +void warning(char *text); + +void warning1(char *text, M_WCHAR *arg); + +void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2); + +void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); + +void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); + +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser/pass2/build/sref.c b/cde/programs/dthelp/parser/pass2/build/sref.c index 1bb4cb31d..990c13ca0 100644 --- a/cde/programs/dthelp/parser/pass2/build/sref.c +++ b/cde/programs/dthelp/parser/pass2/build/sref.c @@ -101,13 +101,7 @@ return(TRUE); } /* Add a short reference map name */ -#if defined(M_PROTO) LOGICAL addmapname(M_WCHAR* p, LOGICAL define) -#else -LOGICAL addmapname(p, define) -M_WCHAR *p; -LOGICAL define; -#endif { MAP *old; MAP *new; diff --git a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c index 0371e0048..8624f460b 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c @@ -66,23 +66,14 @@ void actptrout(array, name) /* Close a code file and write jump table at the end */ -#if defined(M_PROTO) void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto) -#else -void closeiffile(flag, file, count, table, proto) - LOGICAL flag; - FILE *file; - int count; - char *table; - char *proto; -#endif { int i; endcode(flag, file); if (count) { fprintf(file, - "void (*m_%stable[])(\n#if defined(M_PROTO)\n %s\n#endif\n ) = {\n", + "void (*m_%stable[])(%s) = {\n", table, proto); fprintf(file, " m_%s1, /* Place holder for 1-based indexing */\n", table); @@ -94,7 +85,7 @@ void closeiffile(flag, file, count, table, proto) } else fprintf(file, - "void (*m_%stable[1])(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n", + "void (*m_%stable[1])(%s) ;\n", table, proto); fclose(file); } @@ -193,13 +184,7 @@ void done(M_NOPAR) } /* Called when finished reading a section of code from the input file */ -#if defined(M_PROTO) void endcode(LOGICAL flag, FILE *file) -#else -void endcode(flag, file) - LOGICAL flag; - FILE *file; -#endif { if (flag) fprintf(file, "}}\n\n"); } @@ -563,21 +548,13 @@ endcode(*flag, file); *flag = TRUE; /* protoype */ fprintf(file, - "void m_%s%d(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n", + "void m_%s%d(%s);\n", prefix, caseno, proto); /* ANSI defines */ -fputs("#if defined(M_PROTO)\n", file); -fprintf(file, "void m_%s%d(%s)\n", prefix, caseno, proto); -fputs("#else\n", file); -fprintf(file, - "void m_%s%d(%s)\n%s\n#endif\n {\n", /* balance the "}" */ - prefix, - caseno, - formal, - formtype); +fprintf(file, "void m_%s%d(%s)\n {\n", prefix, caseno, proto); for (cvarp = cvarlist ; cvarp ; cvarp = cvarp->next) { diff --git a/cde/programs/dthelp/parser/pass2/eltdef/proto.h b/cde/programs/dthelp/parser/pass2/eltdef/proto.h index 71f49e892..4c1a059bb 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/proto.h +++ b/cde/programs/dthelp/parser/pass2/eltdef/proto.h @@ -28,334 +28,118 @@ /* Proto.h contains function prototypes for program ELTDEF. */ -void actptrout( -#if defined(M_PROTO) - ACTION **array, char *name -#endif - ) ; +void actptrout(ACTION **array, char *name); -void addent( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void addent(M_NOPAR); -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -void closeiffile( -#if defined(M_PROTO) - LOGICAL flag, FILE *file, int count, char *table, char *proto -#endif - ) ; +void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto); -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void cvalue( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void cvalue(M_NOPAR); -void done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void done(M_NOPAR); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(M_ENTITY *) -#endif - ) ; + void (*proc)(M_ENTITY *)); -void endcode( -#if defined(M_PROTO) - LOGICAL flag, FILE *file -#endif - ) ; +void endcode(LOGICAL flag, FILE *file); -void endini( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endini(M_NOPAR); -void endsignon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endsignon(M_NOPAR); -void endstring( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void endstring(M_NOPAR); -void entout( -#if defined(M_PROTO) - char *fname -#endif - ) ; +void entout(char *fname); -void enttype( -#if defined(M_PROTO) - int type -#endif - ) ; +void enttype(int type); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; +void m_err1(const char *text, const M_WCHAR *arg); -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; +void m_mberr1(char *text, const char *arg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void m_err5( -#if defined(M_PROTO) - char *text, - M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5 -#endif - ) ; +void m_err5(char *text, + M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void freechain( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void freechain(M_NOPAR); -int getachar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int getachar(M_NOPAR); -int *getaction( -#if defined(M_PROTO) - ACTION **array -#endif - ) ; +int *getaction(ACTION **array); -ACTION *getactstruct( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +ACTION *getactstruct(M_NOPAR); -void getname( -#if defined(M_PROTO) - int first -#endif - ) ; +void getname(int first); -int gettoken( -#if defined(M_PROTO) - int *c, int context -#endif - ) ; +int gettoken(int *c, int context); -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_initctype(M_NOPAR); -void initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void initialize(M_NOPAR); -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_letter(M_WCHAR c); -LOGICAL litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; +LOGICAL litproc(int delim); -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +int main(int argc, char **argv); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); -void outpval( -#if defined(M_PROTO) - M_TRIE *p -#endif - ) ; +void outpval(M_TRIE *p); -void outstring( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void outstring(M_NOPAR); -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, M_WCHAR *name -#endif - ) ; +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); -const M_WCHAR *m_partype( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; +const M_WCHAR *m_partype(const int par, const M_WCHAR *string); -int scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int scan(M_NOPAR); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void startcode( -#if defined(M_PROTO) - int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, - char *formal, char *formtype -#endif - ) ; +void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, + char *formal, char *formtype); -void startelement( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void startelement(M_NOPAR); -void storecvar( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void storecvar(M_NOPAR); -void storepname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void storepname(M_NOPAR); -void undodelim( -#if defined(M_PROTO) - M_WCHAR *delim -#endif - ) ; +void undodelim(M_WCHAR *delim); -void ungetachar( -#if defined(M_PROTO) - int c -#endif - ) ; +void ungetachar(int c); -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; +int m_mbmbupstrcmp(const char *p, const char *q); -void value( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; +void value(M_WCHAR *p); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; +void warning1(char *text, M_WCHAR *arg); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser/pass2/htag2/fproto.h b/cde/programs/dthelp/parser/pass2/htag2/fproto.h index f52bfd4ec..a5ce22b48 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/fproto.h +++ b/cde/programs/dthelp/parser/pass2/htag2/fproto.h @@ -25,269 +25,93 @@ /* Function prototypes for HP Tag/TeX translator */ -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); -void options( -#if defined(M_PROTO) - LOGICAL filelenonly -#endif - ) ; +void options(LOGICAL filelenonly); -void setopt( -#if defined(M_PROTO) - char *string, LOGICAL filelenonly -#endif - ) ; +void setopt(char *string, LOGICAL filelenonly); -LOGICAL setvalopt( -#if defined(M_PROTO) - int thisopt, char *string, LOGICAL filelenonly -#endif - ) ; +LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly); -char *strstr( -#if defined(M_PROTO) - const char *s1, const char *s2 -#endif - ) ; +char *strstr(const char *s1, const char *s2); -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -char *MakeMByteString( -#if defined(M_PROTO) - const M_WCHAR *from -#endif - ); +char *MakeMByteString(const M_WCHAR *from); -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); -void PutString( -#if defined(M_PROTO) - char *string -#endif - ) ; +void PutString(char *string); -void PutWString( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +void PutWString(M_WCHAR *string); -void PutWChar( -#if defined(M_PROTO) - M_WCHAR wchar -#endif - ) ; +void PutWChar(M_WCHAR wchar); -void SaveWChar( -#if defined(M_PROTO) - M_WCHAR wchar -#endif - ) ; +void SaveWChar(M_WCHAR wchar); -void OpenTag( -#if defined(M_PROTO) - LOGICAL hasAttributes, - LOGICAL newlineOK -#endif - ) ; +void OpenTag(LOGICAL hasAttributes, + LOGICAL newlineOK); -void CloseTag( -#if defined(M_PROTO) - LOGICAL newlineOK -#endif - ) ; +void CloseTag(LOGICAL newlineOK); -void ImpliedlAttribute( -#if defined(M_PROTO) - char *name, - M_WCHAR *value -#endif - ) ; +void ImpliedlAttribute(char *name, + M_WCHAR *value); -void RequiredAttribute( -#if defined(M_PROTO) - char *name, - M_WCHAR *value -#endif - ) ; +void RequiredAttribute(char *name, + M_WCHAR *value); -M_WCHAR *CopyWString( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; +M_WCHAR *CopyWString(M_WCHAR *string); -void MakeNewElement( -#if defined(M_PROTO) - ElementTypes type -#endif - ) ; +void MakeNewElement(ElementTypes type); -void DeleteElement( -#if defined(M_PROTO) - ElementPtr pElement -#endif - ) ; +void DeleteElement(ElementPtr pElement); -void OptimizeAndEmit( -#if defined(M_PROTO) - ElementPtr pVirpage -#endif - ) ; +void OptimizeAndEmit(ElementPtr pVirpage); -void PushCurrentElement( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void PushCurrentElement(M_NOPAR); -void PopCurrentElement( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void PopCurrentElement(M_NOPAR); -char *mb_realloc( -#if defined(M_PROTO) - char *ptr, long size -#endif - ); +char *mb_realloc( char *ptr, long size); -char *mb_malloc( -#if defined(M_PROTO) - long size -#endif - ); +char *mb_malloc( long size); -void mb_free( -#if defined(M_PROTO) - char **pptr -#endif - ); +void mb_free( char **pptr); -void EmitSDL( -#if defined(M_PROTO) - ElementPtr pVirpage -#endif - ) ; +void EmitSDL(ElementPtr pVirpage); -int OpenFile( -#if defined(M_PROTO) - char *name, int type, int code -#endif - ) ; +int OpenFile(char *name, int type, int code); -int ReadFile( -#if defined(M_PROTO) - int fd, char *name, char *buffer, int amount, int code -#endif - ) ; +int ReadFile(int fd, char *name, char *buffer, int amount, int code); -int WriteFile( -#if defined(M_PROTO) - int fd, char *name, char *buffer, int amount, int code -#endif - ) ; +int WriteFile(int fd, char *name, char *buffer, int amount, int code); -int FileExists( -#if defined(M_PROTO) - char *name -#endif - ) ; +int FileExists(char *name); -void AssertFileIsReadable( -#if defined(M_PROTO) - char *name, int code -#endif - ) ; +void AssertFileIsReadable(char *name, int code); -int FileSize( -#if defined(M_PROTO) - char *name, int code -#endif - ) ; +int FileSize(char *name, int code); -void CloseFile( -#if defined(M_PROTO) - int fd, char *name, int code -#endif - ) ; +void CloseFile(int fd, char *name, int code); -FILE *FopenFile( -#if defined(M_PROTO) - char *name, int type, int code -#endif - ) ; +FILE *FopenFile(char *name, int type, int code); -int GetALine( -#if defined(M_PROTO) - FILE *file, char *name, char *line, int max, int code -#endif - ) ; +int GetALine(FILE *file, char *name, char *line, int max, int code); -int FreadFile( -#if defined(M_PROTO) - FILE *file, char *name, char *buffer, int amount, int code -#endif - ) ; +int FreadFile(FILE *file, char *name, char *buffer, int amount, int code); -void FwriteFile( -#if defined(M_PROTO) - FILE *file, char *name, char *buffer, size_t amount, int code -#endif - ) ; +void FwriteFile(FILE *file, char *name, char *buffer, size_t amount, int code); -void FcloseFile( -#if defined(M_PROTO) - FILE *file, char *name, int code -#endif - ) ; +void FcloseFile(FILE *file, char *name, int code); -int StringToUpper( -#if defined(M_PROTO) - char *string -#endif - ) ; +int StringToUpper(char *string); -void BuildIndex( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void BuildIndex(M_NOPAR); -void OpenDocument( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void OpenDocument(M_NOPAR); -void CloseDocument( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void CloseDocument(M_NOPAR); -void UpdateTossFileName( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void UpdateTossFileName(M_NOPAR); -void SetLocale( -#if defined(M_PROTO) - M_WCHAR *pLang, M_WCHAR *pCharset -#endif - ) ; +void SetLocale(M_WCHAR *pLang, M_WCHAR *pCharset); diff --git a/cde/programs/dthelp/parser/pass2/htag2/option.c b/cde/programs/dthelp/parser/pass2/htag2/option.c index 19a01dfad..1c63a4980 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/option.c +++ b/cde/programs/dthelp/parser/pass2/htag2/option.c @@ -37,12 +37,7 @@ #define TAGDOTOPT "helptag.opt" #define DOTOPT ".opt" -#if defined(M_PROTO) void options(LOGICAL filelenonly) -#else -void options(filelenonly) - LOGICAL filelenonly; -#endif { int i; FILE *optfile; @@ -149,13 +144,7 @@ optval = M_NULLVAL; /* Set a single option */ /* Workonly parameter described with function options()*/ -#if defined(M_PROTO) void setopt(char *string, LOGICAL filelenonly) -#else -void setopt(string, filelenonly) -char *string; -LOGICAL filelenonly; -#endif { char *p; int thisopt; @@ -207,14 +196,7 @@ else switch(thisopt + 1) } /* Process a value for a command line option */ -#if defined(M_PROTO) LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly) -#else -LOGICAL setvalopt(thisopt, string, filelenonly) -int thisopt; -char *string; -LOGICAL filelenonly; -#endif { char *p; int i; diff --git a/cde/programs/dthelp/parser/pass2/htag2/out.c b/cde/programs/dthelp/parser/pass2/htag2/out.c index a4eaa2f19..1f8029b9f 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/out.c +++ b/cde/programs/dthelp/parser/pass2/htag2/out.c @@ -27,22 +27,12 @@ #include "userinc.h" #include "globdec.h" -#if defined(M_PROTO) void PutString(char *string) -#else -void PutString(string) -char *string; -#endif { fputs(string, outFile); } -#if defined(M_PROTO) void PutWString(M_WCHAR *string) -#else -void PutWString(string) -M_WCHAR *string; -#endif { char *mb_string; @@ -51,12 +41,7 @@ fputs(mb_string, outFile); m_free(mb_string, "Multi-byte string"); } -#if defined(M_PROTO) void PutWChar(M_WCHAR wchar) -#else -void PutWChar(wchar) -M_WCHAR wchar; -#endif { M_WCHAR wc_string[2]; char *mb_string; @@ -68,12 +53,7 @@ fputs(mb_string, outFile); m_free(mb_string, "Multi-byte string"); } -#if defined(M_PROTO) void SaveWChar(M_WCHAR wchar) -#else -void SaveWChar(wchar) -M_WCHAR wchar; -#endif { CDATA_el *pCdata; diff --git a/cde/programs/dthelp/parser/pass2/htag2/sdl.c b/cde/programs/dthelp/parser/pass2/htag2/sdl.c index 0a4f9e567..07641eb90 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/sdl.c +++ b/cde/programs/dthelp/parser/pass2/htag2/sdl.c @@ -51,12 +51,7 @@ static int nIds; static char wideCharacterString[] = "wide character string"; -#if defined(M_PROTO) char *mb_malloc(long size) -#else -char *mb_malloc(size) -long size; -#endif { char *cptr; size_t ssize; @@ -74,12 +69,7 @@ return cptr; } -#if defined(M_PROTO) void mb_free(char **pptr) -#else -void *mb_free(pptr) -char **pptr; -#endif { #if DEBUG_MB_MALLOC @@ -92,13 +82,7 @@ free((void *) *pptr); } -#if defined(M_PROTO) char *mb_realloc(char *ptr, long size) -#else -char *mb_realloc(ptr, size) -char *ptr; -long size; -#endif { void *vptr; size_t ssize; @@ -118,13 +102,7 @@ return (char *) vptr; } -#if defined(M_PROTO) void OpenTag(LOGICAL hasAttributes, LOGICAL newlineOK) -#else -void OpenTag(hasAttributes, newlineOK) - LOGICAL hasAttributes; - LOGICAL newlineOK; -#endif { PutString("<"); PutWString(m_parent(0)); @@ -137,14 +115,7 @@ if (!hasAttributes) } -#if defined(M_PROTO) static void OpenNamedTag(char *name, LOGICAL hasAttributes, LOGICAL newlineOK) -#else -static void OpenNamedTag(name, hasAttributes, newlineOK) - LOGICAL hasAttributes; - LOGICAL newlineOK; - char *name; -#endif { PutString("<"); PutString(name); @@ -157,12 +128,7 @@ if (!hasAttributes) } -#if defined(M_PROTO) void CloseTag(LOGICAL newlineOK) -#else -void CloseTag(newlineOK) - LOGICAL newlineOK; -#endif { char *etagc; @@ -176,13 +142,7 @@ PutString(etagc); } -#if defined(M_PROTO) static void CloseNamedTag(char *name, LOGICAL newlineOK) -#else -static void CloseNamedTag(name, newlineOK) - LOGICAL newlineOK; - char *name; -#endif { char *etagc; @@ -196,13 +156,7 @@ PutString(etagc); } -#if defined(M_PROTO) void ImpliedAttribute(char *name, M_WCHAR *value) -#else -void ImpliedAttribute(name, value) - char *name; - M_WCHAR *value; -#endif { if (value) { @@ -215,13 +169,7 @@ if (value) } -#if defined(M_PROTO) void RequiredAttribute(char *name, M_WCHAR *value) -#else -void RequiredAttribute(name, value) - char *name; - M_WCHAR *value; -#endif { M_WCHAR null; M_WCHAR *wc_name; @@ -242,12 +190,7 @@ PutString("\""); } -#if defined(M_PROTO) M_WCHAR *CopyWString(M_WCHAR *string) -#else -M_WCHAR *CopyWString(string) - M_WCHAR *string; -#endif { M_WCHAR *retVal; @@ -259,12 +202,7 @@ return retVal; } -#if defined(M_PROTO) void MakeNewElement(ElementTypes type) -#else -void MakeNewElement(type) - ElementTypes type; -#endif { pCurrentElement = (ElementPtr) mb_malloc(sizeof(Element)); memset((void *) pCurrentElement, 0, sizeof(Element)); @@ -278,12 +216,7 @@ if (type == e_cdata) } -#if defined(M_PROTO) void DeleteElement(ElementPtr pElement) -#else -void DeleteElement(pElement) - ElementPtr pElement; -#endif { switch (pElement->type) { @@ -952,12 +885,7 @@ static ElementPtr *thisElementStack; static int thisElementStackSize = 0; static int thisElementStackTop = -1; -#if defined(M_PROTO) static void PushThisElement(ElementPtr pThis) -#else -static void PushThisElement(pThis) - ElementPtr pThis; -#endif { thisElementStackTop++; if (thisElementStackSize == 0) @@ -1017,12 +945,7 @@ return pThisElement; * the .sdl file. These occurrences are an artifact of translation * and seem to be easier to get rid of here than in the first pass. */ -#if defined(M_PROTO) static void RemoveSuperfluousBlocks(ElementPtr *ppBlockOrForm) -#else -static void RemoveSuperfluousBlocks(ppBlockOrForm) - ElementPtr *ppBlockOrForm; -#endif { ElementPtr pElement, pFdata; ElementPtr *ppBack; @@ -1061,12 +984,7 @@ while (pElement) } -#if defined(M_PROTO) static void ReplaceFormWithBlock(ElementPtr *ppBlockOrForm) -#else -static void ReplaceFormWithBlock(ppBlockOrForm) - ElementPtr ppBlockOrForm; -#endif { ElementPtr pElement, pFstyle, pFrowvec, pFdata, pSubElement; ElementPtr *ppBack; @@ -1250,12 +1168,7 @@ m_free(wc_quote1, wideCharacterString); } -#if defined(M_PROTO) static void OptimizeSDL(ElementPtr *ppBlockOrForm) -#else -static void OptimizeSDL(ppBlockOrForm) - ElementPtr ppBlockOrForm; -#endif { ReplaceFormWithBlock(ppBlockOrForm); RemoveSuperfluousBlocks(ppBlockOrForm); @@ -1266,20 +1179,11 @@ RemoveSuperfluousBlocks(ppBlockOrForm); * update the offsets when adding the INDEX and LOIDS; also when * compressing the VSTRUCT */ -#if defined(M_PROTO) static void AddToLOIDS(char *pElementName, M_WCHAR *pwcId, M_WCHAR *pwcSSI, M_WCHAR *pwcLevel, long int virpageOffset) -#else -static void AddToLOIDS(pElementName, pwcId, pwcSSI, pwcLevel, virpageOffset) -char *pElementName; -M_WCHAR *pwcId; -M_WCHAR *pwcSSI; -M_WCHAR *pwcLevel; -long int virpageOffset; -#endif { LoidsPtr pNewId; @@ -1312,14 +1216,7 @@ pLoidsEnd = pNewId; /* compress or decompress a file; return the size after (de)compression */ -#if defined(M_PROTO) static int Compress(char *fileName, char *zFileName, LOGICAL doCompress) -#else -int Compress(fileName, zFileName, doCompress) - char *fileName; - char *zFileName; - LOGICAL doCompress; -#endif { char cmd[BUFSIZ]; int errStatus; @@ -1550,14 +1447,7 @@ unlink(compZFileName); /* A function too lookup a TOSS element and mark it as used if the * lookup succeeds. */ -#if defined(M_PROTO) static void MarkUsedStyle(M_WCHAR *level, M_WCHAR *class, M_WCHAR *ssi) -#else -static void MarkUsedStyle(level, class, ssi) - M_WCHAR *level; - M_WCHAR *class; - M_WCHAR *ssi; -#endif { ElementPtr pThis; M_WCHAR *rlevel = NULL, *rclass = NULL, *rssi = NULL; @@ -1619,13 +1509,7 @@ while (pThis) /* Look for "rid" in the "pSnb" list. Return the element if found, * NULL otherwise. */ -#if defined(M_PROTO) static ElementPtr LookupInSnb(ElementPtr pSnb, M_WCHAR *rid) -#else -static ElementPtr LookupInSnb(pSnb, rid) - ElementPtr pSnb; - M_WCHAR *rid; -#endif { ElementPtr pThis; M_WCHAR **pId; @@ -1694,12 +1578,7 @@ return NULL; * nodes in the sub-tree are either marked or all clear. Once a clear * node is found, the tree is not descended further. */ -#if defined(M_PROTO) static void ClearTree(ElementPtr pRoot) -#else -static void ClearTree(pRoot) - ElementPtr pRoot; -#endif { ElementPtr pThis; static char errMess[] = @@ -2351,12 +2230,7 @@ while (pThis) /* A function to mark all elements in the TOSS that have been used * by the document up to this point. */ -#if defined(M_PROTO) static void MarkUsedTOSS(ElementPtr pRoot) -#else -static void MarkUsedTOSS(pRoot) - ElementPtr pRoot; -#endif { ElementPtr pParent, pSnb, pItem, pThis; static char errMess[] = @@ -3374,12 +3248,7 @@ while (pThis) } -#if defined(M_PROTO) void EmitSDL(ElementPtr pRoot) -#else -void EmitSDL(pRoot) - ElementPtr pRoot; -#endif { ElementPtr pThis, pThat; long int virpageOffset; @@ -4945,12 +4814,7 @@ if (doCompression) } -#if defined(M_PROTO) void OptimizeAndEmit(ElementPtr pVirpage) -#else -void OptimizeAndEmit(pVirpage) - ElementPtr pVirpage; -#endif { if (optimizeFlag) OptimizeSDL(&(pVirpage->u.u_virpage.pBlockOrForm)); @@ -5115,14 +4979,7 @@ strcat(vstructFileName, "vstr"); * Of course, when using the unbuffered versions we attempt to read in * BUFSIZ characters at a time. */ -#if defined(M_PROTO) int OpenFile(char *name, int type, int code) -#else -int OpenFile(name, type, code) - char *name; - int type; - int code; -#endif { int fd; int oflag, mode; @@ -5157,16 +5014,7 @@ return fd; } -#if defined(M_PROTO) int ReadFile(int fd, char *name, char *buffer, int amount, int code) -#else -int ReadFile(fd, name, buffer, amount, code) - int fd; - char *name; - char *buffer; - int amount; - int code; -#endif { int length; @@ -5185,16 +5033,7 @@ return length; } -#if defined(M_PROTO) int WriteFile(int fd, char *name, char *buffer, int amount, int code) -#else -int WriteFile(fd, name, buffer, amount, code) -int fd; - char *name; - char *buffer; - int amount; - int code; -#endif { int length; @@ -5213,25 +5052,14 @@ return length; } -#if defined(M_PROTO) int FileExists(char *name) -#else -int FileExists(name) - char *name; -#endif { if (access(name, F_OK) == 0) return 1; return 0; } -#if defined(M_PROTO) void AssertFileIsReadable(char *name, int code) -#else -void AssertFileIsReadable(name, code) - char *name; - int code; -#endif { if (access(name, R_OK) == -1) { @@ -5250,13 +5078,7 @@ if (access(name, R_OK) == -1) } -#if defined(M_PROTO) int FileSize(char *name, int code) -#else -int FileSize(name, code) - char *name; - int code; -#endif { struct stat buf; @@ -5279,14 +5101,7 @@ return buf.st_size; } -#if defined(M_PROTO) void CloseFile(int fd, char *name, int code) -#else -void CloseFile(fd, name, code) - int fd; - char *name; - int code; -#endif { if (close(fd) == -1) { @@ -5302,14 +5117,7 @@ if (close(fd) == -1) } -#if defined(M_PROTO) FILE * FopenFile(char *name, int type, int code) -#else -FILE * FopenFile(name, type, code) - char *name; - int type; - int code; -#endif { FILE *file; char *mode; @@ -5363,16 +5171,7 @@ return file; } -#if defined(M_PROTO) int GetALine(FILE *file, char *name, char *line, int max, int code) -#else -int GetALine(file, name, line, max, code) - FILE *file; - char *name; - char *line; - int max; - int code; -#endif { char *pc; int length; @@ -5425,16 +5224,7 @@ return length; } -#if defined(M_PROTO) int FreadFile(FILE *file, char *name, char *buffer, int amount, int code) -#else -int FreadFile(file, name, buffer, amount, code) - FILE *file; - char *name; - char *buffer; - int amount; - int code; -#endif { int length; @@ -5453,16 +5243,7 @@ return length; } -#if defined(M_PROTO) void FwriteFile(FILE *file, char *name, char *buffer, size_t amount, int code) -#else -void FwriteFile(file, name, buffer, amount, code) - FILE *file; - char *name; - char *buffer; - size_t amount; - int code; -#endif { if (fwrite(buffer, 1, amount, file) != amount) { @@ -5478,14 +5259,7 @@ if (fwrite(buffer, 1, amount, file) != amount) } -#if defined(M_PROTO) void FcloseFile(FILE *file, char *name, int code) -#else -void FcloseFile(file, name, code) - FILE *file; - char *name; - int code; -#endif { if (fclose(file) != 0) { @@ -5501,12 +5275,7 @@ if (fclose(file) != 0) } -#if defined(M_PROTO) int StringToUpper(char *string) -#else -int StringToUpper(string) - char *string; -#endif { char *pc, c; @@ -6691,18 +6460,10 @@ unlink(tempFileName); /* Cyclent.c contains procedure m_cyclent(), callable by interface designers, to cycle through all defined entities, returning information about them */ -#if defined(M_PROTO) static M_WCHAR *CycleEnt(LOGICAL init, unsigned char *type, M_WCHAR ***content, unsigned char *wheredef) -#else -static M_WCHAR *m_CycleEnt(init, type, content, wheredef) - LOGICAL init ; - unsigned char *type ; - M_WCHAR ***content ; - unsigned char *wheredef ; -#endif { static M_TRIE *current ; static M_TRIE *ancestor[M_NAMELEN + 1] ; @@ -6782,13 +6543,7 @@ while (name = CycleEnt(FALSE, &type, &content, &wheredef)); * standard versions. */ void -#if defined(M_PROTO) SetLocale(M_WCHAR *pLang, M_WCHAR *pCharset) -#else -SetLocale(pLang, pCharset) -M_WCHAR *pLang; -M_WCHAR *pCharset; -#endif { const char cString[] = "C"; _DtXlateDb myDb = NULL; diff --git a/cde/programs/dthelp/parser/pass2/parser/actutil.c b/cde/programs/dthelp/parser/pass2/parser/actutil.c index 949c5fe79..16c6a1e88 100644 --- a/cde/programs/dthelp/parser/pass2/parser/actutil.c +++ b/cde/programs/dthelp/parser/pass2/parser/actutil.c @@ -107,17 +107,7 @@ int m_findact(elt, array) } /* Recursive procedure called by findact() to search m_action */ -#if defined(M_PROTO) void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild) -#else -void m_findchain(stackptr, start, chainin, chainout, index, wild) - M_PARSE *stackptr; - int start; - int chainin; - int *chainout; - int *index; - LOGICAL wild; -#endif { int node; M_PARSE *stackp; @@ -241,14 +231,7 @@ void m_strtaction(m_elt) } /* Output a start-string or end-string */ -#if defined(M_PROTO) void m_textout(char *format, LOGICAL start, LOGICAL end) -#else -void m_textout(format, start, end) - char *format; - LOGICAL start; - LOGICAL end; -#endif { M_WCHAR name[M_NAMELEN + 1]; int i, par; diff --git a/cde/programs/dthelp/parser/pass2/parser/cyclent.c b/cde/programs/dthelp/parser/pass2/parser/cyclent.c index 84c527a78..0852fabce 100644 --- a/cde/programs/dthelp/parser/pass2/parser/cyclent.c +++ b/cde/programs/dthelp/parser/pass2/parser/cyclent.c @@ -36,15 +36,7 @@ #include "parser.h" #include "entext.h" -#if defined(M_PROTO) M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, unsigned char *wheredef) -#else -M_WCHAR *m_cyclent(init, type, content, wheredef) - LOGICAL init ; - unsigned char *type ; - M_WCHAR **content ; - unsigned char *wheredef ; -#endif { static M_TRIE *current ; static M_TRIE *ancestor[M_NAMELEN + 1] ; diff --git a/cde/programs/dthelp/parser/pass2/parser/entity.c b/cde/programs/dthelp/parser/pass2/parser/entity.c index bd151aa21..8ff69c507 100644 --- a/cde/programs/dthelp/parser/pass2/parser/entity.c +++ b/cde/programs/dthelp/parser/pass2/parser/entity.c @@ -43,13 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "entext.h" /* Process the name in a usemap delaration */ -#if defined(M_PROTO) void m_ckmap(M_WCHAR *name, LOGICAL useoradd) -#else -void m_ckmap(name, useoradd) - M_WCHAR *name ; - LOGICAL useoradd ; -#endif { int mapid ; diff --git a/cde/programs/dthelp/parser/pass2/parser/error.c b/cde/programs/dthelp/parser/pass2/parser/error.c index 60746d687..36ac2ff63 100644 --- a/cde/programs/dthelp/parser/pass2/parser/error.c +++ b/cde/programs/dthelp/parser/pass2/parser/error.c @@ -52,15 +52,9 @@ void m_error(text) } /* Issue error message (one argument) */ -#if defined(M_PROTO) void m_err1( const char *text, const M_WCHAR *arg) -#else -void m_err1(text, arg) - char *text; - M_WCHAR *arg; -#endif { char *buffer, *mb_arg; @@ -77,15 +71,9 @@ m_esuffix(); } -#if defined(M_PROTO) void m_mberr1( const char *text, const char *arg) -#else -void m_err1(text, arg) - char *text; - char *arg; -#endif { M_WCHAR *wc_arg; @@ -95,17 +83,10 @@ void m_err1(text, arg) } /* Issue error message (two arguments) */ -#if defined(M_PROTO) void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2) -#else -void m_err2(text, arg1, arg2) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; -#endif { char *buffer; char *mb_arg1,*mb_arg2; @@ -126,19 +107,11 @@ void m_err2(text, arg1, arg2) } /* Issue error message (three arguments) */ -#if defined(M_PROTO) void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void m_err3(text, arg1, arg2, arg3) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3; @@ -164,21 +137,12 @@ void m_err3(text, arg1, arg2, arg3) } /* Issue error message (four arguments) */ -#if defined(M_PROTO) void m_err4( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4) -#else -void m_err4(text, arg1, arg2, arg3, arg4) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; -#endif { char *buffer; char *mb_arg1, *mb_arg2,*mb_arg3,*mb_arg4; @@ -207,7 +171,6 @@ void m_err4(text, arg1, arg2, arg3, arg4) } /* Issue error message (five arguments) */ -#if defined(M_PROTO) void m_err5( char *text, M_WCHAR *arg1, @@ -215,15 +178,6 @@ void m_err5( M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5) -#else -void m_err5(text, arg1, arg2, arg3, arg4, arg5) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5; @@ -261,7 +215,6 @@ void m_err5(text, arg1, arg2, arg3, arg4, arg5) } /* Issue error message (six arguments) */ -#if defined(M_PROTO) void m_err6( char *text, M_WCHAR *arg1, @@ -270,16 +223,6 @@ void m_err6( M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6) -#else -void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; - M_WCHAR *arg6; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6; @@ -321,7 +264,6 @@ void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6) } /* Issue error message (seven arguments) */ -#if defined(M_PROTO) void m_err7( char *text, M_WCHAR *arg1, @@ -331,17 +273,6 @@ void m_err7( M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7) -#else -void m_err7(text, arg1, arg2, arg3, arg4, arg5, arg6, arg7) - char *text; - M_WCHAR *arg1; - M_WCHAR *arg2; - M_WCHAR *arg3; - M_WCHAR *arg4; - M_WCHAR *arg5; - M_WCHAR *arg6; - M_WCHAR *arg7; -#endif { char *buffer; char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6, *mb_arg7; diff --git a/cde/programs/dthelp/parser/pass2/parser/findpar.c b/cde/programs/dthelp/parser/pass2/parser/findpar.c index 9614cca98..59dd954d0 100644 --- a/cde/programs/dthelp/parser/pass2/parser/findpar.c +++ b/cde/programs/dthelp/parser/pass2/parser/findpar.c @@ -41,14 +41,7 @@ Returns 0 if elt is not a valid element name, if param is specified but is not a valid parameter name, or if param is NULL and value is not a valid value of any of elt's parameters. */ -#if defined(M_PROTO) int m_findpar( const char *elt , const char *param , const M_WCHAR *value ) -#else -int m_findpar(elt, param, value) -char *elt ; -char *param ; -M_WCHAR *value ; -#endif /* M_PROTO */ { M_ELEMENT eltid ; int par ; diff --git a/cde/programs/dthelp/parser/pass2/parser/param.c b/cde/programs/dthelp/parser/pass2/parser/param.c index db443dce3..9fa2d5246 100644 --- a/cde/programs/dthelp/parser/pass2/parser/param.c +++ b/cde/programs/dthelp/parser/pass2/parser/param.c @@ -290,13 +290,7 @@ void m_stkparams(M_NOPAR) } /* Update the default of a parameter whose default is #CURRENT */ -#if defined(M_PROTO) void m_updatedefault(const int par , const M_WCHAR *string ) -#else -void m_updatedefault(par, string) - int par ; - M_WCHAR *string ; -#endif /* M_PROTO */ { if (m_parameter[par - 1].deftype != M_CURRENT && m_parameter[par - 1].deftype != M_CHANGEDCUR) return ; diff --git a/cde/programs/dthelp/parser/pass2/parser/parser.h b/cde/programs/dthelp/parser/pass2/parser/parser.h index 5636b1485..821dcb367 100644 --- a/cde/programs/dthelp/parser/pass2/parser/parser.h +++ b/cde/programs/dthelp/parser/pass2/parser/parser.h @@ -345,8 +345,6 @@ M_PAREXTERN int m_wsused ; /* Temporary pointers to parameter values. Used while scanning start tag before element is placed on parse stack.*/ M_PAREXTERN -#if defined M_PROTO -#endif M_WCHAR *m_poccur[ #if defined(M_PARDEF) M_MAXPAR ? M_MAXPAR : 1 diff --git a/cde/programs/dthelp/parser/pass2/parser/parvalok.c b/cde/programs/dthelp/parser/pass2/parser/parvalok.c index 9025cf52d..6789594c0 100644 --- a/cde/programs/dthelp/parser/pass2/parser/parvalok.c +++ b/cde/programs/dthelp/parser/pass2/parser/parvalok.c @@ -34,14 +34,7 @@ /* Function callable by interface designers. Returns TRUE if specified value is a legal value for the indicated parameter of the given element, FALSE otherwise. */ -#if defined(M_PROTO) LOGICAL m_parvalok( M_WCHAR *elt , M_WCHAR *param , const M_WCHAR *value ) -#else -LOGICAL m_parvalok(elt, param, value) - M_WCHAR *elt ; - M_WCHAR *param ; - M_WCHAR *value ; -#endif /* M_PROTO */ { M_ELEMENT eltid ; int par ; diff --git a/cde/programs/dthelp/parser/pass2/parser/proto.h b/cde/programs/dthelp/parser/pass2/parser/proto.h index f45099c95..11c9969d0 100644 --- a/cde/programs/dthelp/parser/pass2/parser/proto.h +++ b/cde/programs/dthelp/parser/pass2/parser/proto.h @@ -21,827 +21,283 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 10:57:56 rswiston $ */ -int m_actgetc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_adjuststate( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; - -void m_attval( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL m_attvonly( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -int m_checkstart( -#if defined(M_PROTO) - M_ELEMENT val -#endif - ) ; - -LOGICAL m_ckend( -#if defined(M_PROTO) - M_ELEMENT val, LOGICAL neednet -#endif - ) ; - -void m_ckmap( -#if defined(M_PROTO) - M_WCHAR *name, LOGICAL useoradd -#endif - ) ; - -void m_closent( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -void m_codeent( -#if defined(M_PROTO) - int m_ent -#endif - ) ; - -M_PARSE *m_copystackelt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -M_WCHAR *m_cyclent( -#if defined(M_PROTO) - LOGICAL init, unsigned char *type, M_WCHAR **content, - unsigned char *wheredef -#endif - ) ; - -void m_dispcurelt( -#if defined(M_PROTO) - M_WCHAR *file, int line -#endif - ) ; - -void m_done( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_dumpline( -#if defined(M_PROTO) - M_WCHAR *file, int line -#endif - ) ; - -void m_eduptype( -#if defined(M_PROTO) - int type -#endif - ) ; - -M_ELEMENT m_eltname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_endaction( -#if defined(M_PROTO) - M_ELEMENT m_elt -#endif - ) ; - -void m_endcase( -#if defined(M_PROTO) - int m_action -#endif - ) ; - -void m_endtag( -#if defined(M_PROTO) - M_ELEMENT c -#endif - ) ; - -void m_entexpand( -#if defined(M_PROTO) - M_ENTITY *openent -#endif - ) ; - -void m_eprefix( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_err1( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg -#endif - ) ; - -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; - -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; - -void m_err4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; - -void m_err5( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5 -#endif - ) ; - -void m_err6( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6 -#endif - ) ; - -void m_err7( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, - M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7 -#endif - ) ; - -void m_errline( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; - -void m_esuffix( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; - -void m_etcomplete( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_excluded( -#if defined(M_PROTO) - M_ELEMENT elt -#endif - ) ; - -void m_expecting( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_expexpand( -#if defined(M_PROTO) - LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data -#endif - ) ; - -void m_expline( -#if defined(M_PROTO) - LOGICAL *expstart, LOGICAL *data, M_ELEMENT label -#endif - ) ; - -void m_exptend( -#if defined(M_PROTO) - LOGICAL *expstart, M_PARSE *stackptr -#endif - ) ; - -int m_findact( -#if defined(M_PROTO) - M_ELEMENT elt, int *array -#endif - ) ; - -void m_findatt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_findchain( -#if defined(M_PROTO) - M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, - LOGICAL wild -#endif - ) ; - -int m_findpar( -#if defined(M_PROTO) - const char *elt, const char *param, const M_WCHAR *value -#endif - ) ; - -M_ELEMENT m_findunique( -#if defined(M_PROTO) - M_STATE from, int *newleft -#endif - ) ; - -void m_frcend( -#if defined(M_PROTO) - M_ELEMENT val -#endif - ) ; - -void m_frcstart( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; - -void m_freeFSA( -#if defined(M_PROTO) - M_PARSE *stackelt -#endif - ) ; - -void m_freemin( -#if defined(M_PROTO) - M_MIN *min - , char *msg -#endif - ) ; - -void m_freeparam( -#if defined(M_PROTO) - M_PARSE *stackelt -#endif - ) ; - -LOGICAL m_gendelim( -#if defined(M_PROTO) - int srlen, int context -#endif - ) ; - -int m_getachar( -#if defined(M_PROTO) - M_HOLDTYPE *dchar -#endif - ) ; - -int m_getc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -int mb_getwc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; - -void *m_getdata( -#if defined(M_PROTO) - int n, LOGICAL *flag -#endif - ) ; - -void m_getline( -#if defined(M_PROTO) - M_WCHAR **file, int *line -#endif - ) ; - -void m_getname( -#if defined(M_PROTO) - M_WCHAR first -#endif - ) ; - -void m_getsignon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_gettoken( -#if defined(M_PROTO) - int *c, M_HOLDTYPE *dchar, int context -#endif - ) ; - -void m_globes( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_globss( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_holdproc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_inctest( -#if defined(M_PROTO) - int *count, int limit, char *message -#endif - ) ; - -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_initialize( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_lastchars( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_level( -#if defined(M_PROTO) - M_WCHAR *elt -#endif - ) ; - -int m_mblevel( -#if defined(M_PROTO) - char *elt -#endif - ) ; - -void m_litproc( -#if defined(M_PROTO) - int delim -#endif - ) ; - -void m_longent( -#if defined(M_PROTO) - int context -#endif - ) ; - -LOGICAL m_lookent( -#if defined(M_PROTO) - M_WCHAR *name, unsigned char *type, M_WCHAR **content, - unsigned char *wheredef -#endif - ) ; - -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; - -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; - -void m_missingtagc( -#if defined(M_PROTO) - int c, M_HOLDTYPE dchar, LOGICAL start -#endif - ) ; - -LOGICAL m_nextand( -#if defined(M_PROTO) - M_OPENFSA *thisfsa, M_ELEMENT label -#endif - ) ; - -void m_nextdelimchar( -#if defined(M_PROTO) - int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, - unsigned char type -#endif - ) ; - -void m_ntrent( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -void m_nullendtag( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_omitend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_omitstart( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; - -void *m_openent( -#if defined(M_PROTO) - M_WCHAR *entcontent -#endif - ) ; - -void *m_openfirst( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_optstring( -#if defined(M_PROTO) - char *p -#endif - ) ; - -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, M_WCHAR *name -#endif - ) ; - -int m_parcount( -#if defined(M_PROTO) - M_WCHAR *elt -#endif - ) ; - -M_WCHAR *m_pardefault( -#if defined(M_PROTO) - M_WCHAR *elt, M_WCHAR *param, unsigned char *type -#endif - ) ; - -M_WCHAR *m_parent( -#if defined(M_PROTO) - int n -#endif - ) ; - -M_WCHAR *m_parname( -#if defined(M_PROTO) - M_WCHAR *elt, int n -#endif - ) ; - -M_WCHAR *m_mbparname( -#if defined(M_PROTO) - char *elt, int n -#endif - ) ; - -const M_WCHAR *m_partype( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; - -void m_parupper( -#if defined(M_PROTO) - int par, M_WCHAR *string -#endif - ) ; - -LOGICAL m_parvalok( -#if defined(M_PROTO) - M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value -#endif - ) ; - -void m_piaction( -#if defined(M_PROTO) - M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype -#endif - ) ; - -void m_pop( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_push( -#if defined(M_PROTO) - M_ELEMENT elt, M_STATE current, LOGICAL need -#endif - ) ; - -LOGICAL m_putdata( -#if defined(M_PROTO) - void *data, int n -#endif - ) ; - -void m_readcomments( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void *m_realloc( -#if defined(M_PROTO) - void *ptr, int size, char *msg -#endif - ) ; - -int m_scan( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_setmap( -#if defined(M_PROTO) - int map, LOGICAL useoradd -#endif - ) ; - -void m_setoptions( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_setparam( -#if defined(M_PROTO) - M_WCHAR **cvar, int par -#endif - ) ; - -void m_shortref( -#if defined(M_PROTO) - int context -#endif - ) ; - -void m_showcurelt( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_signmsg( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_sigre( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_startdoc( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_startmsg( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stcaction( -#if defined(M_PROTO) - M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END -#endif - ) ; - -void m_stcomplete( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stkdefaultparams( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_stkonedef( -#if defined(M_PROTO) - int par, M_ELEMENT scanel, M_WCHAR **poccur, int i -#endif - ) ; - -void m_stkparams( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_strtaction( -#if defined(M_PROTO) - M_ELEMENT m_elt -#endif - ) ; - -void m_strtcase( -#if defined(M_PROTO) - int m_action -#endif - ) ; - -void m_strtcdata( -#if defined(M_PROTO) - int scanval -#endif - ) ; - -LOGICAL m_strtproc( -#if defined(M_PROTO) - M_ELEMENT scanval -#endif - ) ; - -void m_strttag( -#if defined(M_PROTO) - M_ELEMENT val, LOGICAL net -#endif - ) ; - -void m_textaction( -#if defined(M_PROTO) - M_WCHAR m_textchar -#endif - ) ; - -void m_textout( -#if defined(M_PROTO) - char *format, LOGICAL start, LOGICAL end -#endif - ) ; - -LOGICAL m_textpermitted( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -M_WCHAR *m_thisfile( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -int m_thisline( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -void m_trace( -#if defined(M_PROTO) - char *p -#endif - ) ; - -void m_wctrace( -#if defined(M_PROTO) - M_WCHAR *p -#endif - ) ; - -LOGICAL m_transition( -#if defined(M_PROTO) - M_ELEMENT label, LOGICAL recur -#endif - ) ; - -void m_undodelim( -#if defined(M_PROTO) - M_WCHAR *delim, LOGICAL flag -#endif - ) ; - -void m_ungetachar( -#if defined(M_PROTO) - int c, M_HOLDTYPE dchar, LOGICAL preread -#endif - ) ; - -void m_updatedefault( -#if defined(M_PROTO) - const int par, const M_WCHAR *string -#endif - ) ; - -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; - -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; - -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; - -LOGICAL m_validinpar( -#if defined(M_PROTO) - M_WCHAR *string -#endif - ) ; - -LOGICAL m_vldentref( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; - -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +int m_actgetc(M_NOPAR); + +void m_adjuststate(M_NOPAR); + +LOGICAL m_allwhite(const M_WCHAR *string); + +void m_attval(M_WCHAR *string); + +LOGICAL m_attvonly(M_WCHAR *string); + +int m_checkstart(M_ELEMENT val); + +LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet); + +void m_ckmap(M_WCHAR *name, LOGICAL useoradd); + +void m_closent(void *m_ptr); + +void m_codeent(int m_ent); + +M_PARSE *m_copystackelt(M_NOPAR); + +M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, + unsigned char *wheredef); + +void m_dispcurelt(M_WCHAR *file, int line); + +void m_done(M_NOPAR); + +void m_dumpline(M_WCHAR *file, int line); + +void m_eduptype(int type); + +M_ELEMENT m_eltname(M_NOPAR); + +void m_endaction(M_ELEMENT m_elt); + +void m_endcase(int m_action); + +void m_endtag(M_ELEMENT c); + +void m_entexpand(M_ENTITY *openent); + +void m_eprefix(M_NOPAR); + +void m_err1(const char *text, const M_WCHAR *arg); + +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); + +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); + +void m_err4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); + +void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5); + +void m_err6(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6); + +void m_err7(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, + M_WCHAR *arg4, M_WCHAR *arg5, M_WCHAR *arg6, M_WCHAR *arg7); + +void m_errline(char *p); + +void m_error(char *text); + +void m_esuffix(M_NOPAR); + +void m_exit(int status); + +void m_etcomplete(M_NOPAR); + +LOGICAL m_excluded(M_ELEMENT elt); + +void m_expecting(M_NOPAR); + +void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data); + +void m_expline(LOGICAL *expstart, LOGICAL *data, M_ELEMENT label); + +void m_exptend(LOGICAL *expstart, M_PARSE *stackptr); + +int m_findact(M_ELEMENT elt, int *array); + +void m_findatt(M_NOPAR); + +void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, + LOGICAL wild); + +int m_findpar(const char *elt, const char *param, const M_WCHAR *value); + +M_ELEMENT m_findunique(M_STATE from, int *newleft); + +void m_frcend(M_ELEMENT val); + +void m_frcstart(M_NOPAR); + +void m_free(void *block, char *msg); + +void m_freeFSA(M_PARSE *stackelt); + +void m_freemin(M_MIN *min + , char *msg); + +void m_freeparam(M_PARSE *stackelt); + +LOGICAL m_gendelim(int srlen, int context); + +int m_getachar(M_HOLDTYPE *dchar); + +int m_getc(void *m_ptr); + +int mb_getwc(void *m_ptr); + +void *m_getdata(int n, LOGICAL *flag); + +void m_getline(M_WCHAR **file, int *line); + +void m_getname(M_WCHAR first); + +void m_getsignon(M_NOPAR); + +int m_gettoken(int *c, M_HOLDTYPE *dchar, int context); + +void m_globes(M_NOPAR); + +void m_globss(M_NOPAR); + +void m_holdproc(M_NOPAR); + +void m_inctest(int *count, int limit, char *message); + +void m_initctype(M_NOPAR); + +void m_initialize(M_NOPAR); + +void m_lastchars(M_NOPAR); + +int m_level(M_WCHAR *elt); + +int m_mblevel(char *elt); + +void m_litproc(int delim); + +void m_longent(int context); + +LOGICAL m_lookent(M_WCHAR *name, unsigned char *type, M_WCHAR **content, + unsigned char *wheredef); + +void main(int argc, char **argv); + +void *m_malloc(int size, char *msg); + +void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start); + +LOGICAL m_nextand(M_OPENFSA *thisfsa, M_ELEMENT label); + +void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, + unsigned char type); + +void m_ntrent(M_WCHAR *p); + +void m_nullendtag(M_NOPAR); + +LOGICAL m_omitend(M_NOPAR); + +LOGICAL m_omitstart(M_NOPAR); + +void m_openchk(FILE **ptr, char *name, char *mode); + +void *m_openent(M_WCHAR *entcontent); + +void *m_openfirst(M_NOPAR); + +void m_optstring(char *p); + +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); + +int m_parcount(M_WCHAR *elt); + +M_WCHAR *m_pardefault(M_WCHAR *elt, M_WCHAR *param, unsigned char *type); + +M_WCHAR *m_parent(int n); + +M_WCHAR *m_parname(M_WCHAR *elt, int n); + +M_WCHAR *m_mbparname(char *elt, int n); + +const M_WCHAR *m_partype(const int par, const M_WCHAR *string); + +void m_parupper(int par, M_WCHAR *string); + +LOGICAL m_parvalok(M_WCHAR *elt, M_WCHAR *param, const M_WCHAR *value); + +void m_piaction(M_WCHAR *m_pi, M_WCHAR *m_entname, int m_enttype); + +void m_pop(M_NOPAR); + +void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need); + +LOGICAL m_putdata(void *data, int n); + +void m_readcomments(M_NOPAR); + +void *m_realloc(void *ptr, int size, char *msg); + +int m_scan(M_NOPAR); + +void m_setmap(int map, LOGICAL useoradd); + +void m_setoptions(M_NOPAR); + +void m_setparam(M_WCHAR **cvar, int par); + +void m_shortref(int context); + +void m_showcurelt(M_NOPAR); + +void m_signmsg(char *p); + +void m_sigre(M_NOPAR); + +void m_startdoc(M_NOPAR); + +void m_startmsg(M_NOPAR); + +void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END); + +void m_stcomplete(M_NOPAR); + +void m_stkdefaultparams(M_NOPAR); + +void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i); + +void m_stkparams(M_NOPAR); + +void m_strtaction(M_ELEMENT m_elt); + +void m_strtcase(int m_action); + +void m_strtcdata(int scanval); + +LOGICAL m_strtproc(M_ELEMENT scanval); + +void m_strttag(M_ELEMENT val, LOGICAL net); + +void m_textaction(M_WCHAR m_textchar); + +void m_textout(char *format, LOGICAL start, LOGICAL end); + +LOGICAL m_textpermitted(M_NOPAR); + +M_WCHAR *m_thisfile(M_NOPAR); + +int m_thisline(M_NOPAR); + +void m_trace(char *p); + +void m_wctrace(M_WCHAR *p); + +LOGICAL m_transition(M_ELEMENT label, LOGICAL recur); + +void m_undodelim(M_WCHAR *delim, LOGICAL flag); + +void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread); + +void m_updatedefault(const int par, const M_WCHAR *string); + +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); + +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); + +int m_mbmbupstrcmp(const char *p, const char *q); + +LOGICAL m_validinpar(M_WCHAR *string); + +LOGICAL m_vldentref(M_NOPAR); + +LOGICAL m_whitespace(M_WCHAR c); diff --git a/cde/programs/dthelp/parser/pass2/parser/scan.c b/cde/programs/dthelp/parser/pass2/parser/scan.c index 153728dfb..17a82192a 100644 --- a/cde/programs/dthelp/parser/pass2/parser/scan.c +++ b/cde/programs/dthelp/parser/pass2/parser/scan.c @@ -402,12 +402,7 @@ int m_getachar(dchar) } /* Reads a name token */ -#if defined(M_PROTO) void m_getname(M_WCHAR first) -#else -void m_getname(first) - M_WCHAR first ; -#endif { M_WCHAR *p ; M_HOLDTYPE dchar ; @@ -649,14 +644,7 @@ void m_litproc(delim) } /* Called when a missing tagc delimiter is detected */ -#if defined(M_PROTO) void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start) -#else -void m_missingtagc(c, dchar, start) - int c ; - M_HOLDTYPE dchar ; - LOGICAL start ; -#endif { if (! m_wholetag) { if (start) m_mberr1("Invalid parameter or missing %s", m_tagc); @@ -669,18 +657,8 @@ void m_missingtagc(c, dchar, start) /* Have found one character in a possible short reference delimiter. Prepare to look for the next one */ -#if defined(M_PROTO) void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LOGICAL skipblank, unsigned char type) -#else -void m_nextdelimchar(n, i, linestart, newlinestart, skipblank, type) - int *n ; - int i ; - LOGICAL *linestart ; - LOGICAL newlinestart ; - LOGICAL skipblank ; - unsigned char type ; -#endif { int k ; char mb_re,mb_seqchar, mb_rschar; @@ -863,13 +841,7 @@ int m_scan(M_NOPAR) /* Process explicit or implied USEMAP or ADDMAP */ -#if defined(M_PROTO) void m_setmap(int map, LOGICAL useoradd) -#else -void m_setmap(map, useoradd) - int map ; - LOGICAL useoradd ; -#endif { int i ; int sref ; @@ -1087,13 +1059,7 @@ void m_sigre(M_NOPAR) /* Returns a context-dependent delimiter string to input stream so characters can be reread one at a time in another context */ -#if defined(M_PROTO) void m_undodelim(M_WCHAR *delim, LOGICAL flag) -#else -void m_undodelim(delim, flag) - M_WCHAR *delim ; - LOGICAL flag ; -#endif { M_WCHAR *p ; @@ -1110,14 +1076,7 @@ void m_undodelim(delim, flag) /* Place a character on the current input stream. The character may have been scanned and determined not to be part of the current token or it may be in the expansion of an entity*/ -#if defined(M_PROTO) void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread) -#else -void m_ungetachar(c, dchar, preread) - int c ; - M_HOLDTYPE dchar ; - LOGICAL preread ; -#endif { char buffer[10] ; int length; diff --git a/cde/programs/dthelp/parser/pass2/parser/string.c b/cde/programs/dthelp/parser/pass2/parser/string.c index 3074876a9..65af1d484 100644 --- a/cde/programs/dthelp/parser/pass2/parser/string.c +++ b/cde/programs/dthelp/parser/pass2/parser/string.c @@ -31,14 +31,7 @@ /* Include generated code */ #include "stfile.c" -#if defined(M_PROTO) void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END) -#else -void m_stcaction(m_string, M_START, M_END) - M_WCHAR *m_string ; - LOGICAL M_START ; - LOGICAL M_END ; -#endif { m_stackpar = m_stacktop->stparam ; (*m_sttable[m_stacktop->stccase])(m_string, M_START, M_END) ; diff --git a/cde/programs/dthelp/parser/pass2/parser/struct.c b/cde/programs/dthelp/parser/pass2/parser/struct.c index d9a097839..ebeb765ea 100644 --- a/cde/programs/dthelp/parser/pass2/parser/struct.c +++ b/cde/programs/dthelp/parser/pass2/parser/struct.c @@ -88,13 +88,7 @@ int m_checkstart(val) If VAL is not the element at the top of the parse stack, m_ckend checks to see if the end of VAL can validly end nested elements as well. */ -#if defined(M_PROTO) LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet) -#else -LOGICAL m_ckend(val, neednet) - M_ELEMENT val ; - LOGICAL neednet ; - #endif { M_PARSE *stackptr ; M_OPENFSA *fsastack ; @@ -426,14 +420,7 @@ void m_pop(M_NOPAR) /* Pushes a new item onto the parse stack, setting its element, current, and neednet fields as indicated by the parameters*/ -#if defined(M_PROTO) void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need) -#else -void m_push(elt, current, need) - M_ELEMENT elt ; - M_STATE current ; - LOGICAL need ; - #endif { M_PARSE *newstack ; @@ -654,13 +641,7 @@ LOGICAL m_strtproc(scanval) } /* Processes explicit or implied start tag*/ -#if defined(M_PROTO) void m_strttag(M_ELEMENT val, LOGICAL net) -#else -void m_strttag(val, net) - M_ELEMENT val ; - LOGICAL net ; -#endif { m_transition(val, TRUE) ; if (val) { @@ -726,13 +707,7 @@ LOGICAL m_textpermitted(M_NOPAR) /* Returns TRUE iff LABEL allowed in the current state of the current element (without expanding any minimization). May result in changes to the stack of FSA's for this element if and-groups open or close. */ -#if defined(M_PROTO) LOGICAL m_transition(M_ELEMENT label, LOGICAL recur) -#else -LOGICAL m_transition(label, recur) - M_ELEMENT label ; - LOGICAL recur ; -#endif { M_ARC parc ; M_OPENFSA *newfsa ; diff --git a/cde/programs/dthelp/parser/pass2/parser/text.c b/cde/programs/dthelp/parser/pass2/parser/text.c index 0b1e6237a..80017d3ef 100644 --- a/cde/programs/dthelp/parser/pass2/parser/text.c +++ b/cde/programs/dthelp/parser/pass2/parser/text.c @@ -38,12 +38,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #define M_BUFLEN (32) /* When a text character occurs */ -#if defined(M_PROTO) void m_textaction(M_WCHAR m_textchar) -#else -void m_textaction(m_textchar) - M_WCHAR m_textchar ; - #endif { char buffer[M_BUFLEN] ; char mb_re; diff --git a/cde/programs/dthelp/parser/pass2/util/allwhite.c b/cde/programs/dthelp/parser/pass2/util/allwhite.c index 86b33e3ac..2783b9b5d 100644 --- a/cde/programs/dthelp/parser/pass2/util/allwhite.c +++ b/cde/programs/dthelp/parser/pass2/util/allwhite.c @@ -26,25 +26,12 @@ */ #include "basic.h" -LOGICAL m_allwhite( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ) ; +LOGICAL m_allwhite(const M_WCHAR *string); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); /* Test if a string contains only white space characters */ -#if defined(M_PROTO) LOGICAL m_allwhite(const M_WCHAR *string ) -#else -LOGICAL m_allwhite(string) -M_WCHAR *string ; -#endif /* M_PROTO */ { const M_WCHAR *p ; diff --git a/cde/programs/dthelp/parser/pass2/util/basic.h b/cde/programs/dthelp/parser/pass2/util/basic.h index d77c65287..25937074a 100644 --- a/cde/programs/dthelp/parser/pass2/util/basic.h +++ b/cde/programs/dthelp/parser/pass2/util/basic.h @@ -46,93 +46,31 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#if defined(hpux) || defined(__aix) || defined(sun) -/* Old unix stuff - *#define void int - *#define M_NOPAR - */ -/* New Ansi style */ -#define M_PROTO + #define M_NOPAR void -#else -#define M_PROTO -#define M_NOPAR void -#endif -char *MakeMByteString( -#if defined(M_PROTO) - const M_WCHAR *from -#endif - ); +char *MakeMByteString(const M_WCHAR *from); -M_WCHAR *MakeWideCharString( -#if defined(M_PROTO) - const char *from -#endif - ); +M_WCHAR *MakeWideCharString(const char *from); -int w_strcmp( -#if defined(M_PROTO) - const M_WCHAR *string1, const M_WCHAR *string2 -#endif - ); +int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2); -int w_strncmp( -#if defined(M_PROTO) - const M_WCHAR *string1, const M_WCHAR *string2, int max -#endif - ); +int w_strncmp(const M_WCHAR *string1, const M_WCHAR *string2, int max); -M_WCHAR *w_strcpy( -#if defined(M_PROTO) - M_WCHAR *string1, const M_WCHAR *string2 -#endif - ); +M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2); -M_WCHAR *w_strncpy( -#if defined(M_PROTO) - M_WCHAR *string1, const M_WCHAR *string2, int max -#endif - ); +M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max); -int w_strlen( -#if defined(M_PROTO) - const M_WCHAR *string -#endif - ); +int w_strlen(const M_WCHAR *string); -M_WCHAR *w_strchr( -#if defined(M_PROTO) - M_WCHAR *string, const M_WCHAR chr -#endif - ); +M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr); -M_WCHAR *w_strstr( -#if defined(M_PROTO) - M_WCHAR *string1, M_WCHAR *string2 -#endif - ); +M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -int mb_getwc( -#if defined(M_PROTO) - void *m_ptr -#endif - ) ; +int mb_getwc(void *m_ptr); diff --git a/cde/programs/dthelp/parser/pass2/util/cont.h b/cde/programs/dthelp/parser/pass2/util/cont.h index 55ca65bd1..542cfcc3a 100644 --- a/cde/programs/dthelp/parser/pass2/util/cont.h +++ b/cde/programs/dthelp/parser/pass2/util/cont.h @@ -37,179 +37,63 @@ This product and information is proprietary of Tandem Computers Incorporated. #define CONTINIT(a) #endif -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpdlmptr( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void dumpdlmptr(M_NOPAR); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)); -void dumptree( -#if defined(M_PROTO) - LOGICAL sparse -#endif - ) ; +void dumptree(LOGICAL sparse); -void enterdelim( -#if defined(M_PROTO) - int n -#endif - ) ; +void enterdelim(int n); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - char *text, char *arg -#endif - ) ; +void m_err1(char *text, char *arg); -void getcode( -#if defined(M_PROTO) - int n -#endif - ) ; +void getcode(int n); -void getcolon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void getcolon(M_NOPAR); -int getContext( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +int getContext(M_NOPAR); -LOGICAL getdname( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +LOGICAL getdname(M_NOPAR); -void inccon( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void inccon(M_NOPAR); -void incdelim( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void incdelim(M_NOPAR); -void loaddelim( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void loaddelim(M_NOPAR); -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); -int main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +int main(int argc, char **argv); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void nextcon( -#if defined(M_PROTO) - LOGICAL sparse -#endif - ) ; +void nextcon(LOGICAL sparse); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); -void printval( -#if defined(M_PROTO) - FILE *file, M_TRIE *value -#endif - ) ; +void printval(FILE *file, M_TRIE *value); -void prtctxt( -#if defined(M_PROTO) - int column, int value -#endif - ) ; +void prtctxt(int column, int value); -int readchar( -#if defined(M_PROTO) - LOGICAL cap -#endif - ) ; +int readchar(LOGICAL cap); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void unread( -#if defined(M_PROTO) - int c -#endif - ) ; +void unread(int c); -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, char *arg -#endif - ) ; +void warning1(char *text, char *arg); -void warning2( -#if defined(M_PROTO) - char *text, char *arg1, char *arg2 -#endif - ) ; +void warning2(char *text, char *arg1, char *arg2); -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); #define NOMORE -1 diff --git a/cde/programs/dthelp/parser/pass2/util/conutil.c b/cde/programs/dthelp/parser/pass2/util/conutil.c index d0a064266..7f2a63f41 100644 --- a/cde/programs/dthelp/parser/pass2/util/conutil.c +++ b/cde/programs/dthelp/parser/pass2/util/conutil.c @@ -55,12 +55,7 @@ void dumpdlmptr(M_NOPAR) } /* Output the generated data structures */ -#if defined(M_PROTO) void dumptree(LOGICAL sparse) -#else -void dumptree(sparse) - LOGICAL sparse; -#endif { int i, count = 0; @@ -573,12 +568,7 @@ loading = FALSE; } /* Output transition matrix */ -#if defined(M_PROTO) void nextcon(LOGICAL sparse) -#else -void nextcon(sparse) - LOGICAL sparse; -#endif { int i, j; int firstinrow; @@ -645,12 +635,7 @@ void prtctxt(column, value) /* Read the next input character */ -#if defined(M_PROTO) int readchar(LOGICAL cap) -#else -int readchar(cap) - LOGICAL cap; -#endif { int c; M_WCHAR wnl; diff --git a/cde/programs/dthelp/parser/pass2/util/emptyfil.c b/cde/programs/dthelp/parser/pass2/util/emptyfil.c index a1203c7ab..a9d94c046 100644 --- a/cde/programs/dthelp/parser/pass2/util/emptyfil.c +++ b/cde/programs/dthelp/parser/pass2/util/emptyfil.c @@ -29,11 +29,7 @@ #endif #include "basic.h" -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +void main(int argc, char **argv); void main(argc, argv) int argc ; diff --git a/cde/programs/dthelp/parser/pass2/util/entout.c b/cde/programs/dthelp/parser/pass2/util/entout.c index 2d3ff791e..17e773624 100644 --- a/cde/programs/dthelp/parser/pass2/util/entout.c +++ b/cde/programs/dthelp/parser/pass2/util/entout.c @@ -25,23 +25,11 @@ /* Entout has procedures to write generated entity TRIE */ -void entptr( -#if defined(M_PROTO) - M_ENTITY *data -#endif - ) ; +void entptr(M_ENTITY *data); -char *typetype( -#if defined(M_PROTO) - int n -#endif - ) ; +char *typetype(int n); -char *typewhere( -#if defined(M_PROTO) - unsigned char n -#endif - ) ; +char *typewhere(unsigned char n); /* Macro names written to output file */ char xdbuild[] = "M_DBUILD" ; @@ -212,12 +200,7 @@ char *typetype(n) } /* Typewhere returns a string indicating where the nth entity was defined.*/ -#if defined(M_PROTO) char *typewhere(unsigned char n) -#else -char *typewhere(n) - unsigned char n ; -#endif { switch(n) { case M_DBUILD: return(xdbuild) ; diff --git a/cde/programs/dthelp/parser/pass2/util/error.c b/cde/programs/dthelp/parser/pass2/util/error.c index eb5a7026b..f0fcb25aa 100644 --- a/cde/programs/dthelp/parser/pass2/util/error.c +++ b/cde/programs/dthelp/parser/pass2/util/error.c @@ -33,128 +33,47 @@ extern FILE *m_errfile ; extern int m_line ; extern LOGICAL errexit ; -void eprefix( -#if defined(M_PROTO) - LOGICAL flag -#endif - ) ; +void eprefix(LOGICAL flag); -void m_errline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_errline(char *text); -void m_error( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_error(char *text); -void m_err1( -#if defined(M_PROTO) - char *text, const M_WCHAR *arg -#endif - ) ; +void m_err1(char *text, const M_WCHAR *arg); -void m_mberr1( -#if defined(M_PROTO) - char *text, const char *arg -#endif - ) ; +void m_mberr1(char *text, const char *arg); -void m_err2( -#if defined(M_PROTO) - const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2 -#endif - ) ; +void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2); -void m_err3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void m_err5( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, - M_WCHAR *arg5 -#endif - ) ; +void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, + M_WCHAR *arg5); -void esuffix( -#if defined(M_PROTO) - void -#endif - ) ; +void esuffix(void); -void msgline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void msgline(char *text); -void msg1line( -#if defined(M_PROTO) - char *text, char *arg1 -#endif - ) ; +void msg1line(char *text, char *arg1); -void skiptoend( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void skiptoend(M_NOPAR); -void m_wctrace( -#if defined(M_PROTO) - M_WCHAR *text -#endif - ) ; +void m_wctrace(M_WCHAR *text); -void m_trace( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_trace(char *text); -void warning( -#if defined(M_PROTO) - char *text -#endif - ) ; +void warning(char *text); -void warning1( -#if defined(M_PROTO) - char *text, M_WCHAR *arg -#endif - ) ; +void warning1(char *text, M_WCHAR *arg); -void warning2( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2 -#endif - ) ; +void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2); -void warning3( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3 -#endif - ) ; +void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3); -void warning4( -#if defined(M_PROTO) - char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4 -#endif - ) ; +void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4); /* Write error message prefix */ -#if defined(M_PROTO) void eprefix(LOGICAL flag) -#else -void eprefix(flag) - LOGICAL flag ; -#endif { if (flag) errexit = TRUE ; fprintf(stderr, "\n**** ") ; @@ -184,13 +103,7 @@ void m_error(text) /* Writes an error message with one argument to standard error and file "error" */ -#if defined(M_PROTO) void m_err1(char *text, const M_WCHAR *arg) -#else -void m_err1(text, arg) - char *text; - M_WCHAR *arg ; -#endif { char *mb_arg; @@ -203,13 +116,7 @@ skiptoend() ; m_free(mb_arg,"multi-byte string"); } -#if defined(M_PROTO) void m_mberr1(char *text, const char *arg) -#else -void m_err1(text, arg) - char *text; - char *arg ; -#endif { eprefix(TRUE) ; fprintf(stderr, text, arg) ; @@ -220,13 +127,7 @@ skiptoend() ; /* Writes an error message with two arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2) -#else -void m_err2(text, arg1, arg2) -char *text; -M_WCHAR *arg1, *arg2 ; -#endif { char *mb_arg1, *mb_arg2; @@ -243,13 +144,7 @@ m_free(mb_arg2,"multi-byte string"); /* Writes an error message with three arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void m_err3(text, arg1, arg2, arg3) -char *text; -M_WCHAR *arg1, *arg2, *arg3 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3; @@ -268,14 +163,8 @@ m_free(mb_arg3,"multi-byte string"); /* Writes an error message with five arguments to standard error and file "error" */ -#if defined(M_PROTO) void m_err5( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5) -#else -void m_err5(text, arg1, arg2, arg3, arg4, arg5) -char *text; -M_WCHAR *arg1, *arg2, *arg3, *arg4, *arg5 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5; @@ -347,13 +236,7 @@ void warning(text) /* Writes a nonfatal error message with one argument to standard error and file "error" */ -#if defined(M_PROTO) void warning1( char *text, M_WCHAR *arg) -#else -void warning1(text, arg) -char *text; -M_WCHAR *arg ; -#endif { char *mb_arg; @@ -367,13 +250,7 @@ m_free(mb_arg,"multi-byte string"); /* Writes a nonfatal error message with two arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2) -#else -void warning2(text, arg1, arg2) -char *text; -M_WCHAR *arg1, *arg2 ; -#endif { char *mb_arg1, *mb_arg2; @@ -389,13 +266,7 @@ m_free(mb_arg2,"multi-byte string"); /* Writes a nonfatal error message with three arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3) -#else -void warning3(text, arg1, arg2, arg3) -char *text; -M_WCHAR *arg1, *arg2, *arg3 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3; @@ -413,14 +284,8 @@ m_free(mb_arg3,"multi-byte string"); /* Writes a nonfatal error message with four arguments to standard error and file "error" */ -#if defined(M_PROTO) void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4) -#else -void warning4(text, arg1, arg2, arg3, arg4) -char *text; -M_WCHAR *arg1, *arg2, *arg3, *arg4 ; -#endif { char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4; diff --git a/cde/programs/dthelp/parser/pass2/util/exit.c b/cde/programs/dthelp/parser/pass2/util/exit.c index aa9445194..4389c94e8 100644 --- a/cde/programs/dthelp/parser/pass2/util/exit.c +++ b/cde/programs/dthelp/parser/pass2/util/exit.c @@ -30,11 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #endif #include "basic.h" -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); /* Exit function called by utilities used in PARSER and other programs in the MARKUP system */ diff --git a/cde/programs/dthelp/parser/pass2/util/fclndir.c b/cde/programs/dthelp/parser/pass2/util/fclndir.c index 8cbaf5a2b..c2abd295b 100644 --- a/cde/programs/dthelp/parser/pass2/util/fclndir.c +++ b/cde/programs/dthelp/parser/pass2/util/fclndir.c @@ -58,23 +58,11 @@ struct data { char linedir[] = "#line" ; char *p = linedir, *q = linedir + 1 ; -void main( -#if defined(M_PROTO) - int argc, char **argv -#endif - ) ; +void main(int argc, char **argv); -void copyfile( -#if defined(m_proto) - char *pfile1, char *pfile2 -#endif - ) ; +void copyfile(char *pfile1, char *pfile2); -int nextchar( -#if defined (M_PROTO) - FILE *file, struct data *data -#endif - ) ; +int nextchar(FILE *file, struct data *data); void main(argc, argv) int argc ; diff --git a/cde/programs/dthelp/parser/pass2/util/inctest.c b/cde/programs/dthelp/parser/pass2/util/inctest.c index ec09eeea0..ce3a58d1c 100644 --- a/cde/programs/dthelp/parser/pass2/util/inctest.c +++ b/cde/programs/dthelp/parser/pass2/util/inctest.c @@ -30,23 +30,11 @@ #endif #include "basic.h" -void m_err1( -#if defined(M_PROTO) - const char *text, const char *arg -#endif - ) ; +void m_err1(const char *text, const char *arg); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_inctest( -#if defined(M_PROTO) - int *count, int limit, char *message -#endif - ) ; +void m_inctest(int *count, int limit, char *message); /* Increment a count and test against a limit */ void m_inctest(count, limit, message) diff --git a/cde/programs/dthelp/parser/pass2/util/initct.c b/cde/programs/dthelp/parser/pass2/util/initct.c index 63e3e9f63..af8c7b2fb 100644 --- a/cde/programs/dthelp/parser/pass2/util/initct.c +++ b/cde/programs/dthelp/parser/pass2/util/initct.c @@ -29,11 +29,7 @@ #include "common.h" extern char m_chartype[M_CHARSETLEN] ; -void m_initctype( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_initctype(M_NOPAR); void m_initctype(M_NOPAR) { diff --git a/cde/programs/dthelp/parser/pass2/util/itoa.c b/cde/programs/dthelp/parser/pass2/util/itoa.c index 51f2eb5aa..b86d103e8 100644 --- a/cde/programs/dthelp/parser/pass2/util/itoa.c +++ b/cde/programs/dthelp/parser/pass2/util/itoa.c @@ -27,17 +27,9 @@ #include #include "basic.h" -char *m_itoa( -#if defined(M_PROTO) - int n, char *s -#endif - ) ; +char *m_itoa(int n, char *s); -void reverse( -#if defined(M_PROTO) - char *s -#endif - ) ; +void reverse(char *s); char *m_itoa(n, s) /* convert n to characters in s */ char s[]; diff --git a/cde/programs/dthelp/parser/pass2/util/letter.c b/cde/programs/dthelp/parser/pass2/util/letter.c index f6cfe43c9..0e8c7ada7 100644 --- a/cde/programs/dthelp/parser/pass2/util/letter.c +++ b/cde/programs/dthelp/parser/pass2/util/letter.c @@ -27,18 +27,7 @@ #include "basic.h" -LOGICAL m_letter( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; - -#if defined(M_PROTO) LOGICAL m_letter(M_WCHAR c) -#else -LOGICAL m_letter(c) - M_WCHAR c ; -#endif { if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) return(TRUE) ; return(FALSE) ; diff --git a/cde/programs/dthelp/parser/pass2/util/lower.c b/cde/programs/dthelp/parser/pass2/util/lower.c index c479492c3..e53f0ff81 100644 --- a/cde/programs/dthelp/parser/pass2/util/lower.c +++ b/cde/programs/dthelp/parser/pass2/util/lower.c @@ -27,11 +27,7 @@ #include "basic.h" -int m_lower( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_lower(int c); diff --git a/cde/programs/dthelp/parser/pass2/util/malloc.c b/cde/programs/dthelp/parser/pass2/util/malloc.c index 11e7bf5c0..fe3ad8cf7 100644 --- a/cde/programs/dthelp/parser/pass2/util/malloc.c +++ b/cde/programs/dthelp/parser/pass2/util/malloc.c @@ -36,53 +36,21 @@ extern LOGICAL m_heapchk ; extern LOGICAL m_malftrace ; -void m_errline( -#if defined(M_PROTO) - char *text -#endif - ) ; +void m_errline(char *text); -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_free( -#if defined(M_PROTO) - void *block, char *msg -#endif - ) ; +void m_free(void *block, char *msg); -void m_heapdump( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +void m_heapdump(M_NOPAR); -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void *m_realloc( -#if defined(M_PROTO) - void *ptr, int size, char *msg -#endif - ) ; +void *m_realloc(void *ptr, int size, char *msg); -void *m_trace( -#if defined(M_PROTO) - char *text -#endif - ) ; +void *m_trace(char *text); -void *m_wctrace( -#if defined(M_PROTO) - M_WCHAR *text -#endif - ) ; +void *m_wctrace(M_WCHAR *text); void m_free(void *block, char *msg) { diff --git a/cde/programs/dthelp/parser/pass2/util/openchk.c b/cde/programs/dthelp/parser/pass2/util/openchk.c index 139916f31..2bd2e681f 100644 --- a/cde/programs/dthelp/parser/pass2/util/openchk.c +++ b/cde/programs/dthelp/parser/pass2/util/openchk.c @@ -33,17 +33,9 @@ extern FILE *m_errfile ; -void m_exit( -#if defined(M_PROTO) - int status -#endif - ) ; +void m_exit(int status); -void m_openchk( -#if defined(M_PROTO) - FILE **ptr, char *name, char *mode -#endif - ) ; +void m_openchk(FILE **ptr, char *name, char *mode); /* Open a file and check that the open succeeded */ void m_openchk(ptr, name, mode) diff --git a/cde/programs/dthelp/parser/pass2/util/paramu.c b/cde/programs/dthelp/parser/pass2/util/paramu.c index 14d1cad10..ef46f325a 100644 --- a/cde/programs/dthelp/parser/pass2/util/paramu.c +++ b/cde/programs/dthelp/parser/pass2/util/paramu.c @@ -33,13 +33,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Check to see if string is a valid value for parameter par. If so return a pointer to the keyword if it's a keyword parameter and otherwise a pointer to string. If not valid, return FALSE. */ -#if defined(M_PROTO) const M_WCHAR *m_partype(const int par , const M_WCHAR *string ) -#else -M_WCHAR *m_partype(par, string) - int par ; - M_WCHAR *string ; -#endif /* M_PROTO */ { LOGICAL first = TRUE ; int kw ; diff --git a/cde/programs/dthelp/parser/pass2/util/sparse.h b/cde/programs/dthelp/parser/pass2/util/sparse.h index 85ca88396..b173c5b56 100644 --- a/cde/programs/dthelp/parser/pass2/util/sparse.h +++ b/cde/programs/dthelp/parser/pass2/util/sparse.h @@ -29,11 +29,7 @@ #if defined(sparse) #define m_newcon(i, j) m_sprscon(i, j) -int m_sprscon( -#if defined(M_PROTO) - int i, int j -#endif - ) ; +int m_sprscon(int i, int j); #else #define m_newcon(i, j) m_nextcon[i][j] diff --git a/cde/programs/dthelp/parser/pass2/util/trie.c b/cde/programs/dthelp/parser/pass2/util/trie.c index ac8373b8c..7fa7ff4ae 100644 --- a/cde/programs/dthelp/parser/pass2/util/trie.c +++ b/cde/programs/dthelp/parser/pass2/util/trie.c @@ -45,26 +45,12 @@ extern FILE *m_errfile ; extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ; -void *m_malloc( -#if defined(M_PROTO) - int size, char *msg -#endif - ) ; +void *m_malloc(int size, char *msg); -void m_entercharintrie( -#if defined(M_PROTO) - M_TRIE **currentnode, M_WCHAR c -#endif - ) ; +void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c); /* Enters the next character of a string into a trie */ -#if defined(M_PROTO) void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c) -#else -void m_entercharintrie(currentnode, c) - M_TRIE **currentnode ; - M_WCHAR c ; -#endif { M_TRIE *newnode ; @@ -112,13 +98,7 @@ M_TRIE *m_gettrienode(M_NOPAR) /* M_lookfortrie(p, xtrie) looks for string p in the specified trie, returning its data value if found and otherwise FALSE */ -#if defined(M_PROTO) void *m_lookfortrie( const M_WCHAR *p , const M_TRIE *xtrie ) -#else -void *m_lookfortrie(p, xtrie) - M_WCHAR *p ; - M_TRIE *xtrie ; -#endif /* M_PROTO */ { M_TRIE *currentnode ; diff --git a/cde/programs/dthelp/parser/pass2/util/trie.h b/cde/programs/dthelp/parser/pass2/util/trie.h index 6b3821a61..931b85f00 100644 --- a/cde/programs/dthelp/parser/pass2/util/trie.h +++ b/cde/programs/dthelp/parser/pass2/util/trie.h @@ -51,26 +51,10 @@ struct m_ptrie { } ; -M_TRIE *m_gettrienode( -#if defined(M_PROTO) - M_NOPAR -#endif - ) ; +M_TRIE *m_gettrienode(M_NOPAR); -void *m_lookfortrie( -#if defined(M_PROTO) - const M_WCHAR *p, const M_TRIE *xtrie -#endif - ) ; +void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie); -void *m_ntrtrie( -#if defined(M_PROTO) - M_WCHAR *p, M_TRIE *xtrie, void *dataval -#endif - ) ; +void *m_ntrtrie(M_WCHAR *p, M_TRIE *xtrie, void *dataval); -void *m_resettrie( -#if defined(M_PROTO) - M_TRIE *xtrie, M_WCHAR *p, void *value -#endif - ) ; +void *m_resettrie(M_TRIE *xtrie, M_WCHAR *p, void *value); diff --git a/cde/programs/dthelp/parser/pass2/util/triecnt.c b/cde/programs/dthelp/parser/pass2/util/triecnt.c index 8d15bf9ba..0deb4cfc7 100644 --- a/cde/programs/dthelp/parser/pass2/util/triecnt.c +++ b/cde/programs/dthelp/parser/pass2/util/triecnt.c @@ -31,24 +31,12 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, + void (*proc)(FILE *file, void *value)); -void printval( -#if defined(M_PROTO) - FILE *file, void *value -#endif - ) ; +void printval(FILE *file, void *value); /* Count the descendants of a node in order to generate declarations for the packed form of a trie*/ @@ -71,12 +59,7 @@ void dumpnode(first, file, trieptr, count, proc) FILE *file ; M_TRIE *trieptr ; int *count ; - void (*proc) ( -#if defined (M_PROTO) - FILE *file, - void *value -#endif - ) ; + void (*proc) (FILE *file, void *value) ; { M_TRIE *p ; int savecount ; diff --git a/cde/programs/dthelp/parser/pass2/util/triedump.c b/cde/programs/dthelp/parser/pass2/util/triedump.c index 1e27b6df9..3e49c9b99 100644 --- a/cde/programs/dthelp/parser/pass2/util/triedump.c +++ b/cde/programs/dthelp/parser/pass2/util/triedump.c @@ -29,18 +29,10 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void m_dumptrie( -#if defined(M_PROTO) - FILE *file, M_TRIE *xtrie, char *extname, int *count, - void (*proc)(void *value) -#endif - ) ; +void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, + void (*proc)(void *value)); /* Write the C declaration of a trie */ void m_dumptrie(file, xtrie, extname, count, proc) @@ -48,11 +40,7 @@ void m_dumptrie(file, xtrie, extname, count, proc) M_TRIE *xtrie ; char *extname ; int *count ; - void (*proc)( -#if defined(M_PROTO) - void *value -#endif - ) ; + void (*proc)(void *value) ; { int firstson ; M_TRIE *p ; diff --git a/cde/programs/dthelp/parser/pass2/util/triepdmp.c b/cde/programs/dthelp/parser/pass2/util/triepdmp.c index b837cae91..3c052e332 100644 --- a/cde/programs/dthelp/parser/pass2/util/triepdmp.c +++ b/cde/programs/dthelp/parser/pass2/util/triepdmp.c @@ -29,25 +29,13 @@ #include "basic.h" #include "trie.h" -void countdown( -#if defined(M_PROTO) - M_TRIE *parent, int *count -#endif - ) ; +void countdown(M_TRIE *parent, int *count); -void dumpnode( -#if defined(M_PROTO) - LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, + void (*proc)(FILE *file, void *value)); -void dumpptrie( -#if defined(M_PROTO) - M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, - void (*proc)(FILE *file, void *value) -#endif - ) ; +void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef, + void (*proc)(FILE *file, void *value)); /* Write the declaration of a packed trie to the specified files */ void dumpptrie(intname, extname, file, externdef, defdef, proc) @@ -56,12 +44,7 @@ void dumpptrie(intname, extname, file, externdef, defdef, proc) FILE *file ; char *externdef ; char *defdef ; - void (*proc) ( -#if defined (M_PROTO) - FILE *file, - void *value -#endif - ) ; + void (*proc) (FILE *file, void *value); { LOGICAL first = TRUE ; int count = 0 ; diff --git a/cde/programs/dthelp/parser/pass2/util/trieplk.c b/cde/programs/dthelp/parser/pass2/util/trieplk.c index 87af06c8f..1ee74fc4b 100644 --- a/cde/programs/dthelp/parser/pass2/util/trieplk.c +++ b/cde/programs/dthelp/parser/pass2/util/trieplk.c @@ -36,12 +36,7 @@ extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ; -int m_packedlook( -#if defined(M_PROTO) - M_PTRIE *xptrie, - M_WCHAR *name -#endif - ) ; +int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); /* Look for the string NAME in the packed trie PTRIE */ int m_packedlook(xptrie, name) diff --git a/cde/programs/dthelp/parser/pass2/util/upcmp8.c b/cde/programs/dthelp/parser/pass2/util/upcmp8.c index 5a8b2cd20..627681b70 100644 --- a/cde/programs/dthelp/parser/pass2/util/upcmp8.c +++ b/cde/programs/dthelp/parser/pass2/util/upcmp8.c @@ -32,30 +32,13 @@ #include "common.h" extern M_CHARTYPE m_ctarray[256] ; -int m_wcupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const M_WCHAR *q -#endif - ) ; +int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q); -int m_wcmbupstrcmp( -#if defined(M_PROTO) - const M_WCHAR *p, const char *q -#endif - ) ; +int m_wcmbupstrcmp(const M_WCHAR *p, const char *q); -int m_mbmbupstrcmp( -#if defined(M_PROTO) - const char *p, const char *q -#endif - ) ; +int m_mbmbupstrcmp(const char *p, const char *q); -#if defined(M_PROTO) int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q ) -#else -int m_wcupstrcmp(p, q) - M_WCHAR *p, *q ; -#endif /* M_PROTO */ { do { if (m_ctupper(*p) < m_ctupper(*q)) return(-1) ; @@ -65,13 +48,7 @@ int m_wcupstrcmp(p, q) return(0) ; } -#if defined(M_PROTO) int m_wcmbupstrcmp(const M_WCHAR *p, const char *q) -#else -int m_wcmbupstrcmp(p, q) - M_WCHAR *p; - char *q ; -#endif { M_WCHAR *wc; int retval; @@ -82,13 +59,7 @@ int m_wcmbupstrcmp(p, q) return retval; } -#if defined(M_PROTO) int m_mbmbupstrcmp(const char *p, const char *q) -#else -int m_mbmbupstrcmp(p, q) - char *p; - char *q ; -#endif { M_WCHAR *w_p, *w_q; int retval; diff --git a/cde/programs/dthelp/parser/pass2/util/upper.c b/cde/programs/dthelp/parser/pass2/util/upper.c index 4fbc5c192..34d21271a 100644 --- a/cde/programs/dthelp/parser/pass2/util/upper.c +++ b/cde/programs/dthelp/parser/pass2/util/upper.c @@ -29,11 +29,7 @@ #include "basic.h" -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); int m_upper(c) int c ; diff --git a/cde/programs/dthelp/parser/pass2/util/upstrcmp.c b/cde/programs/dthelp/parser/pass2/util/upstrcmp.c index b5c37861f..6033a2567 100644 --- a/cde/programs/dthelp/parser/pass2/util/upstrcmp.c +++ b/cde/programs/dthelp/parser/pass2/util/upstrcmp.c @@ -29,17 +29,9 @@ #include "basic.h" -int m_upper( -#if defined(M_PROTO) - int c -#endif - ) ; +int m_upper(int c); -int m_upstrcmp( -#if defined(M_PROTO) - char *p, char *q -#endif - ) ; +int m_upstrcmp(char *p, char *q); int m_upstrcmp(p, q) char *p, *q ; diff --git a/cde/programs/dthelp/parser/pass2/util/wchar.c b/cde/programs/dthelp/parser/pass2/util/wchar.c index 08bf275ab..8fdfd0855 100644 --- a/cde/programs/dthelp/parser/pass2/util/wchar.c +++ b/cde/programs/dthelp/parser/pass2/util/wchar.c @@ -32,13 +32,7 @@ /* compare two wide character strings */ -#if defined(M_PROTO) int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2) -#else -int w_strcmp(string1, string2) -M_WCHAR *string1; -M_WCHAR *string2; -#endif { M_WCHAR c1, c2, null; @@ -60,14 +54,7 @@ while (1) /* compare two wide character strings to length "n" */ -#if defined(M_PROTO) int w_strncmp(const M_WCHAR *string1, const M_WCHAR *string2, int max) -#else -int w_strcmp(string1, string2, max) -M_WCHAR *string1; -M_WCHAR *string2; -int max; -#endif { M_WCHAR c1, c2, null; @@ -91,13 +78,7 @@ return 0; /* copy a wide character string */ -#if defined(M_PROTO) M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2) -#else -M_WCHAR *w_strcpy(string1, string2) -M_WCHAR *string1; -M_WCHAR *string2; -#endif { M_WCHAR *string1start; @@ -110,14 +91,7 @@ return string1start; /* copy a wide character string, stopping after "max" moves */ -#if defined(M_PROTO) M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max) -#else -M_WCHAR *w_strncpy(string1, string2, max) -M_WCHAR *string1; -M_WCHAR *string2; -int max; -#endif { M_WCHAR *string1start; @@ -130,12 +104,7 @@ return string1start; /* get the length of a wide character string */ -#if defined(M_PROTO) int w_strlen(const M_WCHAR *string) -#else -int w_strlen(string) -M_WCHAR *string; -#endif { int length; @@ -148,12 +117,7 @@ return length; /* find wide character "chr" in wide string "string" */ -#if defined(M_PROTO) M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr) -#else -M_WCHAR *w_strchr(string, chr) -M_WCHAR *string, chr; -#endif { M_WCHAR *where; @@ -173,12 +137,7 @@ else /* find wide character "chr" in wide string "string" */ -#if defined(M_PROTO) M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2) -#else -M_WCHAR *w_strstr(string1, string2) -M_WCHAR *string1, *string2; -#endif { M_WCHAR *where1, *where2; @@ -213,12 +172,7 @@ return NULL; /* make a multi-byte string from a wide character string */ -#if defined(M_PROTO) char *MakeMByteString(const M_WCHAR *wc_string) -#else -char *MakeMByteString(wc_string) -M_WCHAR *wc_string; -#endif { char *mb_string; int length, retVal; @@ -248,12 +202,7 @@ return mb_string; /* make a wide character string from a multi-byte string */ -#if defined(M_PROTO) M_WCHAR *MakeWideCharString(const char *mb_string) -#else -M_WCHAR *MakeWideCharString(mb_string) -char *mb_string; -#endif { M_WCHAR *wc_string, *wc_stringStart; int length, incr; diff --git a/cde/programs/dthelp/parser/pass2/util/whitesp.c b/cde/programs/dthelp/parser/pass2/util/whitesp.c index 50b1755cc..39087f8c6 100644 --- a/cde/programs/dthelp/parser/pass2/util/whitesp.c +++ b/cde/programs/dthelp/parser/pass2/util/whitesp.c @@ -27,19 +27,10 @@ #include "basic.h" -LOGICAL m_whitespace( -#if defined(M_PROTO) - M_WCHAR c -#endif - ) ; +LOGICAL m_whitespace(M_WCHAR c); /* Test if character c is a blank, tab, or carriage return */ -#if defined(M_PROTO) LOGICAL m_whitespace(M_WCHAR c) -#else -LOGICAL m_whitespace(c) - M_WCHAR c ; -#endif { char mb_c[32]; /* arbitrarily large */ int length;