From 757249c65b31f7eec0d2eab247eaf58e5a43aab0 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Sat, 23 Jun 2018 00:48:36 +0100 Subject: [PATCH] dthelp: Remove always on macro M_NOPAR which was just there to support ancient compilers that don't have 'void' --- .../dthelp/parser.ccdf/htag/build/buildutl.c | 8 +- .../dthelp/parser.ccdf/htag/build/except.c | 2 +- .../dthelp/parser.ccdf/htag/build/fsa.c | 12 +-- .../dthelp/parser.ccdf/htag/build/out.c | 14 ++-- .../dthelp/parser.ccdf/htag/build/param.c | 6 +- .../dthelp/parser.ccdf/htag/build/proto.h | 54 +++++++------- .../dthelp/parser.ccdf/htag/build/scan.c | 2 +- .../dthelp/parser.ccdf/htag/build/sref.c | 2 +- .../dthelp/parser.ccdf/htag/build/tree.c | 4 +- .../parser.ccdf/htag/eltdef/context.dat | 6 +- .../dthelp/parser.ccdf/htag/eltdef/eltdef.h | 1 - .../dthelp/parser.ccdf/htag/eltdef/eltutil.c | 36 ++++----- .../dthelp/parser.ccdf/htag/eltdef/entity.c | 2 +- .../dthelp/parser.ccdf/htag/eltdef/proto.h | 34 ++++----- .../dthelp/parser.ccdf/htag/eltdef/scan.c | 2 +- .../dthelp/parser.ccdf/htag/helptag/custom.c | 8 +- .../dthelp/parser.ccdf/htag/helptag/fproto.h | 66 ++++++++--------- .../dthelp/parser.ccdf/htag/helptag/help.c | 18 ++--- .../dthelp/parser.ccdf/htag/helptag/out.c | 4 +- .../dthelp/parser.ccdf/htag/helptag/xref.c | 4 +- .../dthelp/parser.ccdf/htag/parser/actutil.c | 4 +- .../dthelp/parser.ccdf/htag/parser/eprefix.c | 2 +- .../dthelp/parser.ccdf/htag/parser/error.c | 10 +-- .../dthelp/parser.ccdf/htag/parser/esuffix.c | 2 +- .../dthelp/parser.ccdf/htag/parser/getsign.c | 2 +- .../dthelp/parser.ccdf/htag/parser/input.c | 8 +- .../dthelp/parser.ccdf/htag/parser/minim.c | 6 +- .../dthelp/parser.ccdf/htag/parser/openfrst.c | 2 +- .../dthelp/parser.ccdf/htag/parser/param.c | 6 +- .../dthelp/parser.ccdf/htag/parser/parutil.c | 6 +- .../dthelp/parser.ccdf/htag/parser/proto.h | 74 +++++++++---------- .../dthelp/parser.ccdf/htag/parser/scan.c | 10 +-- .../dthelp/parser.ccdf/htag/parser/setopt.c | 2 +- .../dthelp/parser.ccdf/htag/parser/startdoc.c | 2 +- .../dthelp/parser.ccdf/htag/parser/struct.c | 8 +- .../dthelp/parser.ccdf/htag/util/basic.h | 2 - .../dthelp/parser.ccdf/htag/util/cont.h | 16 ++-- .../dthelp/parser.ccdf/htag/util/conutil.c | 16 ++-- .../dthelp/parser.ccdf/htag/util/error.c | 4 +- .../dthelp/parser.ccdf/htag/util/initct.c | 4 +- .../dthelp/parser.ccdf/htag/util/malloc.c | 4 +- .../dthelp/parser.ccdf/htag/util/scanutil.c | 2 +- .../dthelp/parser.ccdf/htag/util/trie.c | 2 +- .../dthelp/parser.ccdf/htag/util/trie.h | 2 +- .../dthelp/parser/canon1/build/buildutl.c | 8 +- .../dthelp/parser/canon1/build/except.c | 2 +- cde/programs/dthelp/parser/canon1/build/fsa.c | 12 +-- cde/programs/dthelp/parser/canon1/build/out.c | 14 ++-- .../dthelp/parser/canon1/build/param.c | 6 +- .../dthelp/parser/canon1/build/proto.h | 54 +++++++------- .../dthelp/parser/canon1/build/scan.c | 2 +- .../dthelp/parser/canon1/build/sref.c | 2 +- .../dthelp/parser/canon1/build/tree.c | 4 +- .../dthelp/parser/canon1/eltdef/context.dat | 6 +- .../dthelp/parser/canon1/eltdef/eltdef.h | 1 - .../dthelp/parser/canon1/eltdef/eltutil.c | 36 ++++----- .../dthelp/parser/canon1/eltdef/entity.c | 2 +- .../dthelp/parser/canon1/eltdef/proto.h | 34 ++++----- .../dthelp/parser/canon1/eltdef/scan.c | 2 +- .../dthelp/parser/canon1/helptag/custom.c | 8 +- .../dthelp/parser/canon1/helptag/fproto.h | 44 +++++------ .../dthelp/parser/canon1/helptag/help.c | 12 +-- .../dthelp/parser/canon1/helptag/out.c | 2 +- .../dthelp/parser/canon1/helptag/xref.c | 4 +- .../dthelp/parser/canon1/parser/actutil.c | 4 +- .../dthelp/parser/canon1/parser/eprefix.c | 2 +- .../dthelp/parser/canon1/parser/error.c | 10 +-- .../dthelp/parser/canon1/parser/esuffix.c | 2 +- .../dthelp/parser/canon1/parser/getsign.c | 2 +- .../dthelp/parser/canon1/parser/input.c | 8 +- .../dthelp/parser/canon1/parser/minim.c | 6 +- .../dthelp/parser/canon1/parser/openfrst.c | 2 +- .../dthelp/parser/canon1/parser/param.c | 6 +- .../dthelp/parser/canon1/parser/parutil.c | 6 +- .../dthelp/parser/canon1/parser/proto.h | 72 +++++++++--------- .../dthelp/parser/canon1/parser/scan.c | 8 +- .../dthelp/parser/canon1/parser/setopt.c | 2 +- .../dthelp/parser/canon1/parser/startdoc.c | 2 +- .../dthelp/parser/canon1/parser/struct.c | 8 +- .../dthelp/parser/canon1/util/basic.h | 2 - cde/programs/dthelp/parser/canon1/util/cont.h | 16 ++-- .../dthelp/parser/canon1/util/conutil.c | 16 ++-- .../dthelp/parser/canon1/util/error.c | 4 +- .../dthelp/parser/canon1/util/initct.c | 2 +- .../dthelp/parser/canon1/util/malloc.c | 4 +- .../dthelp/parser/canon1/util/scanutil.c | 2 +- cde/programs/dthelp/parser/canon1/util/trie.c | 2 +- cde/programs/dthelp/parser/canon1/util/trie.h | 2 +- .../dthelp/parser/pass1/build/buildutl.c | 8 +- .../dthelp/parser/pass1/build/except.c | 2 +- cde/programs/dthelp/parser/pass1/build/fsa.c | 12 +-- cde/programs/dthelp/parser/pass1/build/out.c | 14 ++-- .../dthelp/parser/pass1/build/param.c | 6 +- .../dthelp/parser/pass1/build/proto.h | 54 +++++++------- cde/programs/dthelp/parser/pass1/build/scan.c | 2 +- cde/programs/dthelp/parser/pass1/build/sref.c | 2 +- cde/programs/dthelp/parser/pass1/build/tree.c | 4 +- .../dthelp/parser/pass1/eltdef/context.dat | 6 +- .../dthelp/parser/pass1/eltdef/eltdef.h | 1 - .../dthelp/parser/pass1/eltdef/eltutil.c | 36 ++++----- .../dthelp/parser/pass1/eltdef/entity.c | 2 +- .../dthelp/parser/pass1/eltdef/proto.h | 34 ++++----- .../dthelp/parser/pass1/eltdef/scan.c | 2 +- .../dthelp/parser/pass1/helptag/custom.c | 8 +- .../dthelp/parser/pass1/helptag/fproto.h | 44 +++++------ .../dthelp/parser/pass1/helptag/help.c | 12 +-- .../dthelp/parser/pass1/helptag/out.c | 2 +- .../dthelp/parser/pass1/helptag/xref.c | 4 +- .../dthelp/parser/pass1/parser/actutil.c | 4 +- .../dthelp/parser/pass1/parser/eprefix.c | 2 +- .../dthelp/parser/pass1/parser/error.c | 10 +-- .../dthelp/parser/pass1/parser/esuffix.c | 2 +- .../dthelp/parser/pass1/parser/getsign.c | 2 +- .../dthelp/parser/pass1/parser/input.c | 8 +- .../dthelp/parser/pass1/parser/minim.c | 6 +- .../dthelp/parser/pass1/parser/openfrst.c | 2 +- .../dthelp/parser/pass1/parser/param.c | 6 +- .../dthelp/parser/pass1/parser/parutil.c | 6 +- .../dthelp/parser/pass1/parser/proto.h | 74 +++++++++---------- .../dthelp/parser/pass1/parser/scan.c | 10 +-- .../dthelp/parser/pass1/parser/setopt.c | 2 +- .../dthelp/parser/pass1/parser/startdoc.c | 2 +- .../dthelp/parser/pass1/parser/struct.c | 8 +- cde/programs/dthelp/parser/pass1/util/basic.h | 2 - cde/programs/dthelp/parser/pass1/util/cont.h | 16 ++-- .../dthelp/parser/pass1/util/conutil.c | 16 ++-- cde/programs/dthelp/parser/pass1/util/error.c | 4 +- .../dthelp/parser/pass1/util/initct.c | 2 +- .../dthelp/parser/pass1/util/malloc.c | 4 +- .../dthelp/parser/pass1/util/scanutil.c | 2 +- cde/programs/dthelp/parser/pass1/util/trie.c | 2 +- cde/programs/dthelp/parser/pass1/util/trie.h | 2 +- .../dthelp/parser/pass2/build/buildutl.c | 8 +- .../dthelp/parser/pass2/build/except.c | 2 +- cde/programs/dthelp/parser/pass2/build/fsa.c | 12 +-- cde/programs/dthelp/parser/pass2/build/out.c | 14 ++-- .../dthelp/parser/pass2/build/param.c | 6 +- .../dthelp/parser/pass2/build/proto.h | 54 +++++++------- cde/programs/dthelp/parser/pass2/build/scan.c | 2 +- cde/programs/dthelp/parser/pass2/build/sref.c | 2 +- cde/programs/dthelp/parser/pass2/build/tree.c | 4 +- .../dthelp/parser/pass2/eltdef/context.dat | 6 +- .../dthelp/parser/pass2/eltdef/eltdef.h | 1 - .../dthelp/parser/pass2/eltdef/eltutil.c | 36 ++++----- .../dthelp/parser/pass2/eltdef/entity.c | 2 +- .../dthelp/parser/pass2/eltdef/proto.h | 34 ++++----- .../dthelp/parser/pass2/eltdef/scan.c | 2 +- .../dthelp/parser/pass2/htag2/custom.c | 8 +- .../dthelp/parser/pass2/htag2/fproto.h | 12 +-- .../dthelp/parser/pass2/parser/actutil.c | 4 +- .../dthelp/parser/pass2/parser/eprefix.c | 2 +- .../dthelp/parser/pass2/parser/error.c | 10 +-- .../dthelp/parser/pass2/parser/esuffix.c | 2 +- .../dthelp/parser/pass2/parser/getsign.c | 2 +- .../dthelp/parser/pass2/parser/input.c | 8 +- .../dthelp/parser/pass2/parser/minim.c | 6 +- .../dthelp/parser/pass2/parser/openfrst.c | 2 +- .../dthelp/parser/pass2/parser/param.c | 6 +- .../dthelp/parser/pass2/parser/parutil.c | 6 +- .../dthelp/parser/pass2/parser/proto.h | 74 +++++++++---------- .../dthelp/parser/pass2/parser/scan.c | 10 +-- .../dthelp/parser/pass2/parser/setopt.c | 2 +- .../dthelp/parser/pass2/parser/startdoc.c | 2 +- .../dthelp/parser/pass2/parser/struct.c | 8 +- cde/programs/dthelp/parser/pass2/util/basic.h | 2 - cde/programs/dthelp/parser/pass2/util/cont.h | 16 ++-- .../dthelp/parser/pass2/util/conutil.c | 16 ++-- cde/programs/dthelp/parser/pass2/util/error.c | 4 +- .../dthelp/parser/pass2/util/initct.c | 4 +- .../dthelp/parser/pass2/util/malloc.c | 4 +- .../dthelp/parser/pass2/util/scanutil.c | 2 +- cde/programs/dthelp/parser/pass2/util/trie.c | 2 +- cde/programs/dthelp/parser/pass2/util/trie.h | 2 +- 173 files changed, 882 insertions(+), 894 deletions(-) diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c b/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c index 5ceb2601..7ba1b45e 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c @@ -62,7 +62,7 @@ if (*flag) } /* Program initialization */ -void initialize(M_NOPAR) +void initialize(void) { char **mb_delims; M_WCHAR **wc_delims; @@ -90,7 +90,7 @@ ruleinit() ; /* Initialization before starting a new rule */ -void ruleinit(M_NOPAR) +void ruleinit(void) { /* Reinitialize for next rule */ lhs = NULL ; @@ -110,7 +110,7 @@ void ruleinit(M_NOPAR) } /* Rule end processing */ -void rulend(M_NOPAR) +void rulend(void) { STATE *fsa ; LOGICAL canbenull ; @@ -150,7 +150,7 @@ void rulend(M_NOPAR) } /* Skip rest of statement after an error */ -void skiptoend(M_NOPAR) +void skiptoend(void) { int i ; static errlev = 0 ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/except.c b/cde/programs/dthelp/parser.ccdf/htag/build/except.c index 035f3306..48437cc1 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/except.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/except.c @@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "build.h" /* Add an exception (inclusion or exclusion) for the current element */ -void addex(M_NOPAR) +void addex(void) { excount++ ; *nextex = (EXCEPTION *) m_malloc(sizeof(EXCEPTION), "exception") ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c b/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c index 42488ace..e89448a0 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c @@ -176,7 +176,7 @@ void dellist(list) /* Delstartarcs deletes the contents of the starta list of arcs from start states of a submodel */ -void delstartarcs(M_NOPAR) +void delstartarcs(void) { ARC *arcptr ; ARC *discard ; @@ -190,7 +190,7 @@ void delstartarcs(M_NOPAR) } /* Getand allocates and initializes a new andgroup structure */ -ANDGROUP *getand(M_NOPAR) +ANDGROUP *getand(void) { ANDGROUP *new ; @@ -203,7 +203,7 @@ ANDGROUP *getand(M_NOPAR) } /* Getstate obtains an FSA state */ -STATE *getstate(M_NOPAR) +STATE *getstate(void) { STATE *new ; @@ -477,7 +477,7 @@ LOGICAL permitspcd(a) /* Pop pops the submodel stack when the end of the current submodel is encountered */ -void pop(M_NOPAR) +void pop(void) { STACK *discard ; @@ -493,7 +493,7 @@ void pop(M_NOPAR) } /* Push pushes the submodel stack when a new group is encountered */ -void push(M_NOPAR) +void push(void) { STACK *new ; @@ -647,7 +647,7 @@ void savelhs(LOGICAL param) /* Called when arcs are added to the start state of a submodel that is also a start state of the parent model to set the parent model's starta list */ -void savestartarcs(M_NOPAR) +void savestartarcs(void) { ARC *carcptr, *parcptr ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/out.c b/cde/programs/dthelp/parser.ccdf/htag/build/out.c index 47d65f5c..e2503cea 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/out.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/out.c @@ -86,7 +86,7 @@ char *deftype(n) } /* Called after all input is read to generate output */ -void done(M_NOPAR) +void done(void) { if (! eltree.data) { @@ -166,7 +166,7 @@ void eltblocks(tempfile) /* Writes data about elements */ -void eltreeout(M_NOPAR) +void eltreeout(void) { M_WCHAR *p ; int enameindex = 0 ; @@ -244,7 +244,7 @@ char *enttype(n) } /* Outputs exception lists */ -void exout(M_NOPAR) +void exout(void) { EXCEPTION *ex ; int exindex = 0 ; @@ -267,7 +267,7 @@ void exout(M_NOPAR) } /* Outputs FSA definitions */ -void fsa(M_NOPAR) +void fsa(void) { int arcount = 0 ; STATE *pstate ; @@ -330,7 +330,7 @@ void fsa(M_NOPAR) } /* Writes data about parameters */ -void parout(M_NOPAR) +void parout(void) { PARAMETER *paramp ; LOGICAL first = TRUE ; @@ -479,7 +479,7 @@ char *partype(n) } /* Write short reference information */ -void srefout(M_NOPAR) +void srefout(void) { LOGICAL first = TRUE ; int *mapbysref ; @@ -626,7 +626,7 @@ fputs(" <\\END-STRING>\n", tempfile) ; } /* Write template */ -void template(M_NOPAR) +void template(void) { FILE *tempfile ; M_ENTITY *ent ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/param.c b/cde/programs/dthelp/parser.ccdf/htag/build/param.c index 4d6d9a8e..2fb2d549 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/param.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/param.c @@ -38,7 +38,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Add a keyword to the list of possible values of a keyword parameter for the current element */ -void addkeyword(M_NOPAR) +void addkeyword(void) { int length ; PARAMETER *par ; @@ -87,7 +87,7 @@ ptypelen++ ; } /* Add a parameter to the current element */ -void addpar(M_NOPAR) +void addpar(void) { PARAMETER *paramp, *last ; int length ; @@ -259,7 +259,7 @@ switch (newpar->type) } /* Called at end of parameter attribute list rule */ -void prulend(M_NOPAR) +void prulend(void) { LHS *lhsp ; LHS *discard ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/proto.h b/cde/programs/dthelp/parser.ccdf/htag/build/proto.h index 2297a722..a8b7c96c 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/proto.h +++ b/cde/programs/dthelp/parser.ccdf/htag/build/proto.h @@ -36,15 +36,15 @@ void adddefent(M_WCHAR *mapname); LOGICAL addent(M_WCHAR *name); -void addex(M_NOPAR); +void addex(void); -void addkeyword(M_NOPAR); +void addkeyword(void); LOGICAL addmapname(M_WCHAR *p, LOGICAL define); void addndent(M_WCHAR *p); -void addpar(M_NOPAR); +void addpar(void); void addsref(M_WCHAR *p); @@ -63,15 +63,15 @@ void copyintolist(STATELIST *from, STATELIST **to); void countdown(M_TRIE *parent, int *count); -void defmapname(M_NOPAR); +void defmapname(void); char *deftype(int n); void dellist(STATELIST **list); -void delstartarcs(M_NOPAR); +void delstartarcs(void); -void done(M_NOPAR); +void done(void); void dumpentnode(FILE *file, M_TRIE *value); @@ -91,9 +91,9 @@ void m_dumptrie(FILE *file, void eltblocks(FILE *tempfile); -void eltreeout(M_NOPAR); +void eltreeout(void); -void endmodel(M_NOPAR); +void endmodel(void); void entout(char *fname); @@ -107,7 +107,7 @@ 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 exout(void); void m_free(void *block, char *msg); @@ -115,23 +115,23 @@ void freetree(TREE *ruletree); void found(LOGICAL *flag, char *delim); -void fsa(M_NOPAR); +void fsa(void); -int getachar(M_NOPAR); +int getachar(void); -ANDGROUP *getand(M_NOPAR); +ANDGROUP *getand(void); LOGICAL getname(int first); -STATE *getstate(M_NOPAR); +STATE *getstate(void); int gettoken(int *c, int context); -TREE *gettreenode(M_NOPAR); +TREE *gettreenode(void); -void m_initctype(M_NOPAR); +void m_initctype(void); -void initialize(M_NOPAR); +void initialize(void); LOGICAL litproc(int delim); @@ -161,49 +161,49 @@ ELTSTRUCT *ntrelt(M_WCHAR *p); void m_openchk(FILE **ptr, char *name, char *mode); -void parout(M_NOPAR); +void parout(void); char *partype(int n); LOGICAL permitspcd(ARC *a); -void pop(M_NOPAR); +void pop(void); -void prulend(M_NOPAR); +void prulend(void); -void push(M_NOPAR); +void push(void); LOGICAL regenerate(TREE *start, TREE *stop); void repeat(TREE *root); -void ruleinit(M_NOPAR); +void ruleinit(void); -void rulend(M_NOPAR); +void rulend(void); LOGICAL samelabelarc(ARC *a, STATE *s); void savelhs(LOGICAL param); -void savestartarcs(M_NOPAR); +void savestartarcs(void); -int scan(M_NOPAR); +int scan(void); void setdefault(const M_WCHAR *string); void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional); -void skiptoend(M_NOPAR); +void skiptoend(void); int m_sprscon(int i, int j); -void srefout(M_NOPAR); +void srefout(void); STATE *startfsa(TREE *root, LOGICAL *canbenull); void tempelt(ELTSTRUCT *eltp, FILE *tempfile); -void template(M_NOPAR); +void template(void); char *typecon(int n); diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/scan.c b/cde/programs/dthelp/parser.ccdf/htag/build/scan.c index d13b6fe5..df96b137 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/scan.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/scan.c @@ -74,7 +74,7 @@ return(TRUE); } /* Returns the next token to the main procedure */ -int scan(M_NOPAR) +int scan(void) { int c; int n; diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/sref.c b/cde/programs/dthelp/parser.ccdf/htag/build/sref.c index c31ced7b..bcfac456 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/sref.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/sref.c @@ -191,7 +191,7 @@ delim->data = thissref; /* Prefix left-hand side with "M-" to create default short reference map name, truncating to M_NAMELEN characters if necessary */ -void defmapname(M_NOPAR) +void defmapname(void) { if (!wc_prefix) { diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/tree.c b/cde/programs/dthelp/parser.ccdf/htag/build/tree.c index 9dcdc172..052c7029 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/build/tree.c +++ b/cde/programs/dthelp/parser.ccdf/htag/build/tree.c @@ -36,7 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Called after a right parenthesis is read while scanning a content model. Resets curcon if it is the outermost submodel. */ -void endmodel(M_NOPAR) +void endmodel(void) { curtree = curtree->parent ; if (! curtree->parent) curcon = LASTM ; @@ -58,7 +58,7 @@ void freetree(treep) } /* Gettreenode obtains a node to use in the tree representation of a rule */ -TREE *gettreenode(M_NOPAR) +TREE *gettreenode(void) { TREE *new ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/context.dat b/cde/programs/dthelp/parser.ccdf/htag/eltdef/context.dat index 0d2f2bf5..f0d4fdb2 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/context.dat +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/context.dat @@ -398,7 +398,7 @@ tagc postent:start codetagc:inentc { startcode(entity->codeindex, &inent, entfile, - "c", nopar, nopar, "") ; + "c", "void", "void", "") ; } close:preparam sschain:inss { @@ -420,11 +420,11 @@ tagc } scchain:insc { *getaction(scarray) = ++sactions ; - startcode(sactions, &insc, sfile, "s", nopar, nopar, "") ; + startcode(sactions, &insc, sfile, "s", "void", "void", "") ; } ecchain:inec { *getaction(ecarray) = ++eactions ; - startcode(eactions, &inec, efile, "e", nopar, nopar, "") ; + startcode(eactions, &inec, efile, "e", "void", "void", "") ; } stcchain:instc { *getaction(stcarray) = ++stactions ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.h b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.h index 4edb7d4b..17921b2d 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.h +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.h @@ -215,7 +215,6 @@ ELTEXTERN int restart ELTINIT(RENTITY) ; #define stproto "M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END" #define stformal "m_string, M_START, M_END" #define stft " M_WCHAR *m_string ;\n LOGICAL M_START ;\n LOGICAL M_END ;\n" -#define nopar "M_NOPAR" /* Structures for generating defines for parameter values */ ELTEXTERN M_TRIE parval ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c index 4ae71e5a..d5684d98 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c @@ -92,7 +92,7 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto) /* Called when the C identifier to be #define'd to a parameter value is scanned */ -void cvalue(M_NOPAR) +void cvalue(void) { PARVAL *new; @@ -111,18 +111,18 @@ void cvalue(M_NOPAR) /* Called after last input character is read to place closing punctuation at end of output files and close them */ -void done(M_NOPAR) +void done(void) { M_ENTITY *ent; ACTION *actp; LOGICAL first; int i; - closeiffile(inent, entfile, codeent, "c", nopar); + closeiffile(inent, entfile, codeent, "c", "void"); closeiffile(intext, tfile, tactions, "t", tproto); closeiffile(inpc, pfile, pactions, "p", pproto); - closeiffile(insc, sfile, sactions, "s", nopar); - closeiffile(inec, efile, eactions, "e", nopar); + closeiffile(insc, sfile, sactions, "s", "void"); + closeiffile(inec, efile, eactions, "e", "void"); closeiffile(instc, stfile, stactions, "st", stproto); endstring(); @@ -190,7 +190,7 @@ void endcode(LOGICAL flag, FILE *file) } /* Called at the end of all initial fields in the interface definition */ -void endini(M_NOPAR) +void endini(void) { if (finitext) fputs(" putc(m_textchar, m_outfile);\n", tfile); @@ -209,7 +209,7 @@ void endini(M_NOPAR) /* End the sign-on message */ #include -void endsignon(M_NOPAR) +void endsignon(void) { long storetime; char *p; @@ -255,7 +255,7 @@ void endsignon(M_NOPAR) } /* Closes a start-string or end-string */ -void endstring(M_NOPAR) +void endstring(void) { if (instring) { if (stringstart) stringstart = FALSE; @@ -282,7 +282,7 @@ void enttype(type) } /* Free storage used for a context-specification chain */ -void freechain(M_NOPAR) +void freechain(void) { CHAIN *chainp, *dchainp; @@ -333,7 +333,7 @@ int *getaction(array) } /* Allocate new action structure */ -ACTION *getactstruct(M_NOPAR) +ACTION *getactstruct(void) { ACTION *new; @@ -347,7 +347,7 @@ ACTION *getactstruct(M_NOPAR) } /* Program initialization */ -void initialize(M_NOPAR) +void initialize(void) { char **mb_delims; M_WCHAR **wc_delims; @@ -411,13 +411,13 @@ fputs("#endif\n", ifh); startcode(pactions, &inpc, pfile, "p", pproto, pformal, pftype); startcode(tactions, &intext, tfile, "t", tproto, tformal, tftype); -startcode(sactions, &insc, sfile, "s", nopar, nopar, ""); -startcode(eactions, &inec, efile, "e", nopar, nopar, ""); +startcode(sactions, &insc, sfile, "s", "void", "void", ""); +startcode(eactions, &inec, efile, "e", "void", "void", ""); startcode(stactions, &instc, stfile, "st", stproto, stformal, stft); } /* Output definitions for strings */ -void outstring(M_NOPAR) +void outstring(void) { int c; @@ -480,7 +480,7 @@ for ( ; p ; p = p->next) } /* Skip rest of statement after an error */ -void skiptoend(M_NOPAR) +void skiptoend(void) { int i; static errlev = 0; @@ -581,7 +581,7 @@ fprintf(file, "{\n/* line %d \"%s\" */\n", m_line, iffile); /* balance "}" */ } /* Begins processing a new element */ -void startelement(M_NOPAR) +void startelement(void) { CVARSTRUCT *cvarp; CVARSTRUCT *discard; @@ -602,7 +602,7 @@ void startelement(M_NOPAR) } /* Stores the name of a C variable read from the input file */ -void storecvar(M_NOPAR) +void storecvar(void) { CVARSTRUCT *new; @@ -617,7 +617,7 @@ void storecvar(M_NOPAR) /* Compares the parameter name associated with a C variable in the input file with the names of all parameters of the current element. Stores result for later output with code segments */ -void storepname(M_NOPAR) +void storepname(void) { int i, par; diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c index 1b3857f9..ca391efe 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c @@ -35,7 +35,7 @@ #include "entext.h" /* Add an entity */ -void addent(M_NOPAR) +void addent(void) { M_ENTITY *new ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h b/cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h index ba94579a..1a42c193 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h @@ -30,7 +30,7 @@ void actptrout(ACTION **array, char *name); -void addent(M_NOPAR); +void addent(void); LOGICAL m_allwhite(const M_WCHAR *string); @@ -38,19 +38,19 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto); void countdown(M_TRIE *parent, int *count); -void cvalue(M_NOPAR); +void cvalue(void); -void done(M_NOPAR); +void done(void); void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, void (*proc)(M_ENTITY *)); void endcode(LOGICAL flag, FILE *file); -void endini(M_NOPAR); +void endini(void); -void endsignon(M_NOPAR); +void endsignon(void); -void endstring(M_NOPAR); +void endstring(void); void entout(char *fname); @@ -72,21 +72,21 @@ void m_exit(int status); void m_free(void *block, char *msg); -void freechain(M_NOPAR); +void freechain(void); -int getachar(M_NOPAR); +int getachar(void); int *getaction(ACTION **array); -ACTION *getactstruct(M_NOPAR); +ACTION *getactstruct(void); void getname(int first); int gettoken(int *c, int context); -void m_initctype(M_NOPAR); +void m_initctype(void); -void initialize(M_NOPAR); +void initialize(void); LOGICAL m_letter(M_WCHAR c); @@ -100,24 +100,24 @@ void m_openchk(FILE **ptr, char *name, char *mode); void outpval(M_TRIE *p); -void outstring(M_NOPAR); +void outstring(void); int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); const M_WCHAR *m_partype(const int par, const M_WCHAR *string); -int scan(M_NOPAR); +int scan(void); -void skiptoend(M_NOPAR); +void skiptoend(void); void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, char *formal, char *formtype); -void startelement(M_NOPAR); +void startelement(void); -void storecvar(M_NOPAR); +void storecvar(void); -void storepname(M_NOPAR); +void storepname(void); void undodelim(M_WCHAR *delim); diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/scan.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/scan.c index 43c22160..654986ba 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/scan.c +++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/scan.c @@ -85,7 +85,7 @@ ungetachar(c); } /* Reads the next token and returns it to the main procedure */ -int scan(M_NOPAR) +int scan(void) { int c; int n; diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/custom.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/custom.c index 4003d649..8c992f71 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/custom.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/custom.c @@ -37,7 +37,7 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co. /* Standard startup code doesn't have room to load inherited environments in some cases. Since they're not used, don't bother. (Using Microsoft C compiler). */ -void _setenvp(M_NOPAR); +void _setenvp(void); void _setenvp(){} #endif @@ -72,7 +72,7 @@ else } /* Write error message prefix */ -void m_eprefix(M_NOPAR) +void m_eprefix(void) { m_errline("\n*****\n"); m_dumpline(m_thisfile(), m_thisline()); @@ -96,7 +96,7 @@ for ( ; *p ; p++) #include #endif /* Write error message suffix */ -void m_esuffix(M_NOPAR) +void m_esuffix(void) { m_errline(":\n"); m_lastchars(); @@ -245,7 +245,7 @@ return(NULL); } /* Open input file */ -void *m_openfirst(M_NOPAR) +void *m_openfirst(void) { FILE *first; char *input; diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h b/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h index a44475b3..0ca272a2 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h @@ -26,18 +26,18 @@ void appstart(M_WCHAR *id, M_WCHAR *letter); -void assert_hometopic_exists(M_NOPAR); +void assert_hometopic_exists(void); void badgraphic(int filestat); -void basename(M_NOPAR); +void basename(void); void calcdisp (M_WCHAR *file, M_WCHAR *startrow, M_WCHAR *endrow, M_WCHAR *clip, M_WCHAR *margin); -void callndbeg (M_NOPAR); +void callndbeg (void); -void callndend (M_NOPAR); +void callndend (void); /* used by ccompspec(), cmenlspec(), and cwmenlspec() */ char *ccharspec(M_WCHAR textchar); @@ -61,11 +61,11 @@ M_WCHAR *mb_checkdimen(M_WCHAR *val, char *paramname, char *elt); M_WCHAR *checkent(M_WCHAR *entcontent); -void checkgloss(M_NOPAR); +void checkgloss(void); M_WCHAR *checkid(M_WCHAR *id); -void checkmsghead (M_NOPAR); +void checkmsghead (void); M_WCHAR *checkreal (M_WCHAR *val, M_WCHAR *paramname, LOGICAL msgout, M_WCHAR *elt); @@ -91,17 +91,17 @@ void cwmloutchar(M_WCHAR textchar, FILE *outfile); void defxref(FILE *xfile, M_WCHAR *id, struct xref *xref); -int do_esc_seq(M_NOPAR); +int do_esc_seq(void); -void dumpxref(M_NOPAR); +void dumpxref(void); void echohead(M_WCHAR *p); void mb_echohead(char *p); -void endhead(M_NOPAR); +void endhead(void); -void endhelpnode(M_NOPAR); +void endhelpnode(void); void esoutchar(M_WCHAR textchar); @@ -163,7 +163,7 @@ void itoletter(int n, char start, char *dest, int length); LOGICAL m_letter(M_WCHAR c); -void loadxref(M_NOPAR); +void loadxref(void); int m_lower(int c); @@ -179,7 +179,7 @@ void onlygraphic(char *param, M_WCHAR *magnify, M_WCHAR *video, M_WCHA M_WCHAR *margin, M_WCHAR *clip, M_WCHAR *penwidth, M_WCHAR *autoscale, M_WCHAR *plottype, M_WCHAR *hadjust, M_WCHAR *vadjust); -void open_new_helpfile(M_NOPAR); +void open_new_helpfile(void); void notallow(char *param1, char *param2); @@ -191,11 +191,11 @@ void outchar(M_WCHAR textchar, FILE *outfile); void outpi(int enttype, M_WCHAR *pi, M_WCHAR *entname); -void parspace(M_NOPAR); +void parspace(void); LOGICAL pushndok(LOGICAL val); -LOGICAL popndok(M_NOPAR); +LOGICAL popndok(void); void prfigborder(int val); @@ -223,9 +223,9 @@ void realoutchar(M_WCHAR textchar, FILE *outfile); void rsectstart(M_WCHAR *id, M_WCHAR *pagebreak); -void rseqend(M_NOPAR); +void rseqend(void); -void rshnewclear(M_NOPAR); +void rshnewclear(void); M_WCHAR *searchforfile(M_WCHAR *file); @@ -294,7 +294,7 @@ void svhdstring(M_WCHAR *string); void svtcstring(M_WCHAR *string); -void taboutre(M_NOPAR); +void taboutre(void); void termchar(M_WCHAR textchar); @@ -302,7 +302,7 @@ void termpi(int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname); void testindexfile(FILE *first); -void texinit(M_NOPAR); +void texinit(void); void unimp(M_WCHAR *eltname); @@ -336,11 +336,11 @@ double mb_usertopt(char *s); long usertosp(char *s); -void whereneedused(M_NOPAR); +void whereneedused(void); void t_addnotes(M_WCHAR *tnoteid); -void t_prntnotes(M_NOPAR); +void t_prntnotes(void); LOGICAL t_want_a_Q(int span_count); @@ -349,21 +349,21 @@ void t_xrefnotes(M_WCHAR *tnoteid); int t_getnum(char *s); -void t_insertcellmarkup(M_NOPAR); +void t_insertcellmarkup(void); -void t_newpage(M_NOPAR); +void t_newpage(void); -void t_startcolh(M_NOPAR); +void t_startcolh(void); -void t_start_tabhead_colh(M_NOPAR); +void t_start_tabhead_colh(void); -void t_nextcell(M_NOPAR); +void t_nextcell(void); -void t_checkcaption(M_NOPAR); +void t_checkcaption(void); -void t_preamble(M_NOPAR); +void t_preamble(void); -void t_getstyle(M_NOPAR); +void t_getstyle(void); void t_dospan(LOGICAL in_colh); @@ -371,7 +371,7 @@ void t_startcell(M_WCHAR *span, M_WCHAR *vspan, char *msg); void t_endcell(M_WCHAR *span, M_WCHAR *vspan); -void t_startrow(M_NOPAR); +void t_startrow(void); void t_endrow(M_WCHAR *taglevone); @@ -382,11 +382,11 @@ void t_tabstart(M_WCHAR *style, M_WCHAR *id, M_WCHAR *number, M_WCHAR *box, M_WC M_WCHAR *spacing, M_WCHAR *width, M_WCHAR *position, M_WCHAR *tonumber, M_WCHAR *divide, M_WCHAR *textsize); -void t_tablebody(M_NOPAR); +void t_tablebody(void); -void t_sendout_rowrule(M_NOPAR); +void t_sendout_rowrule(void); -void showmemavail(M_NOPAR); +void showmemavail(void); int m_upper(int c); @@ -395,7 +395,7 @@ char *GetDefaultHeaderString(char *elementName, char *defaultString); -void SetDefaultLocale(M_NOPAR); +void SetDefaultLocale(void); char *MakeMByteString(const M_WCHAR *from); diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c index 3b785f70..e3b2c77c 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/help.c @@ -95,7 +95,7 @@ tableno = 0; footnoteno = 1; } -void assert_hometopic_exists(M_NOPAR) +void assert_hometopic_exists(void) { char *string = GetDefaultHeaderString("UntitledElementDefaultHeadingString", @@ -123,7 +123,7 @@ m_free(string, "GetDefaultHeaderString return"); /* Determine base name for files (i.e., input name without extension). Open output and error files */ -void basename(M_NOPAR) +void basename(void) { char *p, *q; int n; @@ -816,7 +816,7 @@ return(NULL); /* Called at end of manual to report terms that occurred in the document but not entered in the glossary */ -void checkgloss(M_NOPAR) +void checkgloss(void) { int n; M_WCHAR id[MAXTERM + 1]; @@ -853,7 +853,7 @@ while (TRUE) /* End Error _DtMessage macro \starterrmsg call, check to see if Error _DtMessage head is user specified or default */ -void checkmsghead(M_NOPAR) +void checkmsghead(void) { char *string = GetDefaultHeaderString("MessagesElementDefaultHeadingString", @@ -920,7 +920,7 @@ return ( valid ); /* end a help node */ -void endhelpnode(M_NOPAR) +void endhelpnode(void) { } @@ -1735,7 +1735,7 @@ chapst = TRUE; /* Called at the end of a chapter, appendix, or section to end an open sequence of rsects */ -void rseqend(M_NOPAR) +void rseqend(void) { if (rsectseq) { @@ -1748,7 +1748,7 @@ if (rsectseq) sequence is not immediately followed by a new . Hence can output the \newpage macro call without concern about side effects on the page header */ -void rshnewclear(M_NOPAR) +void rshnewclear(void) { if (rsectholdnew) { @@ -1802,7 +1802,7 @@ return(NULL); /* show how much memory is available */ -void showmemavail(M_NOPAR) +void showmemavail(void) { int amount=0; char *p; @@ -2105,7 +2105,7 @@ m_entdupchk = FALSE; } /* Open and initialize TeX file */ -void texinit(M_NOPAR) +void texinit(void) { LOGICAL init = TRUE; unsigned char type; diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/out.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/out.c index 0745e70b..97cc0da1 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/out.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/out.c @@ -57,7 +57,7 @@ m_free(wc,"wide character string"); /* Called at end of a head in a chapter, appendix, section, or reference section */ -void endhead(M_NOPAR) +void endhead(void) { if (savid) { @@ -229,7 +229,7 @@ if (echo) } /* Called for normal paragraph spacing */ -void parspace(M_NOPAR) +void parspace(void) { if (unleaded) /* unleaded is a one-shot flag */ unleaded = FALSE; diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c b/cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c index 37b0c4b0..87d40949 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c +++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c @@ -143,7 +143,7 @@ m_free(csname, "csname"); /* Write cross-reference file for next time document is processed and TeX macro file for post-processing this pass */ -void dumpxref(M_NOPAR) +void dumpxref(void) { int n; M_WCHAR id[M_NAMELEN + 1]; @@ -213,7 +213,7 @@ xstrlen += length; /* Initializes cross-reference table reading in file output from previous pass through document */ -void loadxref(M_NOPAR) +void loadxref(void) { M_WCHAR id[M_NAMELEN + 1]; char c, d; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c index 3197d333..e6ea1529 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c @@ -137,7 +137,7 @@ void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int * /* Process global end string. In separate procedure to keep all references to if.h in one source file and minimize recompilation if interface changes. */ -void m_globes(M_NOPAR) +void m_globes(void) { M_WCHAR *wc_string; @@ -149,7 +149,7 @@ m_free(wc_string,"wide character string"); /* Process global start string. In separate procedure to keep all references to if.h in one source file and minimize recompilation if interface changes. */ -void m_globss(M_NOPAR) +void m_globss(void) { M_WCHAR *wc_string; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/eprefix.c b/cde/programs/dthelp/parser.ccdf/htag/parser/eprefix.c index a92f0682..e8b6ce55 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/eprefix.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/eprefix.c @@ -29,7 +29,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "globdec.h" /* Write error message prefix */ -void m_eprefix(M_NOPAR) +void m_eprefix(void) { m_errline("\n*****\n") ; } diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c index d44058fc..ce5dba91 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c @@ -336,7 +336,7 @@ void m_getline(file, line) /* Dump last characters read from input stream to give context to an error message */ -void m_lastchars(M_NOPAR) +void m_lastchars(void) { int i; M_WCHAR buffer[2]; @@ -385,14 +385,14 @@ if ((m_svlncnt[m_sysecnt] && } /* Display information about the current element */ -void m_showcurelt(M_NOPAR) +void m_showcurelt(void) { if (m_stacktop->oldtop) m_dispcurelt(m_stacktop->file, m_stacktop->line); } /* Start an error message */ -void m_startmsg(M_NOPAR) +void m_startmsg(void) { m_eprefix(); m_errexit = TRUE; @@ -400,7 +400,7 @@ void m_startmsg(M_NOPAR) /* Return the name of the current input file (most recently opened, but unclosed SYSTEM entity) */ -M_WCHAR *m_thisfile(M_NOPAR) +M_WCHAR *m_thisfile(void) { int i; @@ -413,7 +413,7 @@ M_WCHAR *m_thisfile(M_NOPAR) } /* Return the line number in the current input file */ -int m_thisline(M_NOPAR) +int m_thisline(void) { return(m_line[m_sysecnt]); } diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/esuffix.c b/cde/programs/dthelp/parser.ccdf/htag/parser/esuffix.c index 6f172692..ddcb9989 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/esuffix.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/esuffix.c @@ -32,7 +32,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #endif /* Write error message suffix */ -void m_esuffix(M_NOPAR) +void m_esuffix(void) { m_errline("\n") ; m_dumpline(m_thisfile(), m_thisline()) ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/getsign.c b/cde/programs/dthelp/parser.ccdf/htag/parser/getsign.c index 4cde83c1..9606d682 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/getsign.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/getsign.c @@ -34,7 +34,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "parser.h" #include "signonx.h" -void m_getsignon(M_NOPAR) +void m_getsignon(void) { m_errline(m_signon) ; } diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/input.c b/cde/programs/dthelp/parser.ccdf/htag/parser/input.c index eeb4adce..4a0c7055 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/input.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/input.c @@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "parser.h" /* M_etcomplete is called when a complete end-tag has been read */ -void m_etcomplete(M_NOPAR) +void m_etcomplete(void) { if (! m_scanel) { M_WCHAR *wc_etago, *wc_tagc; @@ -91,7 +91,7 @@ void m_frcend(val) /* M_frcstart is called to force the start of an element when that element cannot legally occur in the current context but does appear in the text*/ -void m_frcstart(M_NOPAR) +void m_frcstart(void) { m_push(m_scanel, m_element[m_scanel - 1].start, m_scannet) ; if (m_scannet) m_netlevel++ ; @@ -108,7 +108,7 @@ void m_frcstart(M_NOPAR) /* M_holdproc processes a RE that was saved to test if it was the last RE in an element's content */ -void m_holdproc(M_NOPAR) +void m_holdproc(void) { if (m_stacktop->holdre) { m_stacktop->holdre = FALSE ; @@ -122,7 +122,7 @@ void m_holdproc(M_NOPAR) } /* M_stcomplete is called when a complete start tag has been recognized */ -void m_stcomplete(M_NOPAR) +void m_stcomplete(void) { if (! m_scanel) return ; if (m_strtproc(m_scanel)) diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/minim.c b/cde/programs/dthelp/parser.ccdf/htag/parser/minim.c index 446307c8..4bfcee79 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/minim.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/minim.c @@ -43,7 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* M_expecting reports to the user the possible valid content at a particular state in the parse of the document */ -void m_expecting(M_NOPAR) +void m_expecting(void) { LOGICAL expstart = TRUE ; M_PARSE *stackptr ; @@ -276,7 +276,7 @@ M_ELEMENT m_findunique(from, newleft) /* M_nullendtag is called when a null end tag is encountered; i.e., at the end of a short element */ -void m_nullendtag(M_NOPAR) +void m_nullendtag(void) { LOGICAL foundnet ; @@ -307,7 +307,7 @@ void m_nullendtag(M_NOPAR) /* Tests to see if an end tag may have been omitted at this point in the parse.*/ -LOGICAL m_omitend(M_NOPAR) +LOGICAL m_omitend(void) { M_ANDGROUP pand ; M_OPENFSA *fsastack ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/openfrst.c b/cde/programs/dthelp/parser.ccdf/htag/parser/openfrst.c index 0a79d55d..2e07878e 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/openfrst.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/openfrst.c @@ -28,7 +28,7 @@ #include "userinc.h" #include "globdec.h" -void *m_openfirst(M_NOPAR) +void *m_openfirst(void) { return((void *) stdin) ; } diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c index 2c9b82b3..4eff4062 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c @@ -117,7 +117,7 @@ LOGICAL m_attvonly(string) /* Check a name previously saved in m_saveatt to see if it is the name of a valid parameter for the current start tag */ -void m_findatt(M_NOPAR) +void m_findatt(void) { int par, i ; @@ -220,7 +220,7 @@ void m_parupper(par, string) /* Set all parameters to their default values for an element included by tag minimization */ -void m_stkdefaultparams(M_NOPAR) +void m_stkdefaultparams(void) { int i, par = 0 ; @@ -272,7 +272,7 @@ void m_stkonedef(par, scanel, poccur, i) } /* Stack parameter values */ -void m_stkparams(M_NOPAR) +void m_stkparams(void) { int i, par ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c b/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c index a9f6d3c0..41e3f206 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c @@ -48,7 +48,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "version.h" /* Adjust parsing state after each token if necessary */ -void m_adjuststate(M_NOPAR) +void m_adjuststate(void) { if (m_curcon == START) { if (m_netlevel) { @@ -79,7 +79,7 @@ void m_adjuststate(M_NOPAR) /* Tests whether the element named in a tag is defined; if so, returns its index; otherwise return FALSE */ -M_ELEMENT m_eltname(M_NOPAR) +M_ELEMENT m_eltname(void) { M_ELEMENT eltid ; @@ -103,7 +103,7 @@ return i; } /* Program initialization */ -void m_initialize(M_NOPAR) +void m_initialize(void) { char **mb_delims; M_WCHAR **wc_delims; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/proto.h b/cde/programs/dthelp/parser.ccdf/htag/parser/proto.h index 52546490..e6d1002d 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/proto.h +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/proto.h @@ -21,9 +21,9 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 11:30:37 rswiston $ */ -int m_actgetc(M_NOPAR); +int m_actgetc(void); -void m_adjuststate(M_NOPAR); +void m_adjuststate(void); LOGICAL m_allwhite(const M_WCHAR *string); @@ -41,20 +41,20 @@ void m_closent(void *m_ptr); void m_codeent(int m_ent); -M_PARSE *m_copystackelt(M_NOPAR); +M_PARSE *m_copystackelt(void); 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_done(void); void m_dumpline(M_WCHAR *file, int line); void m_eduptype(int type); -M_ELEMENT m_eltname(M_NOPAR); +M_ELEMENT m_eltname(void); void m_endaction(M_ELEMENT m_elt); @@ -64,7 +64,7 @@ void m_endtag(M_ELEMENT c); void m_entexpand(M_ENTITY *openent); -void m_eprefix(M_NOPAR); +void m_eprefix(void); void m_err1(const char *text, const M_WCHAR *arg); @@ -87,15 +87,15 @@ void m_errline(char *p); void m_error(char *text); -void m_esuffix(M_NOPAR); +void m_esuffix(void); void m_exit(int status); -void m_etcomplete(M_NOPAR); +void m_etcomplete(void); LOGICAL m_excluded(M_ELEMENT elt); -void m_expecting(M_NOPAR); +void m_expecting(void); void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data); @@ -105,7 +105,7 @@ void m_exptend(LOGICAL *expstart, M_PARSE *stackptr); int m_findact(M_ELEMENT elt, int *array); -void m_findatt(M_NOPAR); +void m_findatt(void); void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild); @@ -116,7 +116,7 @@ M_ELEMENT m_findunique(M_STATE from, int *newleft); void m_frcend(M_ELEMENT val); -void m_frcstart(M_NOPAR); +void m_frcstart(void); void m_free(void *block, char *msg); @@ -140,23 +140,23 @@ void m_getline(M_WCHAR **file, int *line); void m_getname(M_WCHAR first); -void m_getsignon(M_NOPAR); +void m_getsignon(void); int m_gettoken(int *c, M_HOLDTYPE *dchar, int context); -void m_globes(M_NOPAR); +void m_globes(void); -void m_globss(M_NOPAR); +void m_globss(void); -void m_holdproc(M_NOPAR); +void m_holdproc(void); void m_inctest(int *count, int limit, char *message); -void m_initctype(M_NOPAR); +void m_initctype(void); -void m_initialize(M_NOPAR); +void m_initialize(void); -void m_lastchars(M_NOPAR); +void m_lastchars(void); int m_level(M_WCHAR *elt); @@ -182,17 +182,17 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LO void m_ntrent(M_WCHAR *p); -void m_nullendtag(M_NOPAR); +void m_nullendtag(void); -LOGICAL m_omitend(M_NOPAR); +LOGICAL m_omitend(void); -LOGICAL m_omitstart(M_NOPAR); +LOGICAL m_omitstart(void); void m_openchk(FILE **ptr, char *name, char *mode); void *m_openent(M_WCHAR *entcontent); -void *m_openfirst(M_NOPAR); +void *m_openfirst(void); void m_optstring(char *p); @@ -216,45 +216,45 @@ 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_pop(void); 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_readcomments(void); void *m_realloc(void *ptr, int size, char *msg); -int m_scan(M_NOPAR); +int m_scan(void); void m_setmap(int map, LOGICAL useoradd); -void m_setoptions(M_NOPAR); +void m_setoptions(void); void m_setparam(M_WCHAR **cvar, int par); void m_shortref(int context); -void m_showcurelt(M_NOPAR); +void m_showcurelt(void); void m_signmsg(char *p); -void m_sigre(M_NOPAR); +void m_sigre(void); -void m_startdoc(M_NOPAR); +void m_startdoc(void); -void m_startmsg(M_NOPAR); +void m_startmsg(void); void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END); -void m_stcomplete(M_NOPAR); +void m_stcomplete(void); -void m_stkdefaultparams(M_NOPAR); +void m_stkdefaultparams(void); void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i); -void m_stkparams(M_NOPAR); +void m_stkparams(void); void m_strtaction(M_ELEMENT m_elt); @@ -270,11 +270,11 @@ void m_textaction(M_WCHAR m_textchar); void m_textout(char *format, LOGICAL start, LOGICAL end); -LOGICAL m_textpermitted(M_NOPAR); +LOGICAL m_textpermitted(void); -M_WCHAR *m_thisfile(M_NOPAR); +M_WCHAR *m_thisfile(void); -int m_thisline(M_NOPAR); +int m_thisline(void); void m_trace(char *p); @@ -296,7 +296,7 @@ int m_mbmbupstrcmp(const char *p, const char *q); LOGICAL m_validinpar(M_WCHAR *string); -LOGICAL m_vldentref(M_NOPAR); +LOGICAL m_vldentref(void); 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 941872fc..7b61380a 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c @@ -51,7 +51,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "sref.h" /* Actually read a character from an input stream */ -int m_actgetc(M_NOPAR) +int m_actgetc(void) { int c ; @@ -689,7 +689,7 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, } /* Scans past a comment within a markup declaration */ -void m_readcomments(M_NOPAR) +void m_readcomments(void) { int c ; M_HOLDTYPE dchar ; @@ -702,7 +702,7 @@ void m_readcomments(M_NOPAR) } /* Scanner */ -int m_scan(M_NOPAR) +int m_scan(void) { int c ; M_HOLDTYPE dchar ; @@ -1035,7 +1035,7 @@ while (TRUE) or contextual end tag [linestat == M_SOMETHING] 3) If a record end might be the last one in an element, save it */ -void m_sigre(M_NOPAR) +void m_sigre(void) { /* Check for first RE in content and no preceding content */ if (m_start && @@ -1111,7 +1111,7 @@ void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread) } /* Have encountered an M_ERO. If the entity reference is valid, process it*/ -LOGICAL m_vldentref(M_NOPAR) +LOGICAL m_vldentref(void) { M_HOLDTYPE dchar ; int next ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/setopt.c b/cde/programs/dthelp/parser.ccdf/htag/parser/setopt.c index 2fc124f0..1b83c7a4 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/setopt.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/setopt.c @@ -30,7 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. /* Set program options */ -void m_setoptions(M_NOPAR) +void m_setoptions(void) { if (m_argc > 1) m_optstring(m_argv[1]) ; } diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/startdoc.c b/cde/programs/dthelp/parser.ccdf/htag/parser/startdoc.c index 9663447a..8280639c 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/startdoc.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/startdoc.c @@ -32,7 +32,7 @@ Copyright 1989 Hewlett-Packard Co. control after all entity declarations have been processed. Not needed in valid documents (when it is called just prior to global start-code), but may be useful in some applications nevertheless. */ -void m_startdoc(M_NOPAR) +void m_startdoc(void) { } diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c index bf69fb94..09dd0d03 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c +++ b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c @@ -191,7 +191,7 @@ LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet) /* Make a copy of the stack entry at the top of the parse stack in a scratch area */ -M_PARSE *m_copystackelt(M_NOPAR) +M_PARSE *m_copystackelt(void) { M_OPENFSA *oldfsa ; M_OPENFSA **newfsa ; @@ -219,7 +219,7 @@ M_PARSE *m_copystackelt(M_NOPAR) } /* End of document */ -void m_done(M_NOPAR) +void m_done(void) { M_ELEMENT lastelt ; @@ -395,7 +395,7 @@ LOGICAL m_nextand(thisfsa, label) } /* Pops the parse stack*/ -void m_pop(M_NOPAR) +void m_pop(void) { M_PARSE *stackelt ; @@ -661,7 +661,7 @@ void m_strttag(M_ELEMENT val, LOGICAL net) makes more sense, is used by MARKUP, and is under consideration by the Standards committee; the latter is the current definition in the Standard */ -LOGICAL m_textpermitted(M_NOPAR) +LOGICAL m_textpermitted(void) { M_ANDGROUP pand ; M_OPENFSA *fsastack ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/basic.h b/cde/programs/dthelp/parser.ccdf/htag/util/basic.h index 9c13a58b..a372f46b 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/basic.h +++ b/cde/programs/dthelp/parser.ccdf/htag/util/basic.h @@ -47,8 +47,6 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#define M_NOPAR void - char *MakeMByteString(const M_WCHAR *from); M_WCHAR *MakeWideCharString(const char *from); diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/cont.h b/cde/programs/dthelp/parser.ccdf/htag/util/cont.h index 2aaa6bde..2bdcaf8d 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/cont.h +++ b/cde/programs/dthelp/parser.ccdf/htag/util/cont.h @@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated. void countdown(M_TRIE *parent, int *count); -void dumpdlmptr(M_NOPAR); +void dumpdlmptr(void); void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)); @@ -53,17 +53,17 @@ void m_err1(char *text, char *arg); void getcode(int n); -void getcolon(M_NOPAR); +void getcolon(void); -int getcontext(M_NOPAR); +int getcontext(void); -LOGICAL getdname(M_NOPAR); +LOGICAL getdname(void); -void inccon(M_NOPAR); +void inccon(void); -void incdelim(M_NOPAR); +void incdelim(void); -void loaddelim(M_NOPAR); +void loaddelim(void); int m_lower(int c); @@ -81,7 +81,7 @@ void prtctxt(int column, int value); int readchar(LOGICAL cap); -void skiptoend(M_NOPAR); +void skiptoend(void); void unread(int c); diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c index 9620697e..fcee06cd 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c @@ -40,7 +40,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "cont.h" /* Output declaration of dlmptr */ -void dumpdlmptr(M_NOPAR) +void dumpdlmptr(void) { int n; @@ -214,7 +214,7 @@ while (TRUE) } /* End proc getcode() */ /* Read the colon separating the two states in a transition pair */ -void getcolon(M_NOPAR) +void getcolon(void) { int c ; /* c is int instead of char for use with ungetc */ M_WCHAR wcl; @@ -237,7 +237,7 @@ if (c != wcl) } /* Read a context name from an input line */ -int getcontext(M_NOPAR) +int getcontext(void) { M_WCHAR name[CNAMELEN + 1]; int c ; /* c is int instead of char for use with ungetc */ @@ -304,7 +304,7 @@ return(ccount - 1); } /* Read a delimiter name from the input line */ -LOGICAL getdname(M_NOPAR) +LOGICAL getdname(void) { int c; M_WCHAR *p; @@ -348,7 +348,7 @@ return(TRUE); } /* Out of context space. Increase. */ -void inccon(M_NOPAR) +void inccon(void) { M_TRIE **newtrie = NULL; int *newtransit = NULL; @@ -395,7 +395,7 @@ void inccon(M_NOPAR) } /* Increase delimiter space. */ -void incdelim(M_NOPAR) +void incdelim(void) { int *newtransit = NULL; char **newdlm = NULL; @@ -438,7 +438,7 @@ dcount++; } /* Read delimiter definitions from delim.dat */ -void loaddelim(M_NOPAR) +void loaddelim(void) { int c; M_WCHAR *p; @@ -642,7 +642,7 @@ return(c); /* Called by utility procedure m_error() -- has content in other programs that use m_error() */ -void skiptoend(M_NOPAR) +void skiptoend(void) { } diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/error.c b/cde/programs/dthelp/parser.ccdf/htag/util/error.c index 5853bc29..1fa8aba5 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/error.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/error.c @@ -56,7 +56,7 @@ void msgline(char *text); void msg1line(char *text, char *arg1); -void skiptoend(M_NOPAR); +void skiptoend(void); void m_wctrace(M_WCHAR *text); @@ -185,7 +185,7 @@ m_free(mb_arg5,"multi-byte string"); } /* Write error message suffix */ -void esuffix(M_NOPAR) +void esuffix(void) { fprintf(stderr, " (line %d) ****\n", m_line) ; fprintf(m_errfile, " (line %d) ****\n", m_line) ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/initct.c b/cde/programs/dthelp/parser.ccdf/htag/util/initct.c index 7bb5aa16..711df37e 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/initct.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/initct.c @@ -29,9 +29,9 @@ #include "common.h" extern char m_chartype[M_CHARSETLEN] ; -void m_initctype(M_NOPAR); +void m_initctype(void); -void m_initctype(M_NOPAR) +void m_initctype(void) { int i ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c index 4e831d9b..343d1122 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c @@ -42,7 +42,7 @@ void m_exit(int status); void m_free(void *block, char *msg); -void m_heapdump(M_NOPAR); +void m_heapdump(void); void *m_malloc(int size, char *msg); @@ -81,7 +81,7 @@ void m_free(block, msg) } #if defined(MSDOS) -void m_heapdump(M_NOPAR) +void m_heapdump(void) { struct _heapinfo hinfo ; int heapstatus ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/scanutil.c b/cde/programs/dthelp/parser.ccdf/htag/util/scanutil.c index e3eeb7e0..d916765c 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/scanutil.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/scanutil.c @@ -28,7 +28,7 @@ extern FILE *ifile; /* Getachar returns the next character from the input stream */ -int getachar(M_NOPAR) +int getachar(void) { int c; M_WCHAR wc,wnl; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/trie.c b/cde/programs/dthelp/parser.ccdf/htag/util/trie.c index 493f7204..67f79025 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/trie.c +++ b/cde/programs/dthelp/parser.ccdf/htag/util/trie.c @@ -85,7 +85,7 @@ void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c) } /* end entertree */ /* Gets a new node for a trie */ -M_TRIE *m_gettrienode(M_NOPAR) +M_TRIE *m_gettrienode(void) { M_TRIE *new ; diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/trie.h b/cde/programs/dthelp/parser.ccdf/htag/util/trie.h index f991fb31..f33c9e98 100644 --- a/cde/programs/dthelp/parser.ccdf/htag/util/trie.h +++ b/cde/programs/dthelp/parser.ccdf/htag/util/trie.h @@ -51,7 +51,7 @@ struct m_ptrie { } ; -M_TRIE *m_gettrienode(M_NOPAR); +M_TRIE *m_gettrienode(void); void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie); diff --git a/cde/programs/dthelp/parser/canon1/build/buildutl.c b/cde/programs/dthelp/parser/canon1/build/buildutl.c index dbdb390d..ae23d9f9 100644 --- a/cde/programs/dthelp/parser/canon1/build/buildutl.c +++ b/cde/programs/dthelp/parser/canon1/build/buildutl.c @@ -62,7 +62,7 @@ if (*flag) } /* Program initialization */ -void initialize(M_NOPAR) +void initialize(void) { char **mb_delims; M_WCHAR **wc_delims; @@ -90,7 +90,7 @@ ruleinit() ; /* Initialization before starting a new rule */ -void ruleinit(M_NOPAR) +void ruleinit(void) { /* Reinitialize for next rule */ lhs = NULL ; @@ -110,7 +110,7 @@ void ruleinit(M_NOPAR) } /* Rule end processing */ -void rulend(M_NOPAR) +void rulend(void) { STATE *fsa = NULL ; LOGICAL canbenull ; @@ -150,7 +150,7 @@ void rulend(M_NOPAR) } /* Skip rest of statement after an error */ -void skiptoend(M_NOPAR) +void skiptoend(void) { int i ; static int errlev = 0 ; diff --git a/cde/programs/dthelp/parser/canon1/build/except.c b/cde/programs/dthelp/parser/canon1/build/except.c index fc9653a8..330ee36d 100644 --- a/cde/programs/dthelp/parser/canon1/build/except.c +++ b/cde/programs/dthelp/parser/canon1/build/except.c @@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "build.h" /* Add an exception (inclusion or exclusion) for the current element */ -void addex(M_NOPAR) +void addex(void) { excount++ ; *nextex = (EXCEPTION *) m_malloc(sizeof(EXCEPTION), "exception") ; diff --git a/cde/programs/dthelp/parser/canon1/build/fsa.c b/cde/programs/dthelp/parser/canon1/build/fsa.c index e76d5bde..b212085b 100644 --- a/cde/programs/dthelp/parser/canon1/build/fsa.c +++ b/cde/programs/dthelp/parser/canon1/build/fsa.c @@ -176,7 +176,7 @@ void dellist(list) /* Delstartarcs deletes the contents of the starta list of arcs from start states of a submodel */ -void delstartarcs(M_NOPAR) +void delstartarcs(void) { ARC *arcptr ; ARC *discard ; @@ -190,7 +190,7 @@ void delstartarcs(M_NOPAR) } /* Getand allocates and initializes a new andgroup structure */ -ANDGROUP *getand(M_NOPAR) +ANDGROUP *getand(void) { ANDGROUP *new ; @@ -203,7 +203,7 @@ ANDGROUP *getand(M_NOPAR) } /* Getstate obtains an FSA state */ -STATE *getstate(M_NOPAR) +STATE *getstate(void) { STATE *new ; @@ -477,7 +477,7 @@ LOGICAL permitspcd(a) /* Pop pops the submodel stack when the end of the current submodel is encountered */ -void pop(M_NOPAR) +void pop(void) { STACK *discard ; @@ -493,7 +493,7 @@ void pop(M_NOPAR) } /* Push pushes the submodel stack when a new group is encountered */ -void push(M_NOPAR) +void push(void) { STACK *new ; @@ -647,7 +647,7 @@ void savelhs(LOGICAL param) /* Called when arcs are added to the start state of a submodel that is also a start state of the parent model to set the parent model's starta list */ -void savestartarcs(M_NOPAR) +void savestartarcs(void) { ARC *carcptr, *parcptr ; diff --git a/cde/programs/dthelp/parser/canon1/build/out.c b/cde/programs/dthelp/parser/canon1/build/out.c index 83f418dd..5c7dc63c 100644 --- a/cde/programs/dthelp/parser/canon1/build/out.c +++ b/cde/programs/dthelp/parser/canon1/build/out.c @@ -87,7 +87,7 @@ char *deftype(n) } /* Called after all input is read to generate output */ -void done(M_NOPAR) +void done(void) { if (! eltree.data) { @@ -167,7 +167,7 @@ void eltblocks(tempfile) /* Writes data about elements */ -void eltreeout(M_NOPAR) +void eltreeout(void) { M_WCHAR *p ; int enameindex = 0 ; @@ -245,7 +245,7 @@ char *enttype(n) } /* Outputs exception lists */ -void exout(M_NOPAR) +void exout(void) { EXCEPTION *ex ; int exindex = 0 ; @@ -268,7 +268,7 @@ void exout(M_NOPAR) } /* Outputs FSA definitions */ -void fsa(M_NOPAR) +void fsa(void) { int arcount = 0 ; STATE *pstate ; @@ -331,7 +331,7 @@ void fsa(M_NOPAR) } /* Writes data about parameters */ -void parout(M_NOPAR) +void parout(void) { PARAMETER *paramp ; LOGICAL first = TRUE ; @@ -480,7 +480,7 @@ char *partype(n) } /* Write short reference information */ -void srefout(M_NOPAR) +void srefout(void) { LOGICAL first = TRUE ; int *mapbysref = NULL ; @@ -630,7 +630,7 @@ fputs(" \n", tempfile) ; } /* Write template */ -void template(M_NOPAR) +void template(void) { FILE *tempfile ; M_ENTITY *ent ; diff --git a/cde/programs/dthelp/parser/canon1/build/param.c b/cde/programs/dthelp/parser/canon1/build/param.c index c2cc3506..8d73b531 100644 --- a/cde/programs/dthelp/parser/canon1/build/param.c +++ b/cde/programs/dthelp/parser/canon1/build/param.c @@ -38,7 +38,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Add a keyword to the list of possible values of a keyword parameter for the current element */ -void addkeyword(M_NOPAR) +void addkeyword(void) { int length ; PARAMETER *par ; @@ -87,7 +87,7 @@ ptypelen++ ; } /* Add a parameter to the current element */ -void addpar(M_NOPAR) +void addpar(void) { PARAMETER *paramp, *last = NULL ; int length ; @@ -263,7 +263,7 @@ switch (newpar->type) } /* Called at end of parameter attribute list rule */ -void prulend(M_NOPAR) +void prulend(void) { LHS *lhsp ; LHS *discard ; diff --git a/cde/programs/dthelp/parser/canon1/build/proto.h b/cde/programs/dthelp/parser/canon1/build/proto.h index 03252c78..f9a4a909 100644 --- a/cde/programs/dthelp/parser/canon1/build/proto.h +++ b/cde/programs/dthelp/parser/canon1/build/proto.h @@ -35,15 +35,15 @@ void adddefent(M_WCHAR *mapname); LOGICAL addent(M_WCHAR *name); -void addex(M_NOPAR); +void addex(void); -void addkeyword(M_NOPAR); +void addkeyword(void); LOGICAL addmapname(M_WCHAR *p, LOGICAL define); void addndent(M_WCHAR *p); -void addpar(M_NOPAR); +void addpar(void); void addsref(M_WCHAR *p); @@ -62,15 +62,15 @@ void copyintolist(STATELIST *from, STATELIST **to); void countdown(M_TRIE *parent, int *count); -void defmapname(M_NOPAR); +void defmapname(void); char *deftype(int n); void dellist(STATELIST **list); -void delstartarcs(M_NOPAR); +void delstartarcs(void); -void done(M_NOPAR); +void done(void); void dumpentnode(FILE *file, M_TRIE *value); @@ -90,9 +90,9 @@ void m_dumptrie(FILE *file, void eltblocks(FILE *tempfile); -void eltreeout(M_NOPAR); +void eltreeout(void); -void endmodel(M_NOPAR); +void endmodel(void); void entout(char *fname); @@ -106,7 +106,7 @@ 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 exout(void); void m_free(void *block, char *msg); @@ -114,23 +114,23 @@ void freetree(TREE *ruletree); void found(LOGICAL *flag, char *delim); -void fsa(M_NOPAR); +void fsa(void); -int getachar(M_NOPAR); +int getachar(void); -ANDGROUP *getand(M_NOPAR); +ANDGROUP *getand(void); LOGICAL getname(int first); -STATE *getstate(M_NOPAR); +STATE *getstate(void); int gettoken(int *c, int context); -TREE *gettreenode(M_NOPAR); +TREE *gettreenode(void); -void m_initctype(M_NOPAR); +void m_initctype(void); -void initialize(M_NOPAR); +void initialize(void); LOGICAL litproc(int delim); @@ -160,49 +160,49 @@ ELTSTRUCT *ntrelt(M_WCHAR *p); void m_openchk(FILE **ptr, char *name, char *mode); -void parout(M_NOPAR); +void parout(void); char *partype(int n); LOGICAL permitspcd(ARC *a); -void pop(M_NOPAR); +void pop(void); -void prulend(M_NOPAR); +void prulend(void); -void push(M_NOPAR); +void push(void); LOGICAL regenerate(TREE *start, TREE *stop); void repeat(TREE *root); -void ruleinit(M_NOPAR); +void ruleinit(void); -void rulend(M_NOPAR); +void rulend(void); LOGICAL samelabelarc(ARC *a, STATE *s); void savelhs(LOGICAL param); -void savestartarcs(M_NOPAR); +void savestartarcs(void); -int scan(M_NOPAR); +int scan(void); void setdefault(const M_WCHAR *string); void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional); -void skiptoend(M_NOPAR); +void skiptoend(void); int m_sprscon(int i, int j); -void srefout(M_NOPAR); +void srefout(void); STATE *startfsa(TREE *root, LOGICAL *canbenull); void tempelt(ELTSTRUCT *eltp, FILE *tempfile); -void template(M_NOPAR); +void template(void); char *typecon(int n); diff --git a/cde/programs/dthelp/parser/canon1/build/scan.c b/cde/programs/dthelp/parser/canon1/build/scan.c index dc29de3d..aa804640 100644 --- a/cde/programs/dthelp/parser/canon1/build/scan.c +++ b/cde/programs/dthelp/parser/canon1/build/scan.c @@ -74,7 +74,7 @@ return(TRUE); } /* Returns the next token to the main procedure */ -int scan(M_NOPAR) +int scan(void) { int c; int n; diff --git a/cde/programs/dthelp/parser/canon1/build/sref.c b/cde/programs/dthelp/parser/canon1/build/sref.c index d5f89266..70e9b8a7 100644 --- a/cde/programs/dthelp/parser/canon1/build/sref.c +++ b/cde/programs/dthelp/parser/canon1/build/sref.c @@ -192,7 +192,7 @@ delim->data = thissref; /* Prefix left-hand side with "M-" to create default short reference map name, truncating to M_NAMELEN characters if necessary */ -void defmapname(M_NOPAR) +void defmapname(void) { if (!wc_prefix) { diff --git a/cde/programs/dthelp/parser/canon1/build/tree.c b/cde/programs/dthelp/parser/canon1/build/tree.c index 09464f10..fcfd5fe2 100644 --- a/cde/programs/dthelp/parser/canon1/build/tree.c +++ b/cde/programs/dthelp/parser/canon1/build/tree.c @@ -36,7 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Called after a right parenthesis is read while scanning a content model. Resets curcon if it is the outermost submodel. */ -void endmodel(M_NOPAR) +void endmodel(void) { curtree = curtree->parent ; if (! curtree->parent) curcon = LASTM ; @@ -58,7 +58,7 @@ void freetree(treep) } /* Gettreenode obtains a node to use in the tree representation of a rule */ -TREE *gettreenode(M_NOPAR) +TREE *gettreenode(void) { TREE *new ; diff --git a/cde/programs/dthelp/parser/canon1/eltdef/context.dat b/cde/programs/dthelp/parser/canon1/eltdef/context.dat index 06b28ee2..99040b9d 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/context.dat +++ b/cde/programs/dthelp/parser/canon1/eltdef/context.dat @@ -398,7 +398,7 @@ tagc postent:start codetagc:inentc { startcode(entity->codeindex, &inent, entfile, - "c", nopar, nopar, "") ; + "c", "void", "void", "") ; } close:preparam sschain:inss { @@ -420,11 +420,11 @@ tagc } scchain:insc { *getaction(scarray) = ++sactions ; - startcode(sactions, &insc, sfile, "s", nopar, nopar, "") ; + startcode(sactions, &insc, sfile, "s", "void", "void", "") ; } ecchain:inec { *getaction(ecarray) = ++eactions ; - startcode(eactions, &inec, efile, "e", nopar, nopar, "") ; + startcode(eactions, &inec, efile, "e", "void", "void", "") ; } stcchain:instc { *getaction(stcarray) = ++stactions ; diff --git a/cde/programs/dthelp/parser/canon1/eltdef/eltdef.h b/cde/programs/dthelp/parser/canon1/eltdef/eltdef.h index 430dcde7..85d1e682 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/eltdef.h +++ b/cde/programs/dthelp/parser/canon1/eltdef/eltdef.h @@ -215,7 +215,6 @@ ELTEXTERN int restart ELTINIT(RENTITY) ; #define stproto "M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END" #define stformal "m_string, M_START, M_END" #define stft " M_WCHAR *m_string ;\n LOGICAL M_START ;\n LOGICAL M_END ;\n" -#define nopar "M_NOPAR" /* Structures for generating defines for parameter values */ ELTEXTERN M_TRIE parval ; diff --git a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c index ff433f4e..266b0233 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c @@ -92,7 +92,7 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto) /* Called when the C identifier to be #define'd to a parameter value is scanned */ -void cvalue(M_NOPAR) +void cvalue(void) { PARVAL *new; @@ -111,18 +111,18 @@ void cvalue(M_NOPAR) /* Called after last input character is read to place closing punctuation at end of output files and close them */ -void done(M_NOPAR) +void done(void) { M_ENTITY *ent; ACTION *actp; LOGICAL first; int i; - closeiffile(inent, entfile, codeent, "c", nopar); + closeiffile(inent, entfile, codeent, "c", "void"); closeiffile(intext, tfile, tactions, "t", tproto); closeiffile(inpc, pfile, pactions, "p", pproto); - closeiffile(insc, sfile, sactions, "s", nopar); - closeiffile(inec, efile, eactions, "e", nopar); + closeiffile(insc, sfile, sactions, "s", "void"); + closeiffile(inec, efile, eactions, "e", "void"); closeiffile(instc, stfile, stactions, "st", stproto); endstring(); @@ -190,7 +190,7 @@ void endcode(LOGICAL flag, FILE *file) } /* Called at the end of all initial fields in the interface definition */ -void endini(M_NOPAR) +void endini(void) { if (finitext) fputs(" putc(m_textchar, m_outfile);\n", tfile); @@ -209,7 +209,7 @@ void endini(M_NOPAR) /* End the sign-on message */ #include -void endsignon(M_NOPAR) +void endsignon(void) { time_t storetime; char *p; @@ -255,7 +255,7 @@ void endsignon(M_NOPAR) } /* Closes a start-string or end-string */ -void endstring(M_NOPAR) +void endstring(void) { if (instring) { if (stringstart) stringstart = FALSE; @@ -282,7 +282,7 @@ void enttype(type) } /* Free storage used for a context-specification chain */ -void freechain(M_NOPAR) +void freechain(void) { CHAIN *chainp, *dchainp; @@ -333,7 +333,7 @@ int *getaction(array) } /* Allocate new action structure */ -ACTION *getactstruct(M_NOPAR) +ACTION *getactstruct(void) { ACTION *new; @@ -347,7 +347,7 @@ ACTION *getactstruct(M_NOPAR) } /* Program initialization */ -void initialize(M_NOPAR) +void initialize(void) { char **mb_delims; M_WCHAR **wc_delims; @@ -411,13 +411,13 @@ fputs("#endif\n", ifh); startcode(pactions, &inpc, pfile, "p", pproto, pformal, pftype); startcode(tactions, &intext, tfile, "t", tproto, tformal, tftype); -startcode(sactions, &insc, sfile, "s", nopar, nopar, ""); -startcode(eactions, &inec, efile, "e", nopar, nopar, ""); +startcode(sactions, &insc, sfile, "s", "void", "void", ""); +startcode(eactions, &inec, efile, "e", "void", "void", ""); startcode(stactions, &instc, stfile, "st", stproto, stformal, stft); } /* Output definitions for strings */ -void outstring(M_NOPAR) +void outstring(void) { int c; @@ -480,7 +480,7 @@ for ( ; p ; p = p->next) } /* Skip rest of statement after an error */ -void skiptoend(M_NOPAR) +void skiptoend(void) { int i; static int errlev = 0; @@ -580,7 +580,7 @@ fprintf(file, "{\n/* line %d \"%s\" */\n", m_line, iffile); /* balance "}" */ } /* Begins processing a new element */ -void startelement(M_NOPAR) +void startelement(void) { CVARSTRUCT *cvarp; CVARSTRUCT *discard; @@ -601,7 +601,7 @@ void startelement(M_NOPAR) } /* Stores the name of a C variable read from the input file */ -void storecvar(M_NOPAR) +void storecvar(void) { CVARSTRUCT *new; @@ -616,7 +616,7 @@ void storecvar(M_NOPAR) /* Compares the parameter name associated with a C variable in the input file with the names of all parameters of the current element. Stores result for later output with code segments */ -void storepname(M_NOPAR) +void storepname(void) { int i, par; diff --git a/cde/programs/dthelp/parser/canon1/eltdef/entity.c b/cde/programs/dthelp/parser/canon1/eltdef/entity.c index 36dc9f14..3cf253bc 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/entity.c +++ b/cde/programs/dthelp/parser/canon1/eltdef/entity.c @@ -35,7 +35,7 @@ #include "entext.h" /* Add an entity */ -void addent(M_NOPAR) +void addent(void) { M_ENTITY *new ; diff --git a/cde/programs/dthelp/parser/canon1/eltdef/proto.h b/cde/programs/dthelp/parser/canon1/eltdef/proto.h index 077e929f..e22c6e53 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/proto.h +++ b/cde/programs/dthelp/parser/canon1/eltdef/proto.h @@ -30,7 +30,7 @@ void actptrout(ACTION **array, char *name); -void addent(M_NOPAR); +void addent(void); LOGICAL m_allwhite(const M_WCHAR *string); @@ -38,10 +38,10 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto); void countdown(M_TRIE *parent, int *count); -void cvalue(M_NOPAR); +void cvalue(void); -void done(M_NOPAR); +void done(void); void m_dumptrie(FILE *file, M_TRIE *xtrie, @@ -51,11 +51,11 @@ void m_dumptrie(FILE *file, void endcode(LOGICAL flag, FILE *file); -void endini(M_NOPAR); +void endini(void); -void endsignon(M_NOPAR); +void endsignon(void); -void endstring(M_NOPAR); +void endstring(void); void entout(char *fname); @@ -78,21 +78,21 @@ void m_exit(int status); void m_free(void *block, char *msg); -void freechain(M_NOPAR); +void freechain(void); -int getachar(M_NOPAR); +int getachar(void); int *getaction(ACTION **array); -ACTION *getactstruct(M_NOPAR); +ACTION *getactstruct(void); void getname(int first); int gettoken(int *c, int context); -void m_initctype(M_NOPAR); +void m_initctype(void); -void initialize(M_NOPAR); +void initialize(void); LOGICAL m_letter(M_WCHAR c); @@ -106,24 +106,24 @@ void m_openchk(FILE **ptr, char *name, char *mode); void outpval(M_TRIE *p); -void outstring(M_NOPAR); +void outstring(void); int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); const M_WCHAR *m_partype(const int par, const M_WCHAR *string); -int scan(M_NOPAR); +int scan(void); -void skiptoend(M_NOPAR); +void skiptoend(void); void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, char *formal, char *formtype); -void startelement(M_NOPAR); +void startelement(void); -void storecvar(M_NOPAR); +void storecvar(void); -void storepname(M_NOPAR); +void storepname(void); void undodelim(M_WCHAR *delim); diff --git a/cde/programs/dthelp/parser/canon1/eltdef/scan.c b/cde/programs/dthelp/parser/canon1/eltdef/scan.c index aecff901..3317a955 100644 --- a/cde/programs/dthelp/parser/canon1/eltdef/scan.c +++ b/cde/programs/dthelp/parser/canon1/eltdef/scan.c @@ -86,7 +86,7 @@ ungetachar(c); } /* Reads the next token and returns it to the main procedure */ -int scan(M_NOPAR) +int scan(void) { int c; int n; diff --git a/cde/programs/dthelp/parser/canon1/helptag/custom.c b/cde/programs/dthelp/parser/canon1/helptag/custom.c index c55624c6..27df40ad 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/custom.c +++ b/cde/programs/dthelp/parser/canon1/helptag/custom.c @@ -37,7 +37,7 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co. /* Standard startup code doesn't have room to load inherited environments in some cases. Since they're not used, don't bother. (Using Microsoft C compiler). */ -void _setenvp(M_NOPAR); +void _setenvp(void); void _setenvp(){} #endif @@ -72,7 +72,7 @@ else } /* Write error message prefix */ -void m_eprefix(M_NOPAR) +void m_eprefix(void) { m_errline("\n*****\n"); m_dumpline(m_thisfile(), m_thisline()); @@ -96,7 +96,7 @@ for ( ; *p ; p++) #include #endif /* Write error message suffix */ -void m_esuffix(M_NOPAR) +void m_esuffix(void) { m_errline(":\n"); m_lastchars(); @@ -245,7 +245,7 @@ return(NULL); } /* Open input file */ -void *m_openfirst(M_NOPAR) +void *m_openfirst(void) { FILE *first; char *input; diff --git a/cde/programs/dthelp/parser/canon1/helptag/fproto.h b/cde/programs/dthelp/parser/canon1/helptag/fproto.h index 346aa92f..a5970c16 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/fproto.h +++ b/cde/programs/dthelp/parser/canon1/helptag/fproto.h @@ -24,28 +24,28 @@ /* Copyright (c) 1988, 1989, 1990 Hewlett-Packard Co. */ /* Function prototypes for HP Tag/TeX translator */ -void assert_hometopic_exists(M_NOPAR); +void assert_hometopic_exists(void); /* osf has basename() defined in system header file, change * basename() to fbasename(). --XPG4 standard. */ -void fbasename(M_NOPAR); +void fbasename(void); void chapstart(M_WCHAR *id); -void checkgloss(M_NOPAR); +void checkgloss(void); M_WCHAR *checkid(M_WCHAR *id); -void checkmsghead (M_NOPAR); +void checkmsghead (void); -void dumpxref(M_NOPAR); +void dumpxref(void); void echohead(M_WCHAR *p); void mb_echohead(char *p); -void endhead(M_NOPAR); +void endhead(void); void esoutchar(M_WCHAR textchar); @@ -70,7 +70,7 @@ char *m_itoa(int n, char *s); LOGICAL m_letter(M_WCHAR c); -void loadxref(M_NOPAR); +void loadxref(void); int m_lower(int c); @@ -84,7 +84,7 @@ void realoutchar(M_WCHAR textchar, FILE *outfile); void rsectstart(M_WCHAR *id); -void rseqend(M_NOPAR); +void rseqend(void); M_WCHAR *searchforfile(M_WCHAR *file); @@ -144,7 +144,7 @@ void StartLabList(M_WCHAR *spacing, void StartList(M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont); -void EndList(M_NOPAR); +void EndList(void); void strcode(M_WCHAR *string, FILE *outfile); @@ -160,7 +160,7 @@ void termchar(M_WCHAR textchar); void termpi(int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname); -void texinit(M_NOPAR); +void texinit(void); int vextextsize(const M_WCHAR *keyword); @@ -189,7 +189,7 @@ char *GetDefaultHeaderString(char *elementName, char *defaultString); -void SetDefaultLocale(M_NOPAR); +void SetDefaultLocale(void); char *MakeMByteString(const M_WCHAR *from); @@ -221,11 +221,11 @@ M_WCHAR wc_toupper( M_WCHAR wc); M_WCHAR *wc_stringtoupper( M_WCHAR *wcp); -int NextId(M_NOPAR); +int NextId(void); -char *GetLanguage(M_NOPAR); +char *GetLanguage(void); -char *GetCharset(M_NOPAR); +char *GetCharset(void); void HandleLink( M_WCHAR *hyperlink, M_WCHAR *type, @@ -241,7 +241,7 @@ void Add2ToRowVec( int *length, char **rowvec, char *id1, char *id2); void StartEx(M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize); -void EndEx(M_NOPAR); +void EndEx(void); void StartNCW(char *which); @@ -251,14 +251,14 @@ void AddToSNB(char *id, char *iconName); void StartNCWtext(char *which, char *iconFile, char *headingString); -void IncludeToss(M_NOPAR); +void IncludeToss(void); M_WCHAR *CycleEnt( LOGICAL init, unsigned char *type, M_WCHAR ***content, unsigned char *wheredef); -void ModifyEntities(M_NOPAR); +void ModifyEntities(void); void PushForm(char *class, char *ssi, @@ -269,12 +269,12 @@ void PushForm2(char *class, char *id1, char *id2); -void PopForm(M_NOPAR); +void PopForm(void); -void PopForm2(M_NOPAR); +void PopForm2(void); -void PopFormMaybe(M_NOPAR); +void PopFormMaybe(void); -void EmitSavedAnchors(M_NOPAR); +void EmitSavedAnchors(void); -void CloseVirpage(M_NOPAR); +void CloseVirpage(void); diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.c b/cde/programs/dthelp/parser/canon1/helptag/help.c index 96e63bd5..8e7cb560 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/help.c +++ b/cde/programs/dthelp/parser/canon1/helptag/help.c @@ -32,7 +32,7 @@ #include "LocaleXlate.h" #include "XlationSvc.h" -void assert_hometopic_exists(M_NOPAR) +void assert_hometopic_exists(void) { static const char hometopic[] = "-HOMETOPIC"; char id[SDLNAMESIZ + sizeof(hometopic)]; @@ -61,7 +61,7 @@ m_free(string, "GetDefaultHeaderString return"); /* Determine base name for files (i.e., input name without extension). Open output and error files */ -void fbasename(M_NOPAR) +void fbasename(void) { char *p, *q; int n; @@ -292,7 +292,7 @@ if (*chapterSuffixString) /* Called at end of manual to report terms that occurred in the document but not entered in the glossary */ -void checkgloss(M_NOPAR) +void checkgloss(void) { int n; M_WCHAR id[MAXTERM + 1]; @@ -329,7 +329,7 @@ while (TRUE) /* End Error Message macro \starterrmsg call, check to see if Error Message head is user specified or default */ -void checkmsghead(M_NOPAR) +void checkmsghead(void) { char *string = GetDefaultHeaderString("MessagesElementDefaultHeadingString", @@ -933,7 +933,7 @@ chapst = TRUE; /* Called at the end of a chapter, appendix, or section to end an open sequence of rsects */ -void rseqend(M_NOPAR) +void rseqend(void) { if (rsectseq) --thisnodelevel; @@ -1284,7 +1284,7 @@ if (lastlist->type == BULLET) bulcount-- ; /* Open and initialize TeX file */ -void texinit(M_NOPAR) +void texinit(void) { LOGICAL init = TRUE; unsigned char type; diff --git a/cde/programs/dthelp/parser/canon1/helptag/out.c b/cde/programs/dthelp/parser/canon1/helptag/out.c index 29610ae6..804b2135 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/out.c +++ b/cde/programs/dthelp/parser/canon1/helptag/out.c @@ -67,7 +67,7 @@ m_free(wc,"wide character string"); /* Called at end of a head in a chapter, appendix, section, or reference section */ -void endhead(M_NOPAR) +void endhead(void) { if (savid) { diff --git a/cde/programs/dthelp/parser/canon1/helptag/xref.c b/cde/programs/dthelp/parser/canon1/helptag/xref.c index 28fd4ffa..4a1259d6 100644 --- a/cde/programs/dthelp/parser/canon1/helptag/xref.c +++ b/cde/programs/dthelp/parser/canon1/helptag/xref.c @@ -143,7 +143,7 @@ m_free(csname, "csname"); /* Write cross-reference file for next time document is processed and TeX macro file for post-processing this pass */ -void dumpxref(M_NOPAR) +void dumpxref(void) { int n; M_WCHAR id[M_NAMELEN + 1]; @@ -214,7 +214,7 @@ xstrlen += length; /* Initializes cross-reference table reading in file output from previous pass through document */ -void loadxref(M_NOPAR) +void loadxref(void) { M_WCHAR id[M_NAMELEN + 1]; char c, d; diff --git a/cde/programs/dthelp/parser/canon1/parser/actutil.c b/cde/programs/dthelp/parser/canon1/parser/actutil.c index 385b4b61..28fabb84 100644 --- a/cde/programs/dthelp/parser/canon1/parser/actutil.c +++ b/cde/programs/dthelp/parser/canon1/parser/actutil.c @@ -137,7 +137,7 @@ void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int * /* Process global end string. In separate procedure to keep all references to if.h in one source file and minimize recompilation if interface changes. */ -void m_globes(M_NOPAR) +void m_globes(void) { M_WCHAR *wc_string; @@ -149,7 +149,7 @@ m_free(wc_string,"wide character string"); /* Process global start string. In separate procedure to keep all references to if.h in one source file and minimize recompilation if interface changes. */ -void m_globss(M_NOPAR) +void m_globss(void) { M_WCHAR *wc_string; diff --git a/cde/programs/dthelp/parser/canon1/parser/eprefix.c b/cde/programs/dthelp/parser/canon1/parser/eprefix.c index 00559eb3..c1257c0f 100644 --- a/cde/programs/dthelp/parser/canon1/parser/eprefix.c +++ b/cde/programs/dthelp/parser/canon1/parser/eprefix.c @@ -29,7 +29,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "globdec.h" /* Write error message prefix */ -void m_eprefix(M_NOPAR) +void m_eprefix(void) { m_errline("\n*****\n") ; } diff --git a/cde/programs/dthelp/parser/canon1/parser/error.c b/cde/programs/dthelp/parser/canon1/parser/error.c index c1d02d1d..9857cdba 100644 --- a/cde/programs/dthelp/parser/canon1/parser/error.c +++ b/cde/programs/dthelp/parser/canon1/parser/error.c @@ -334,7 +334,7 @@ void m_getline(file, line) /* Dump last characters read from input stream to give context to an error message */ -void m_lastchars(M_NOPAR) +void m_lastchars(void) { int i; M_WCHAR buffer[2]; @@ -383,14 +383,14 @@ if ((m_svlncnt[m_sysecnt] && } /* Display information about the current element */ -void m_showcurelt(M_NOPAR) +void m_showcurelt(void) { if (m_stacktop->oldtop) m_dispcurelt(m_stacktop->file, m_stacktop->line); } /* Start an error message */ -void m_startmsg(M_NOPAR) +void m_startmsg(void) { m_eprefix(); m_errexit = TRUE; @@ -398,7 +398,7 @@ void m_startmsg(M_NOPAR) /* Return the name of the current input file (most recently opened, but unclosed SYSTEM entity) */ -M_WCHAR *m_thisfile(M_NOPAR) +M_WCHAR *m_thisfile(void) { int i; @@ -411,7 +411,7 @@ M_WCHAR *m_thisfile(M_NOPAR) } /* Return the line number in the current input file */ -int m_thisline(M_NOPAR) +int m_thisline(void) { return(m_line[m_sysecnt]); } diff --git a/cde/programs/dthelp/parser/canon1/parser/esuffix.c b/cde/programs/dthelp/parser/canon1/parser/esuffix.c index 0870464b..6d5d513f 100644 --- a/cde/programs/dthelp/parser/canon1/parser/esuffix.c +++ b/cde/programs/dthelp/parser/canon1/parser/esuffix.c @@ -32,7 +32,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #endif /* Write error message suffix */ -void m_esuffix(M_NOPAR) +void m_esuffix(void) { m_errline("\n") ; m_dumpline(m_thisfile(), m_thisline()) ; diff --git a/cde/programs/dthelp/parser/canon1/parser/getsign.c b/cde/programs/dthelp/parser/canon1/parser/getsign.c index d3182b7e..c5f2fad9 100644 --- a/cde/programs/dthelp/parser/canon1/parser/getsign.c +++ b/cde/programs/dthelp/parser/canon1/parser/getsign.c @@ -34,7 +34,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "parser.h" #include "signonx.h" -void m_getsignon(M_NOPAR) +void m_getsignon(void) { m_errline(m_signon) ; } diff --git a/cde/programs/dthelp/parser/canon1/parser/input.c b/cde/programs/dthelp/parser/canon1/parser/input.c index 1866e3fa..ab81425c 100644 --- a/cde/programs/dthelp/parser/canon1/parser/input.c +++ b/cde/programs/dthelp/parser/canon1/parser/input.c @@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "parser.h" /* M_etcomplete is called when a complete end-tag has been read */ -void m_etcomplete(M_NOPAR) +void m_etcomplete(void) { if (! m_scanel) { M_WCHAR *wc_etago, *wc_tagc; @@ -91,7 +91,7 @@ void m_frcend(val) /* M_frcstart is called to force the start of an element when that element cannot legally occur in the current context but does appear in the text*/ -void m_frcstart(M_NOPAR) +void m_frcstart(void) { m_push(m_scanel, m_element[m_scanel - 1].start, m_scannet) ; if (m_scannet) m_netlevel++ ; @@ -108,7 +108,7 @@ void m_frcstart(M_NOPAR) /* M_holdproc processes a RE that was saved to test if it was the last RE in an element's content */ -void m_holdproc(M_NOPAR) +void m_holdproc(void) { if (m_stacktop->holdre) { m_stacktop->holdre = FALSE ; @@ -122,7 +122,7 @@ void m_holdproc(M_NOPAR) } /* M_stcomplete is called when a complete start tag has been recognized */ -void m_stcomplete(M_NOPAR) +void m_stcomplete(void) { if (! m_scanel) return ; if (m_strtproc(m_scanel)) diff --git a/cde/programs/dthelp/parser/canon1/parser/minim.c b/cde/programs/dthelp/parser/canon1/parser/minim.c index 180aaf40..fffe1fe6 100644 --- a/cde/programs/dthelp/parser/canon1/parser/minim.c +++ b/cde/programs/dthelp/parser/canon1/parser/minim.c @@ -43,7 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* M_expecting reports to the user the possible valid content at a particular state in the parse of the document */ -void m_expecting(M_NOPAR) +void m_expecting(void) { LOGICAL expstart = TRUE ; M_PARSE *stackptr ; @@ -276,7 +276,7 @@ M_ELEMENT m_findunique(from, newleft) /* M_nullendtag is called when a null end tag is encountered; i.e., at the end of a short element */ -void m_nullendtag(M_NOPAR) +void m_nullendtag(void) { LOGICAL foundnet ; @@ -307,7 +307,7 @@ void m_nullendtag(M_NOPAR) /* Tests to see if an end tag may have been omitted at this point in the parse.*/ -LOGICAL m_omitend(M_NOPAR) +LOGICAL m_omitend(void) { M_ANDGROUP pand ; M_OPENFSA *fsastack ; diff --git a/cde/programs/dthelp/parser/canon1/parser/openfrst.c b/cde/programs/dthelp/parser/canon1/parser/openfrst.c index 4df1feb9..0ec9fb4b 100644 --- a/cde/programs/dthelp/parser/canon1/parser/openfrst.c +++ b/cde/programs/dthelp/parser/canon1/parser/openfrst.c @@ -28,7 +28,7 @@ #include "userinc.h" #include "globdec.h" -void *m_openfirst(M_NOPAR) +void *m_openfirst(void) { return((void *) stdin) ; } diff --git a/cde/programs/dthelp/parser/canon1/parser/param.c b/cde/programs/dthelp/parser/canon1/parser/param.c index 1aa60609..98446638 100644 --- a/cde/programs/dthelp/parser/canon1/parser/param.c +++ b/cde/programs/dthelp/parser/canon1/parser/param.c @@ -117,7 +117,7 @@ LOGICAL m_attvonly(string) /* Check a name previously saved in m_saveatt to see if it is the name of a valid parameter for the current start tag */ -void m_findatt(M_NOPAR) +void m_findatt(void) { int par, i ; @@ -220,7 +220,7 @@ void m_parupper(par, string) /* Set all parameters to their default values for an element included by tag minimization */ -void m_stkdefaultparams(M_NOPAR) +void m_stkdefaultparams(void) { int i, par = 0 ; @@ -272,7 +272,7 @@ void m_stkonedef(par, scanel, poccur, i) } /* Stack parameter values */ -void m_stkparams(M_NOPAR) +void m_stkparams(void) { int i, par ; diff --git a/cde/programs/dthelp/parser/canon1/parser/parutil.c b/cde/programs/dthelp/parser/canon1/parser/parutil.c index bad227ad..58f991ed 100644 --- a/cde/programs/dthelp/parser/canon1/parser/parutil.c +++ b/cde/programs/dthelp/parser/canon1/parser/parutil.c @@ -48,7 +48,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "version.h" /* Adjust parsing state after each token if necessary */ -void m_adjuststate(M_NOPAR) +void m_adjuststate(void) { if (m_curcon == START) { if (m_netlevel) { @@ -79,7 +79,7 @@ void m_adjuststate(M_NOPAR) /* Tests whether the element named in a tag is defined; if so, returns its index; otherwise return FALSE */ -M_ELEMENT m_eltname(M_NOPAR) +M_ELEMENT m_eltname(void) { M_ELEMENT eltid ; @@ -103,7 +103,7 @@ return i; } /* Program initialization */ -void m_initialize(M_NOPAR) +void m_initialize(void) { char **mb_delims; M_WCHAR **wc_delims; diff --git a/cde/programs/dthelp/parser/canon1/parser/proto.h b/cde/programs/dthelp/parser/canon1/parser/proto.h index 2ca9badc..b7e86e1e 100644 --- a/cde/programs/dthelp/parser/canon1/parser/proto.h +++ b/cde/programs/dthelp/parser/canon1/parser/proto.h @@ -21,9 +21,9 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 09:42:21 rswiston $ */ -int m_actgetc(M_NOPAR); +int m_actgetc(void); -void m_adjuststate(M_NOPAR); +void m_adjuststate(void); LOGICAL m_allwhite(const M_WCHAR *string); @@ -41,20 +41,20 @@ void m_closent(void *m_ptr); void m_codeent(int m_ent); -M_PARSE *m_copystackelt(M_NOPAR); +M_PARSE *m_copystackelt(void); 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_done(void); void m_dumpline(M_WCHAR *file, int line); void m_eduptype(int type); -M_ELEMENT m_eltname(M_NOPAR); +M_ELEMENT m_eltname(void); void m_endaction(M_ELEMENT m_elt); @@ -64,7 +64,7 @@ void m_endtag(M_ELEMENT c); void m_entexpand(M_ENTITY *openent); -void m_eprefix(M_NOPAR); +void m_eprefix(void); void m_err1(const char *text, const M_WCHAR *arg); @@ -87,15 +87,15 @@ void m_errline(char *p); void m_error(char *text); -void m_esuffix(M_NOPAR); +void m_esuffix(void); void m_exit(int status); -void m_etcomplete(M_NOPAR); +void m_etcomplete(void); LOGICAL m_excluded(M_ELEMENT elt); -void m_expecting(M_NOPAR); +void m_expecting(void); void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data); @@ -105,7 +105,7 @@ void m_exptend(LOGICAL *expstart, M_PARSE *stackptr); int m_findact(M_ELEMENT elt, int *array); -void m_findatt(M_NOPAR); +void m_findatt(void); void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild); @@ -116,7 +116,7 @@ M_ELEMENT m_findunique(M_STATE from, int *newleft); void m_frcend(M_ELEMENT val); -void m_frcstart(M_NOPAR); +void m_frcstart(void); void m_free(void *block, char *msg); @@ -141,23 +141,23 @@ void m_getline(M_WCHAR **file, int *line); void m_getname(M_WCHAR first); -void m_getsignon(M_NOPAR); +void m_getsignon(void); int m_gettoken(int *c, M_HOLDTYPE *dchar, int context); -void m_globes(M_NOPAR); +void m_globes(void); -void m_globss(M_NOPAR); +void m_globss(void); -void m_holdproc(M_NOPAR); +void m_holdproc(void); void m_inctest(int *count, int limit, char *message); -void m_initctype(M_NOPAR); +void m_initctype(void); -void m_initialize(M_NOPAR); +void m_initialize(void); -void m_lastchars(M_NOPAR); +void m_lastchars(void); int m_level(M_WCHAR *elt); @@ -183,17 +183,17 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LO void m_ntrent(M_WCHAR *p); -void m_nullendtag(M_NOPAR); +void m_nullendtag(void); -LOGICAL m_omitend(M_NOPAR); +LOGICAL m_omitend(void); -LOGICAL m_omitstart(M_NOPAR); +LOGICAL m_omitstart(void); void m_openchk(FILE **ptr, char *name, char *mode); void *m_openent(M_WCHAR *entcontent); -void *m_openfirst(M_NOPAR); +void *m_openfirst(void); void m_optstring(char *p); @@ -217,13 +217,13 @@ 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_pop(void); 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_readcomments(void); void *m_realloc(void *ptr, int size, char *msg); @@ -231,31 +231,31 @@ int m_scan(LOGICAL prolog); void m_setmap(int map, LOGICAL useoradd); -void m_setoptions(M_NOPAR); +void m_setoptions(void); void m_setparam(M_WCHAR **cvar, int par); void m_shortref(int context); -void m_showcurelt(M_NOPAR); +void m_showcurelt(void); void m_signmsg(char *p); -void m_sigre(M_NOPAR); +void m_sigre(void); -void m_startdoc(M_NOPAR); +void m_startdoc(void); -void m_startmsg(M_NOPAR); +void m_startmsg(void); void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END); -void m_stcomplete(M_NOPAR); +void m_stcomplete(void); -void m_stkdefaultparams(M_NOPAR); +void m_stkdefaultparams(void); void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i); -void m_stkparams(M_NOPAR); +void m_stkparams(void); void m_strtaction(M_ELEMENT m_elt); @@ -271,11 +271,11 @@ void m_textaction(M_WCHAR m_textchar); void m_textout(char *format, LOGICAL start, LOGICAL end); -LOGICAL m_textpermitted(M_NOPAR); +LOGICAL m_textpermitted(void); -M_WCHAR *m_thisfile(M_NOPAR); +M_WCHAR *m_thisfile(void); -int m_thisline(M_NOPAR); +int m_thisline(void); void m_trace(char *p); @@ -297,7 +297,7 @@ int m_mbmbupstrcmp(const char *p, const char *q); LOGICAL m_validinpar(M_WCHAR *string); -LOGICAL m_vldentref(M_NOPAR); +LOGICAL m_vldentref(void); 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 d7f765f2..2426e65c 100644 --- a/cde/programs/dthelp/parser/canon1/parser/scan.c +++ b/cde/programs/dthelp/parser/canon1/parser/scan.c @@ -51,7 +51,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "sref.h" /* Actually read a character from an input stream */ -int m_actgetc(M_NOPAR) +int m_actgetc(void) { int c ; @@ -690,7 +690,7 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, } /* Scans past a comment within a markup declaration */ -void m_readcomments(M_NOPAR) +void m_readcomments(void) { int c ; M_HOLDTYPE dchar ; @@ -1050,7 +1050,7 @@ while (TRUE) or contextual end tag [linestat == M_SOMETHING] 3) If a record end might be the last one in an element, save it */ -void m_sigre(M_NOPAR) +void m_sigre(void) { /* Check for first RE in content and no preceding content */ if (m_start && @@ -1126,7 +1126,7 @@ void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread) } /* Have encountered an M_ERO. If the entity reference is valid, process it*/ -LOGICAL m_vldentref(M_NOPAR) +LOGICAL m_vldentref(void) { M_HOLDTYPE dchar ; int next ; diff --git a/cde/programs/dthelp/parser/canon1/parser/setopt.c b/cde/programs/dthelp/parser/canon1/parser/setopt.c index ad747077..b984d67d 100644 --- a/cde/programs/dthelp/parser/canon1/parser/setopt.c +++ b/cde/programs/dthelp/parser/canon1/parser/setopt.c @@ -30,7 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. /* Set program options */ -void m_setoptions(M_NOPAR) +void m_setoptions(void) { if (m_argc > 1) m_optstring(m_argv[1]) ; } diff --git a/cde/programs/dthelp/parser/canon1/parser/startdoc.c b/cde/programs/dthelp/parser/canon1/parser/startdoc.c index f8519b3b..7e7c98bf 100644 --- a/cde/programs/dthelp/parser/canon1/parser/startdoc.c +++ b/cde/programs/dthelp/parser/canon1/parser/startdoc.c @@ -32,7 +32,7 @@ Copyright 1989 Hewlett-Packard Co. control after all entity declarations have been processed. Not needed in valid documents (when it is called just prior to global start-code), but may be useful in some applications nevertheless. */ -void m_startdoc(M_NOPAR) +void m_startdoc(void) { } diff --git a/cde/programs/dthelp/parser/canon1/parser/struct.c b/cde/programs/dthelp/parser/canon1/parser/struct.c index 23b02d2b..3130929b 100644 --- a/cde/programs/dthelp/parser/canon1/parser/struct.c +++ b/cde/programs/dthelp/parser/canon1/parser/struct.c @@ -191,7 +191,7 @@ LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet) /* Make a copy of the stack entry at the top of the parse stack in a scratch area */ -M_PARSE *m_copystackelt(M_NOPAR) +M_PARSE *m_copystackelt(void) { M_OPENFSA *oldfsa ; M_OPENFSA **newfsa ; @@ -219,7 +219,7 @@ M_PARSE *m_copystackelt(M_NOPAR) } /* End of document */ -void m_done(M_NOPAR) +void m_done(void) { M_ELEMENT lastelt ; @@ -398,7 +398,7 @@ LOGICAL m_nextand(thisfsa, label) } /* Pops the parse stack*/ -void m_pop(M_NOPAR) +void m_pop(void) { M_PARSE *stackelt ; @@ -664,7 +664,7 @@ void m_strttag(M_ELEMENT val, LOGICAL net) makes more sense, is used by MARKUP, and is under consideration by the Standards committee; the latter is the current definition in the Standard */ -LOGICAL m_textpermitted(M_NOPAR) +LOGICAL m_textpermitted(void) { M_ANDGROUP pand ; M_OPENFSA *fsastack ; diff --git a/cde/programs/dthelp/parser/canon1/util/basic.h b/cde/programs/dthelp/parser/canon1/util/basic.h index ea74d5f1..b8057c98 100644 --- a/cde/programs/dthelp/parser/canon1/util/basic.h +++ b/cde/programs/dthelp/parser/canon1/util/basic.h @@ -47,8 +47,6 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#define M_NOPAR void - char *MakeMByteString(const M_WCHAR *from); M_WCHAR *MakeWideCharString(const char *from); diff --git a/cde/programs/dthelp/parser/canon1/util/cont.h b/cde/programs/dthelp/parser/canon1/util/cont.h index e4863ce3..4b060ec4 100644 --- a/cde/programs/dthelp/parser/canon1/util/cont.h +++ b/cde/programs/dthelp/parser/canon1/util/cont.h @@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated. void countdown(M_TRIE *parent, int *count); -void dumpdlmptr(M_NOPAR); +void dumpdlmptr(void); void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)); @@ -53,17 +53,17 @@ void m_err1(char *text, char *arg); void getcode(int n); -void getcolon(M_NOPAR); +void getcolon(void); -int getContext(M_NOPAR); +int getContext(void); -LOGICAL getdname(M_NOPAR); +LOGICAL getdname(void); -void inccon(M_NOPAR); +void inccon(void); -void incdelim(M_NOPAR); +void incdelim(void); -void loaddelim(M_NOPAR); +void loaddelim(void); int m_lower(int c); @@ -81,7 +81,7 @@ void prtctxt(int column, int value); int readchar(LOGICAL cap); -void skiptoend(M_NOPAR); +void skiptoend(void); void unread(int c); diff --git a/cde/programs/dthelp/parser/canon1/util/conutil.c b/cde/programs/dthelp/parser/canon1/util/conutil.c index 6fc6f5bd..a6ab7a02 100644 --- a/cde/programs/dthelp/parser/canon1/util/conutil.c +++ b/cde/programs/dthelp/parser/canon1/util/conutil.c @@ -40,7 +40,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "cont.h" /* Output declaration of dlmptr */ -void dumpdlmptr(M_NOPAR) +void dumpdlmptr(void) { int n; @@ -216,7 +216,7 @@ while (TRUE) } /* End proc getcode() */ /* Read the colon separating the two states in a transition pair */ -void getcolon(M_NOPAR) +void getcolon(void) { int c ; /* c is int instead of char for use with ungetc */ M_WCHAR wcl; @@ -240,7 +240,7 @@ if (c != wcl) } /* Read a context name from an input line */ -int getContext(M_NOPAR) +int getContext(void) { M_WCHAR name[CNAMELEN + 1]; int c ; /* c is int instead of char for use with ungetc */ @@ -309,7 +309,7 @@ return(ccount - 1); } /* Read a delimiter name from the input line */ -LOGICAL getdname(M_NOPAR) +LOGICAL getdname(void) { int c; M_WCHAR *p; @@ -353,7 +353,7 @@ return(TRUE); } /* Out of context space. Increase. */ -void inccon(M_NOPAR) +void inccon(void) { M_TRIE **newtrie = NULL; int *newtransit = NULL; @@ -400,7 +400,7 @@ void inccon(M_NOPAR) } /* Increase delimiter space. */ -void incdelim(M_NOPAR) +void incdelim(void) { int *newtransit = NULL; char **newdlm = NULL; @@ -448,7 +448,7 @@ dcount++; } /* Read delimiter definitions from delim.dat */ -void loaddelim(M_NOPAR) +void loaddelim(void) { int c; M_WCHAR *p; @@ -654,7 +654,7 @@ return(c); /* Called by utility procedure m_error() -- has content in other programs that use m_error() */ -void skiptoend(M_NOPAR) +void skiptoend(void) { } diff --git a/cde/programs/dthelp/parser/canon1/util/error.c b/cde/programs/dthelp/parser/canon1/util/error.c index 5afdeaa9..a8590f50 100644 --- a/cde/programs/dthelp/parser/canon1/util/error.c +++ b/cde/programs/dthelp/parser/canon1/util/error.c @@ -56,7 +56,7 @@ void msgline(char *text); void msg1line(char *text, char *arg1); -void skiptoend(M_NOPAR); +void skiptoend(void); void m_wctrace(M_WCHAR *text); @@ -185,7 +185,7 @@ m_free(mb_arg5,"multi-byte string"); } /* Write error message suffix */ -void esuffix(M_NOPAR) +void esuffix(void) { fprintf(stderr, " (line %d) ****\n", m_line) ; fprintf(m_errfile, " (line %d) ****\n", m_line) ; diff --git a/cde/programs/dthelp/parser/canon1/util/initct.c b/cde/programs/dthelp/parser/canon1/util/initct.c index 4d971c90..9f03df46 100644 --- a/cde/programs/dthelp/parser/canon1/util/initct.c +++ b/cde/programs/dthelp/parser/canon1/util/initct.c @@ -29,7 +29,7 @@ #include "common.h" extern char m_chartype[M_CHARSETLEN] ; -void m_initctype(M_NOPAR) +void m_initctype(void) { int i ; diff --git a/cde/programs/dthelp/parser/canon1/util/malloc.c b/cde/programs/dthelp/parser/canon1/util/malloc.c index 520a96ce..06800d85 100644 --- a/cde/programs/dthelp/parser/canon1/util/malloc.c +++ b/cde/programs/dthelp/parser/canon1/util/malloc.c @@ -42,7 +42,7 @@ void m_exit(int status); void m_free(void *block, char *msg); -void m_heapdump(M_NOPAR); +void m_heapdump(void); void *m_malloc(int size, char *msg); @@ -81,7 +81,7 @@ void m_free(block, msg) } #if defined(MSDOS) -void m_heapdump(M_NOPAR) +void m_heapdump(void) { struct _heapinfo hinfo ; int heapstatus ; diff --git a/cde/programs/dthelp/parser/canon1/util/scanutil.c b/cde/programs/dthelp/parser/canon1/util/scanutil.c index ca3ee610..5b1aaffc 100644 --- a/cde/programs/dthelp/parser/canon1/util/scanutil.c +++ b/cde/programs/dthelp/parser/canon1/util/scanutil.c @@ -28,7 +28,7 @@ extern FILE *ifile; /* Getachar returns the next character from the input stream */ -int getachar(M_NOPAR) +int getachar(void) { int c; M_WCHAR wc,wnl; diff --git a/cde/programs/dthelp/parser/canon1/util/trie.c b/cde/programs/dthelp/parser/canon1/util/trie.c index fe387622..d32958ec 100644 --- a/cde/programs/dthelp/parser/canon1/util/trie.c +++ b/cde/programs/dthelp/parser/canon1/util/trie.c @@ -85,7 +85,7 @@ void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c) } /* end entertree */ /* Gets a new node for a trie */ -M_TRIE *m_gettrienode(M_NOPAR) +M_TRIE *m_gettrienode(void) { M_TRIE *new ; diff --git a/cde/programs/dthelp/parser/canon1/util/trie.h b/cde/programs/dthelp/parser/canon1/util/trie.h index 0755b8a6..bf2a9da5 100644 --- a/cde/programs/dthelp/parser/canon1/util/trie.h +++ b/cde/programs/dthelp/parser/canon1/util/trie.h @@ -51,7 +51,7 @@ struct m_ptrie { } ; -M_TRIE *m_gettrienode(M_NOPAR); +M_TRIE *m_gettrienode(void); void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie); diff --git a/cde/programs/dthelp/parser/pass1/build/buildutl.c b/cde/programs/dthelp/parser/pass1/build/buildutl.c index 6e137577..735c8267 100644 --- a/cde/programs/dthelp/parser/pass1/build/buildutl.c +++ b/cde/programs/dthelp/parser/pass1/build/buildutl.c @@ -62,7 +62,7 @@ if (*flag) } /* Program initialization */ -void initialize(M_NOPAR) +void initialize(void) { char **mb_delims; M_WCHAR **wc_delims; @@ -90,7 +90,7 @@ ruleinit() ; /* Initialization before starting a new rule */ -void ruleinit(M_NOPAR) +void ruleinit(void) { /* Reinitialize for next rule */ lhs = NULL ; @@ -110,7 +110,7 @@ void ruleinit(M_NOPAR) } /* Rule end processing */ -void rulend(M_NOPAR) +void rulend(void) { STATE *fsa = NULL ; LOGICAL canbenull ; @@ -150,7 +150,7 @@ void rulend(M_NOPAR) } /* Skip rest of statement after an error */ -void skiptoend(M_NOPAR) +void skiptoend(void) { int i ; static int errlev = 0 ; diff --git a/cde/programs/dthelp/parser/pass1/build/except.c b/cde/programs/dthelp/parser/pass1/build/except.c index 4b877462..e9686335 100644 --- a/cde/programs/dthelp/parser/pass1/build/except.c +++ b/cde/programs/dthelp/parser/pass1/build/except.c @@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "build.h" /* Add an exception (inclusion or exclusion) for the current element */ -void addex(M_NOPAR) +void addex(void) { excount++ ; *nextex = (EXCEPTION *) m_malloc(sizeof(EXCEPTION), "exception") ; diff --git a/cde/programs/dthelp/parser/pass1/build/fsa.c b/cde/programs/dthelp/parser/pass1/build/fsa.c index aeb14383..0ebc8c25 100644 --- a/cde/programs/dthelp/parser/pass1/build/fsa.c +++ b/cde/programs/dthelp/parser/pass1/build/fsa.c @@ -176,7 +176,7 @@ void dellist(list) /* Delstartarcs deletes the contents of the starta list of arcs from start states of a submodel */ -void delstartarcs(M_NOPAR) +void delstartarcs(void) { ARC *arcptr ; ARC *discard ; @@ -190,7 +190,7 @@ void delstartarcs(M_NOPAR) } /* Getand allocates and initializes a new andgroup structure */ -ANDGROUP *getand(M_NOPAR) +ANDGROUP *getand(void) { ANDGROUP *new ; @@ -203,7 +203,7 @@ ANDGROUP *getand(M_NOPAR) } /* Getstate obtains an FSA state */ -STATE *getstate(M_NOPAR) +STATE *getstate(void) { STATE *new ; @@ -477,7 +477,7 @@ LOGICAL permitspcd(a) /* Pop pops the submodel stack when the end of the current submodel is encountered */ -void pop(M_NOPAR) +void pop(void) { STACK *discard ; @@ -493,7 +493,7 @@ void pop(M_NOPAR) } /* Push pushes the submodel stack when a new group is encountered */ -void push(M_NOPAR) +void push(void) { STACK *new ; @@ -647,7 +647,7 @@ void savelhs(LOGICAL param) /* Called when arcs are added to the start state of a submodel that is also a start state of the parent model to set the parent model's starta list */ -void savestartarcs(M_NOPAR) +void savestartarcs(void) { ARC *carcptr, *parcptr ; diff --git a/cde/programs/dthelp/parser/pass1/build/out.c b/cde/programs/dthelp/parser/pass1/build/out.c index 3d9a344a..4db1d584 100644 --- a/cde/programs/dthelp/parser/pass1/build/out.c +++ b/cde/programs/dthelp/parser/pass1/build/out.c @@ -87,7 +87,7 @@ char *deftype(n) } /* Called after all input is read to generate output */ -void done(M_NOPAR) +void done(void) { if (! eltree.data) { @@ -167,7 +167,7 @@ void eltblocks(tempfile) /* Writes data about elements */ -void eltreeout(M_NOPAR) +void eltreeout(void) { M_WCHAR *p ; int enameindex = 0 ; @@ -245,7 +245,7 @@ char *enttype(n) } /* Outputs exception lists */ -void exout(M_NOPAR) +void exout(void) { EXCEPTION *ex ; int exindex = 0 ; @@ -268,7 +268,7 @@ void exout(M_NOPAR) } /* Outputs FSA definitions */ -void fsa(M_NOPAR) +void fsa(void) { int arcount = 0 ; STATE *pstate ; @@ -331,7 +331,7 @@ void fsa(M_NOPAR) } /* Writes data about parameters */ -void parout(M_NOPAR) +void parout(void) { PARAMETER *paramp ; LOGICAL first = TRUE ; @@ -480,7 +480,7 @@ char *partype(n) } /* Write short reference information */ -void srefout(M_NOPAR) +void srefout(void) { LOGICAL first = TRUE ; int *mapbysref = NULL; @@ -629,7 +629,7 @@ fputs(" <\\END-STRING>\n", tempfile) ; } /* Write template */ -void template(M_NOPAR) +void template(void) { FILE *tempfile ; M_ENTITY *ent ; diff --git a/cde/programs/dthelp/parser/pass1/build/param.c b/cde/programs/dthelp/parser/pass1/build/param.c index 16f76a3b..97753c0c 100644 --- a/cde/programs/dthelp/parser/pass1/build/param.c +++ b/cde/programs/dthelp/parser/pass1/build/param.c @@ -38,7 +38,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Add a keyword to the list of possible values of a keyword parameter for the current element */ -void addkeyword(M_NOPAR) +void addkeyword(void) { int length ; PARAMETER *par ; @@ -87,7 +87,7 @@ ptypelen++ ; } /* Add a parameter to the current element */ -void addpar(M_NOPAR) +void addpar(void) { PARAMETER *paramp, *last = NULL ; int length ; @@ -263,7 +263,7 @@ switch (newpar->type) } /* Called at end of parameter attribute list rule */ -void prulend(M_NOPAR) +void prulend(void) { LHS *lhsp ; LHS *discard ; diff --git a/cde/programs/dthelp/parser/pass1/build/proto.h b/cde/programs/dthelp/parser/pass1/build/proto.h index 0573aa9b..e5396c6b 100644 --- a/cde/programs/dthelp/parser/pass1/build/proto.h +++ b/cde/programs/dthelp/parser/pass1/build/proto.h @@ -35,15 +35,15 @@ void adddefent(M_WCHAR *mapname); LOGICAL addent(M_WCHAR *name); -void addex(M_NOPAR); +void addex(void); -void addkeyword(M_NOPAR); +void addkeyword(void); LOGICAL addmapname(M_WCHAR *p, LOGICAL define); void addndent(M_WCHAR *p); -void addpar(M_NOPAR); +void addpar(void); void addsref(M_WCHAR *p); @@ -62,15 +62,15 @@ void copyintolist(STATELIST *from, STATELIST **to); void countdown(M_TRIE *parent, int *count); -void defmapname(M_NOPAR); +void defmapname(void); char *deftype(int n); void dellist(STATELIST **list); -void delstartarcs(M_NOPAR); +void delstartarcs(void); -void done(M_NOPAR); +void done(void); void dumpentnode(FILE *file, M_TRIE *value); @@ -90,9 +90,9 @@ void m_dumptrie(FILE *file, void eltblocks(FILE *tempfile); -void eltreeout(M_NOPAR); +void eltreeout(void); -void endmodel(M_NOPAR); +void endmodel(void); void entout(char *fname); @@ -106,7 +106,7 @@ 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 exout(void); void m_free(void *block, char *msg); @@ -114,23 +114,23 @@ void freetree(TREE *ruletree); void found(LOGICAL *flag, char *delim); -void fsa(M_NOPAR); +void fsa(void); -int getachar(M_NOPAR); +int getachar(void); -ANDGROUP *getand(M_NOPAR); +ANDGROUP *getand(void); LOGICAL getname(int first); -STATE *getstate(M_NOPAR); +STATE *getstate(void); int gettoken(int *c, int context); -TREE *gettreenode(M_NOPAR); +TREE *gettreenode(void); -void m_initctype(M_NOPAR); +void m_initctype(void); -void initialize(M_NOPAR); +void initialize(void); LOGICAL litproc(int delim); @@ -160,49 +160,49 @@ ELTSTRUCT *ntrelt(M_WCHAR *p); void m_openchk(FILE **ptr, char *name, char *mode); -void parout(M_NOPAR); +void parout(void); char *partype(int n); LOGICAL permitspcd(ARC *a); -void pop(M_NOPAR); +void pop(void); -void prulend(M_NOPAR); +void prulend(void); -void push(M_NOPAR); +void push(void); LOGICAL regenerate(TREE *start, TREE *stop); void repeat(TREE *root); -void ruleinit(M_NOPAR); +void ruleinit(void); -void rulend(M_NOPAR); +void rulend(void); LOGICAL samelabelarc(ARC *a, STATE *s); void savelhs(LOGICAL param); -void savestartarcs(M_NOPAR); +void savestartarcs(void); -int scan(M_NOPAR); +int scan(void); void setdefault(const M_WCHAR *string); void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional); -void skiptoend(M_NOPAR); +void skiptoend(void); int m_sprscon(int i, int j); -void srefout(M_NOPAR); +void srefout(void); STATE *startfsa(TREE *root, LOGICAL *canbenull); void tempelt(ELTSTRUCT *eltp, FILE *tempfile); -void template(M_NOPAR); +void template(void); char *typecon(int n); diff --git a/cde/programs/dthelp/parser/pass1/build/scan.c b/cde/programs/dthelp/parser/pass1/build/scan.c index 9f0c5daa..7826aa8c 100644 --- a/cde/programs/dthelp/parser/pass1/build/scan.c +++ b/cde/programs/dthelp/parser/pass1/build/scan.c @@ -74,7 +74,7 @@ return(TRUE); } /* Returns the next token to the main procedure */ -int scan(M_NOPAR) +int scan(void) { int c; int n; diff --git a/cde/programs/dthelp/parser/pass1/build/sref.c b/cde/programs/dthelp/parser/pass1/build/sref.c index 78581d7b..0bf9b0b6 100644 --- a/cde/programs/dthelp/parser/pass1/build/sref.c +++ b/cde/programs/dthelp/parser/pass1/build/sref.c @@ -192,7 +192,7 @@ delim->data = thissref; /* Prefix left-hand side with "M-" to create default short reference map name, truncating to M_NAMELEN characters if necessary */ -void defmapname(M_NOPAR) +void defmapname(void) { if (!wc_prefix) { diff --git a/cde/programs/dthelp/parser/pass1/build/tree.c b/cde/programs/dthelp/parser/pass1/build/tree.c index b7eba712..42355700 100644 --- a/cde/programs/dthelp/parser/pass1/build/tree.c +++ b/cde/programs/dthelp/parser/pass1/build/tree.c @@ -36,7 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Called after a right parenthesis is read while scanning a content model. Resets curcon if it is the outermost submodel. */ -void endmodel(M_NOPAR) +void endmodel(void) { curtree = curtree->parent ; if (! curtree->parent) curcon = LASTM ; @@ -58,7 +58,7 @@ void freetree(treep) } /* Gettreenode obtains a node to use in the tree representation of a rule */ -TREE *gettreenode(M_NOPAR) +TREE *gettreenode(void) { TREE *new ; diff --git a/cde/programs/dthelp/parser/pass1/eltdef/context.dat b/cde/programs/dthelp/parser/pass1/eltdef/context.dat index e9f76f65..2f99be16 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/context.dat +++ b/cde/programs/dthelp/parser/pass1/eltdef/context.dat @@ -398,7 +398,7 @@ tagc postent:start codetagc:inentc { startcode(entity->codeindex, &inent, entfile, - "c", nopar, nopar, "") ; + "c", "void", "void", "") ; } close:preparam sschain:inss { @@ -420,11 +420,11 @@ tagc } scchain:insc { *getaction(scarray) = ++sactions ; - startcode(sactions, &insc, sfile, "s", nopar, nopar, "") ; + startcode(sactions, &insc, sfile, "s", "void", "void", "") ; } ecchain:inec { *getaction(ecarray) = ++eactions ; - startcode(eactions, &inec, efile, "e", nopar, nopar, "") ; + startcode(eactions, &inec, efile, "e", "void", "void", "") ; } stcchain:instc { *getaction(stcarray) = ++stactions ; diff --git a/cde/programs/dthelp/parser/pass1/eltdef/eltdef.h b/cde/programs/dthelp/parser/pass1/eltdef/eltdef.h index ed705633..914f49bd 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/eltdef.h +++ b/cde/programs/dthelp/parser/pass1/eltdef/eltdef.h @@ -215,7 +215,6 @@ ELTEXTERN int restart ELTINIT(RENTITY) ; #define stproto "M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END" #define stformal "m_string, M_START, M_END" #define stft " M_WCHAR *m_string ;\n LOGICAL M_START ;\n LOGICAL M_END ;\n" -#define nopar "M_NOPAR" /* Structures for generating defines for parameter values */ ELTEXTERN M_TRIE parval ; diff --git a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c index 19b90905..e4faf649 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c @@ -92,7 +92,7 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto) /* Called when the C identifier to be #define'd to a parameter value is scanned */ -void cvalue(M_NOPAR) +void cvalue(void) { PARVAL *new; @@ -111,18 +111,18 @@ void cvalue(M_NOPAR) /* Called after last input character is read to place closing punctuation at end of output files and close them */ -void done(M_NOPAR) +void done(void) { M_ENTITY *ent; ACTION *actp; LOGICAL first; int i; - closeiffile(inent, entfile, codeent, "c", nopar); + closeiffile(inent, entfile, codeent, "c", "void"); closeiffile(intext, tfile, tactions, "t", tproto); closeiffile(inpc, pfile, pactions, "p", pproto); - closeiffile(insc, sfile, sactions, "s", nopar); - closeiffile(inec, efile, eactions, "e", nopar); + closeiffile(insc, sfile, sactions, "s", "void"); + closeiffile(inec, efile, eactions, "e", "void"); closeiffile(instc, stfile, stactions, "st", stproto); endstring(); @@ -190,7 +190,7 @@ void endcode(LOGICAL flag, FILE *file) } /* Called at the end of all initial fields in the interface definition */ -void endini(M_NOPAR) +void endini(void) { if (finitext) fputs(" putc(m_textchar, m_outfile);\n", tfile); @@ -209,7 +209,7 @@ void endini(M_NOPAR) /* End the sign-on message */ #include -void endsignon(M_NOPAR) +void endsignon(void) { time_t storetime; char *p; @@ -255,7 +255,7 @@ void endsignon(M_NOPAR) } /* Closes a start-string or end-string */ -void endstring(M_NOPAR) +void endstring(void) { if (instring) { if (stringstart) stringstart = FALSE; @@ -282,7 +282,7 @@ void enttype(type) } /* Free storage used for a context-specification chain */ -void freechain(M_NOPAR) +void freechain(void) { CHAIN *chainp, *dchainp; @@ -333,7 +333,7 @@ int *getaction(array) } /* Allocate new action structure */ -ACTION *getactstruct(M_NOPAR) +ACTION *getactstruct(void) { ACTION *new; @@ -347,7 +347,7 @@ ACTION *getactstruct(M_NOPAR) } /* Program initialization */ -void initialize(M_NOPAR) +void initialize(void) { char **mb_delims; M_WCHAR **wc_delims; @@ -411,13 +411,13 @@ fputs("#endif\n", ifh); startcode(pactions, &inpc, pfile, "p", pproto, pformal, pftype); startcode(tactions, &intext, tfile, "t", tproto, tformal, tftype); -startcode(sactions, &insc, sfile, "s", nopar, nopar, ""); -startcode(eactions, &inec, efile, "e", nopar, nopar, ""); +startcode(sactions, &insc, sfile, "s", "void", "void", ""); +startcode(eactions, &inec, efile, "e", "void", "void", ""); startcode(stactions, &instc, stfile, "st", stproto, stformal, stft); } /* Output definitions for strings */ -void outstring(M_NOPAR) +void outstring(void) { int c; @@ -480,7 +480,7 @@ for ( ; p ; p = p->next) } /* Skip rest of statement after an error */ -void skiptoend(M_NOPAR) +void skiptoend(void) { int i; static int errlev = 0; @@ -580,7 +580,7 @@ fprintf(file, "{\n/* line %d \"%s\" */\n", m_line, iffile); /* balance "}" */ } /* Begins processing a new element */ -void startelement(M_NOPAR) +void startelement(void) { CVARSTRUCT *cvarp; CVARSTRUCT *discard; @@ -601,7 +601,7 @@ void startelement(M_NOPAR) } /* Stores the name of a C variable read from the input file */ -void storecvar(M_NOPAR) +void storecvar(void) { CVARSTRUCT *new; @@ -616,7 +616,7 @@ void storecvar(M_NOPAR) /* Compares the parameter name associated with a C variable in the input file with the names of all parameters of the current element. Stores result for later output with code segments */ -void storepname(M_NOPAR) +void storepname(void) { int i, par; diff --git a/cde/programs/dthelp/parser/pass1/eltdef/entity.c b/cde/programs/dthelp/parser/pass1/eltdef/entity.c index 2d9ef503..ba0e7ba2 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/entity.c +++ b/cde/programs/dthelp/parser/pass1/eltdef/entity.c @@ -35,7 +35,7 @@ #include "entext.h" /* Add an entity */ -void addent(M_NOPAR) +void addent(void) { M_ENTITY *new ; diff --git a/cde/programs/dthelp/parser/pass1/eltdef/proto.h b/cde/programs/dthelp/parser/pass1/eltdef/proto.h index 0211bba9..fb781083 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/proto.h +++ b/cde/programs/dthelp/parser/pass1/eltdef/proto.h @@ -30,7 +30,7 @@ void actptrout(ACTION **array, char *name); -void addent(M_NOPAR); +void addent(void); LOGICAL m_allwhite(const M_WCHAR *string); @@ -38,10 +38,10 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto); void countdown(M_TRIE *parent, int *count); -void cvalue(M_NOPAR); +void cvalue(void); -void done(M_NOPAR); +void done(void); void m_dumptrie(FILE *file, M_TRIE *xtrie, @@ -51,11 +51,11 @@ void m_dumptrie(FILE *file, void endcode(LOGICAL flag, FILE *file); -void endini(M_NOPAR); +void endini(void); -void endsignon(M_NOPAR); +void endsignon(void); -void endstring(M_NOPAR); +void endstring(void); void entout(char *fname); @@ -78,21 +78,21 @@ void m_exit(int status); void m_free(void *block, char *msg); -void freechain(M_NOPAR); +void freechain(void); -int getachar(M_NOPAR); +int getachar(void); int *getaction(ACTION **array); -ACTION *getactstruct(M_NOPAR); +ACTION *getactstruct(void); void getname(int first); int gettoken(int *c, int context); -void m_initctype(M_NOPAR); +void m_initctype(void); -void initialize(M_NOPAR); +void initialize(void); LOGICAL m_letter(M_WCHAR c); @@ -106,24 +106,24 @@ void m_openchk(FILE **ptr, char *name, char *mode); void outpval(M_TRIE *p); -void outstring(M_NOPAR); +void outstring(void); int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); const M_WCHAR *m_partype(const int par, const M_WCHAR *string); -int scan(M_NOPAR); +int scan(void); -void skiptoend(M_NOPAR); +void skiptoend(void); void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, char *formal, char *formtype); -void startelement(M_NOPAR); +void startelement(void); -void storecvar(M_NOPAR); +void storecvar(void); -void storepname(M_NOPAR); +void storepname(void); void undodelim(M_WCHAR *delim); diff --git a/cde/programs/dthelp/parser/pass1/eltdef/scan.c b/cde/programs/dthelp/parser/pass1/eltdef/scan.c index cbc0ad89..d0cda0bb 100644 --- a/cde/programs/dthelp/parser/pass1/eltdef/scan.c +++ b/cde/programs/dthelp/parser/pass1/eltdef/scan.c @@ -86,7 +86,7 @@ ungetachar(c); } /* Reads the next token and returns it to the main procedure */ -int scan(M_NOPAR) +int scan(void) { int c; int n; diff --git a/cde/programs/dthelp/parser/pass1/helptag/custom.c b/cde/programs/dthelp/parser/pass1/helptag/custom.c index 1813100b..9da131fc 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/custom.c +++ b/cde/programs/dthelp/parser/pass1/helptag/custom.c @@ -37,7 +37,7 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co. /* Standard startup code doesn't have room to load inherited environments in some cases. Since they're not used, don't bother. (Using Microsoft C compiler). */ -void _setenvp(M_NOPAR); +void _setenvp(void); void _setenvp(){} #endif @@ -72,7 +72,7 @@ else } /* Write error message prefix */ -void m_eprefix(M_NOPAR) +void m_eprefix(void) { m_errline("\n*****\n"); m_dumpline(m_thisfile(), m_thisline()); @@ -96,7 +96,7 @@ for ( ; *p ; p++) #include #endif /* Write error message suffix */ -void m_esuffix(M_NOPAR) +void m_esuffix(void) { m_errline(":\n"); m_lastchars(); @@ -245,7 +245,7 @@ return(NULL); } /* Open input file */ -void *m_openfirst(M_NOPAR) +void *m_openfirst(void) { FILE *first; char *input; diff --git a/cde/programs/dthelp/parser/pass1/helptag/fproto.h b/cde/programs/dthelp/parser/pass1/helptag/fproto.h index e6acb18c..8b35a566 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/fproto.h +++ b/cde/programs/dthelp/parser/pass1/helptag/fproto.h @@ -24,27 +24,27 @@ /* Copyright (c) 1988, 1989, 1990 Hewlett-Packard Co. */ /* Function prototypes for HP Tag/TeX translator */ -void assert_hometopic_exists(M_NOPAR); +void assert_hometopic_exists(void); /* conflict with prototype defined for basename() in on osf, so use fbasename */ -void fbasename(M_NOPAR); +void fbasename(void); void chapstart(M_WCHAR *id); -void checkgloss(M_NOPAR); +void checkgloss(void); M_WCHAR *checkid(M_WCHAR *id); -void checkmsghead (M_NOPAR); +void checkmsghead (void); -void dumpxref(M_NOPAR); +void dumpxref(void); void echohead(M_WCHAR *p); void mb_echohead(char *p); -void endhead(M_NOPAR); +void endhead(void); void esoutchar(M_WCHAR textchar); @@ -69,7 +69,7 @@ char *m_itoa(int n, char *s); LOGICAL m_letter(M_WCHAR c); -void loadxref(M_NOPAR); +void loadxref(void); int m_lower(int c); @@ -83,7 +83,7 @@ void realoutchar(M_WCHAR textchar, FILE *outfile); void rsectstart(M_WCHAR *id); -void rseqend(M_NOPAR); +void rseqend(void); M_WCHAR *searchforfile(M_WCHAR *file); @@ -143,7 +143,7 @@ void StartLabList(M_WCHAR *spacing, void StartList(M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont); -void EndList(M_NOPAR); +void EndList(void); void strcode(M_WCHAR *string, FILE *outfile); @@ -159,7 +159,7 @@ void termchar(M_WCHAR textchar); void termpi(int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname); -void texinit(M_NOPAR); +void texinit(void); int vextextsize(const M_WCHAR *keyword); @@ -188,7 +188,7 @@ char *GetDefaultHeaderString(char *elementName, char *defaultString); -void SetDefaultLocale(M_NOPAR); +void SetDefaultLocale(void); char *MakeMByteString(const M_WCHAR *from); @@ -220,11 +220,11 @@ M_WCHAR wc_toupper( M_WCHAR wc); M_WCHAR *wc_stringtoupper( M_WCHAR *wcp); -int NextId(M_NOPAR); +int NextId(void); -char *GetLanguage(M_NOPAR); +char *GetLanguage(void); -char *GetCharset(M_NOPAR); +char *GetCharset(void); void HandleLink( M_WCHAR *hyperlink, M_WCHAR *type, @@ -240,7 +240,7 @@ void Add2ToRowVec( int *length, char **rowvec, char *id1, char *id2); void StartEx(M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize); -void EndEx(M_NOPAR); +void EndEx(void); void StartNCW(char *which); @@ -250,14 +250,14 @@ void AddToSNB(char *id, char *iconName); void StartNCWtext(char *which, char *iconFile, char *headingString); -void IncludeToss(M_NOPAR); +void IncludeToss(void); M_WCHAR *CycleEnt( LOGICAL init, unsigned char *type, M_WCHAR ***content, unsigned char *wheredef); -void ModifyEntities(M_NOPAR); +void ModifyEntities(void); void PushForm(char *class, char *ssi, @@ -268,12 +268,12 @@ void PushForm2(char *class, char *id1, char *id2); -void PopForm(M_NOPAR); +void PopForm(void); -void PopForm2(M_NOPAR); +void PopForm2(void); -void PopFormMaybe(M_NOPAR); +void PopFormMaybe(void); -void EmitSavedAnchors(M_NOPAR); +void EmitSavedAnchors(void); -void CloseVirpage(M_NOPAR); +void CloseVirpage(void); diff --git a/cde/programs/dthelp/parser/pass1/helptag/help.c b/cde/programs/dthelp/parser/pass1/helptag/help.c index 3d44ef4e..8a0d691a 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/help.c +++ b/cde/programs/dthelp/parser/pass1/helptag/help.c @@ -32,7 +32,7 @@ #include "LocaleXlate.h" #include "XlationSvc.h" -void assert_hometopic_exists(M_NOPAR) +void assert_hometopic_exists(void) { static const char hometopic[] = "-HOMETOPIC"; char id[SDLNAMESIZ + sizeof(hometopic)]; @@ -61,7 +61,7 @@ m_free(string, "GetDefaultHeaderString return"); /* Determine base name for files (i.e., input name without extension). Open output and error files */ -void fbasename(M_NOPAR) +void fbasename(void) { char *p, *q; int n; @@ -292,7 +292,7 @@ if (*chapterSuffixString) /* Called at end of manual to report terms that occurred in the document but not entered in the glossary */ -void checkgloss(M_NOPAR) +void checkgloss(void) { int n; M_WCHAR id[MAXTERM + 1]; @@ -329,7 +329,7 @@ while (TRUE) /* End Error Message macro \starterrmsg call, check to see if Error Message head is user specified or default */ -void checkmsghead(M_NOPAR) +void checkmsghead(void) { char *string = GetDefaultHeaderString("MessagesElementDefaultHeadingString", @@ -924,7 +924,7 @@ chapst = TRUE; /* Called at the end of a chapter, appendix, or section to end an open sequence of rsects */ -void rseqend(M_NOPAR) +void rseqend(void) { if (rsectseq) --thisnodelevel; @@ -1275,7 +1275,7 @@ if (lastlist->type == BULLET) bulcount-- ; /* Open and initialize TeX file */ -void texinit(M_NOPAR) +void texinit(void) { LOGICAL init = TRUE; unsigned char type; diff --git a/cde/programs/dthelp/parser/pass1/helptag/out.c b/cde/programs/dthelp/parser/pass1/helptag/out.c index e7c5500f..ddb0e10a 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/out.c +++ b/cde/programs/dthelp/parser/pass1/helptag/out.c @@ -67,7 +67,7 @@ m_free(wc,"wide character string"); /* Called at end of a head in a chapter, appendix, section, or reference section */ -void endhead(M_NOPAR) +void endhead(void) { if (savid) { diff --git a/cde/programs/dthelp/parser/pass1/helptag/xref.c b/cde/programs/dthelp/parser/pass1/helptag/xref.c index 45ad6928..c80b893b 100644 --- a/cde/programs/dthelp/parser/pass1/helptag/xref.c +++ b/cde/programs/dthelp/parser/pass1/helptag/xref.c @@ -143,7 +143,7 @@ m_free(csname, "csname"); /* Write cross-reference file for next time document is processed and TeX macro file for post-processing this pass */ -void dumpxref(M_NOPAR) +void dumpxref(void) { int n; M_WCHAR id[M_NAMELEN + 1]; @@ -219,7 +219,7 @@ xstrlen += length; /* Initializes cross-reference table reading in file output from previous pass through document */ -void loadxref(M_NOPAR) +void loadxref(void) { M_WCHAR id[M_NAMELEN + 1]; char c, d; diff --git a/cde/programs/dthelp/parser/pass1/parser/actutil.c b/cde/programs/dthelp/parser/pass1/parser/actutil.c index 16092600..0d6894d7 100644 --- a/cde/programs/dthelp/parser/pass1/parser/actutil.c +++ b/cde/programs/dthelp/parser/pass1/parser/actutil.c @@ -137,7 +137,7 @@ void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int * /* Process global end string. In separate procedure to keep all references to if.h in one source file and minimize recompilation if interface changes. */ -void m_globes(M_NOPAR) +void m_globes(void) { M_WCHAR *wc_string; @@ -149,7 +149,7 @@ m_free(wc_string,"wide character string"); /* Process global start string. In separate procedure to keep all references to if.h in one source file and minimize recompilation if interface changes. */ -void m_globss(M_NOPAR) +void m_globss(void) { M_WCHAR *wc_string; diff --git a/cde/programs/dthelp/parser/pass1/parser/eprefix.c b/cde/programs/dthelp/parser/pass1/parser/eprefix.c index d3befd80..0dd27798 100644 --- a/cde/programs/dthelp/parser/pass1/parser/eprefix.c +++ b/cde/programs/dthelp/parser/pass1/parser/eprefix.c @@ -29,7 +29,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "globdec.h" /* Write error message prefix */ -void m_eprefix(M_NOPAR) +void m_eprefix(void) { m_errline("\n*****\n") ; } diff --git a/cde/programs/dthelp/parser/pass1/parser/error.c b/cde/programs/dthelp/parser/pass1/parser/error.c index 58d50cd8..bbea85ea 100644 --- a/cde/programs/dthelp/parser/pass1/parser/error.c +++ b/cde/programs/dthelp/parser/pass1/parser/error.c @@ -336,7 +336,7 @@ void m_getline(file, line) /* Dump last characters read from input stream to give context to an error message */ -void m_lastchars(M_NOPAR) +void m_lastchars(void) { int i; M_WCHAR buffer[2]; @@ -385,14 +385,14 @@ if ((m_svlncnt[m_sysecnt] && } /* Display information about the current element */ -void m_showcurelt(M_NOPAR) +void m_showcurelt(void) { if (m_stacktop->oldtop) m_dispcurelt(m_stacktop->file, m_stacktop->line); } /* Start an error message */ -void m_startmsg(M_NOPAR) +void m_startmsg(void) { m_eprefix(); m_errexit = TRUE; @@ -400,7 +400,7 @@ void m_startmsg(M_NOPAR) /* Return the name of the current input file (most recently opened, but unclosed SYSTEM entity) */ -M_WCHAR *m_thisfile(M_NOPAR) +M_WCHAR *m_thisfile(void) { int i; @@ -413,7 +413,7 @@ M_WCHAR *m_thisfile(M_NOPAR) } /* Return the line number in the current input file */ -int m_thisline(M_NOPAR) +int m_thisline(void) { return(m_line[m_sysecnt]); } diff --git a/cde/programs/dthelp/parser/pass1/parser/esuffix.c b/cde/programs/dthelp/parser/pass1/parser/esuffix.c index f998759a..6bcf0a6f 100644 --- a/cde/programs/dthelp/parser/pass1/parser/esuffix.c +++ b/cde/programs/dthelp/parser/pass1/parser/esuffix.c @@ -32,7 +32,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #endif /* Write error message suffix */ -void m_esuffix(M_NOPAR) +void m_esuffix(void) { m_errline("\n") ; m_dumpline(m_thisfile(), m_thisline()) ; diff --git a/cde/programs/dthelp/parser/pass1/parser/getsign.c b/cde/programs/dthelp/parser/pass1/parser/getsign.c index d99a5908..1e53a867 100644 --- a/cde/programs/dthelp/parser/pass1/parser/getsign.c +++ b/cde/programs/dthelp/parser/pass1/parser/getsign.c @@ -34,7 +34,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "parser.h" #include "signonx.h" -void m_getsignon(M_NOPAR) +void m_getsignon(void) { m_errline(m_signon) ; } diff --git a/cde/programs/dthelp/parser/pass1/parser/input.c b/cde/programs/dthelp/parser/pass1/parser/input.c index 248a7d42..8c23b2f7 100644 --- a/cde/programs/dthelp/parser/pass1/parser/input.c +++ b/cde/programs/dthelp/parser/pass1/parser/input.c @@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "parser.h" /* M_etcomplete is called when a complete end-tag has been read */ -void m_etcomplete(M_NOPAR) +void m_etcomplete(void) { if (! m_scanel) { M_WCHAR *wc_etago, *wc_tagc; @@ -91,7 +91,7 @@ void m_frcend(val) /* M_frcstart is called to force the start of an element when that element cannot legally occur in the current context but does appear in the text*/ -void m_frcstart(M_NOPAR) +void m_frcstart(void) { m_push(m_scanel, m_element[m_scanel - 1].start, m_scannet) ; if (m_scannet) m_netlevel++ ; @@ -108,7 +108,7 @@ void m_frcstart(M_NOPAR) /* M_holdproc processes a RE that was saved to test if it was the last RE in an element's content */ -void m_holdproc(M_NOPAR) +void m_holdproc(void) { if (m_stacktop->holdre) { m_stacktop->holdre = FALSE ; @@ -122,7 +122,7 @@ void m_holdproc(M_NOPAR) } /* M_stcomplete is called when a complete start tag has been recognized */ -void m_stcomplete(M_NOPAR) +void m_stcomplete(void) { if (! m_scanel) return ; if (m_strtproc(m_scanel)) diff --git a/cde/programs/dthelp/parser/pass1/parser/minim.c b/cde/programs/dthelp/parser/pass1/parser/minim.c index 10415a34..2a7c5c68 100644 --- a/cde/programs/dthelp/parser/pass1/parser/minim.c +++ b/cde/programs/dthelp/parser/pass1/parser/minim.c @@ -43,7 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* M_expecting reports to the user the possible valid content at a particular state in the parse of the document */ -void m_expecting(M_NOPAR) +void m_expecting(void) { LOGICAL expstart = TRUE ; M_PARSE *stackptr ; @@ -276,7 +276,7 @@ M_ELEMENT m_findunique(from, newleft) /* M_nullendtag is called when a null end tag is encountered; i.e., at the end of a short element */ -void m_nullendtag(M_NOPAR) +void m_nullendtag(void) { LOGICAL foundnet ; @@ -307,7 +307,7 @@ void m_nullendtag(M_NOPAR) /* Tests to see if an end tag may have been omitted at this point in the parse.*/ -LOGICAL m_omitend(M_NOPAR) +LOGICAL m_omitend(void) { M_ANDGROUP pand ; M_OPENFSA *fsastack ; diff --git a/cde/programs/dthelp/parser/pass1/parser/openfrst.c b/cde/programs/dthelp/parser/pass1/parser/openfrst.c index 96f71659..9a58dea2 100644 --- a/cde/programs/dthelp/parser/pass1/parser/openfrst.c +++ b/cde/programs/dthelp/parser/pass1/parser/openfrst.c @@ -28,7 +28,7 @@ #include "userinc.h" #include "globdec.h" -void *m_openfirst(M_NOPAR) +void *m_openfirst(void) { return((void *) stdin) ; } diff --git a/cde/programs/dthelp/parser/pass1/parser/param.c b/cde/programs/dthelp/parser/pass1/parser/param.c index 6d33cbe5..579c6e4b 100644 --- a/cde/programs/dthelp/parser/pass1/parser/param.c +++ b/cde/programs/dthelp/parser/pass1/parser/param.c @@ -117,7 +117,7 @@ LOGICAL m_attvonly(string) /* Check a name previously saved in m_saveatt to see if it is the name of a valid parameter for the current start tag */ -void m_findatt(M_NOPAR) +void m_findatt(void) { int par, i ; @@ -220,7 +220,7 @@ void m_parupper(par, string) /* Set all parameters to their default values for an element included by tag minimization */ -void m_stkdefaultparams(M_NOPAR) +void m_stkdefaultparams(void) { int i, par = 0 ; @@ -272,7 +272,7 @@ void m_stkonedef(par, scanel, poccur, i) } /* Stack parameter values */ -void m_stkparams(M_NOPAR) +void m_stkparams(void) { int i, par ; diff --git a/cde/programs/dthelp/parser/pass1/parser/parutil.c b/cde/programs/dthelp/parser/pass1/parser/parutil.c index 4fd0080c..48e65b68 100644 --- a/cde/programs/dthelp/parser/pass1/parser/parutil.c +++ b/cde/programs/dthelp/parser/pass1/parser/parutil.c @@ -48,7 +48,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "version.h" /* Adjust parsing state after each token if necessary */ -void m_adjuststate(M_NOPAR) +void m_adjuststate(void) { if (m_curcon == START) { if (m_netlevel) { @@ -79,7 +79,7 @@ void m_adjuststate(M_NOPAR) /* Tests whether the element named in a tag is defined; if so, returns its index; otherwise return FALSE */ -M_ELEMENT m_eltname(M_NOPAR) +M_ELEMENT m_eltname(void) { M_ELEMENT eltid ; @@ -103,7 +103,7 @@ return i; } /* Program initialization */ -void m_initialize(M_NOPAR) +void m_initialize(void) { char **mb_delims; M_WCHAR **wc_delims; diff --git a/cde/programs/dthelp/parser/pass1/parser/proto.h b/cde/programs/dthelp/parser/pass1/parser/proto.h index c4abd307..8ad1f618 100644 --- a/cde/programs/dthelp/parser/pass1/parser/proto.h +++ b/cde/programs/dthelp/parser/pass1/parser/proto.h @@ -21,9 +21,9 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 10:24:42 rswiston $ */ -int m_actgetc(M_NOPAR); +int m_actgetc(void); -void m_adjuststate(M_NOPAR); +void m_adjuststate(void); LOGICAL m_allwhite(const M_WCHAR *string); @@ -41,20 +41,20 @@ void m_closent(void *m_ptr); void m_codeent(int m_ent); -M_PARSE *m_copystackelt(M_NOPAR); +M_PARSE *m_copystackelt(void); 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_done(void); void m_dumpline(M_WCHAR *file, int line); void m_eduptype(int type); -M_ELEMENT m_eltname(M_NOPAR); +M_ELEMENT m_eltname(void); void m_endaction(M_ELEMENT m_elt); @@ -64,7 +64,7 @@ void m_endtag(M_ELEMENT c); void m_entexpand(M_ENTITY *openent); -void m_eprefix(M_NOPAR); +void m_eprefix(void); void m_err1(const char *text, const M_WCHAR *arg); @@ -87,15 +87,15 @@ void m_errline(char *p); void m_error(char *text); -void m_esuffix(M_NOPAR); +void m_esuffix(void); void m_exit(int status); -void m_etcomplete(M_NOPAR); +void m_etcomplete(void); LOGICAL m_excluded(M_ELEMENT elt); -void m_expecting(M_NOPAR); +void m_expecting(void); void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data); @@ -105,7 +105,7 @@ void m_exptend(LOGICAL *expstart, M_PARSE *stackptr); int m_findact(M_ELEMENT elt, int *array); -void m_findatt(M_NOPAR); +void m_findatt(void); void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild); @@ -116,7 +116,7 @@ M_ELEMENT m_findunique(M_STATE from, int *newleft); void m_frcend(M_ELEMENT val); -void m_frcstart(M_NOPAR); +void m_frcstart(void); void m_free(void *block, char *msg); @@ -141,23 +141,23 @@ void m_getline(M_WCHAR **file, int *line); void m_getname(M_WCHAR first); -void m_getsignon(M_NOPAR); +void m_getsignon(void); int m_gettoken(int *c, M_HOLDTYPE *dchar, int context); -void m_globes(M_NOPAR); +void m_globes(void); -void m_globss(M_NOPAR); +void m_globss(void); -void m_holdproc(M_NOPAR); +void m_holdproc(void); void m_inctest(int *count, int limit, char *message); -void m_initctype(M_NOPAR); +void m_initctype(void); -void m_initialize(M_NOPAR); +void m_initialize(void); -void m_lastchars(M_NOPAR); +void m_lastchars(void); int m_level(M_WCHAR *elt); @@ -183,17 +183,17 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LO void m_ntrent(M_WCHAR *p); -void m_nullendtag(M_NOPAR); +void m_nullendtag(void); -LOGICAL m_omitend(M_NOPAR); +LOGICAL m_omitend(void); -LOGICAL m_omitstart(M_NOPAR); +LOGICAL m_omitstart(void); void m_openchk(FILE **ptr, char *name, char *mode); void *m_openent(M_WCHAR *entcontent); -void *m_openfirst(M_NOPAR); +void *m_openfirst(void); void m_optstring(char *p); @@ -217,45 +217,45 @@ 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_pop(void); 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_readcomments(void); void *m_realloc(void *ptr, int size, char *msg); -int m_scan(M_NOPAR); +int m_scan(void); void m_setmap(int map, LOGICAL useoradd); -void m_setoptions(M_NOPAR); +void m_setoptions(void); void m_setparam(M_WCHAR **cvar, int par); void m_shortref(int context); -void m_showcurelt(M_NOPAR); +void m_showcurelt(void); void m_signmsg(char *p); -void m_sigre(M_NOPAR); +void m_sigre(void); -void m_startdoc(M_NOPAR); +void m_startdoc(void); -void m_startmsg(M_NOPAR); +void m_startmsg(void); void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END); -void m_stcomplete(M_NOPAR); +void m_stcomplete(void); -void m_stkdefaultparams(M_NOPAR); +void m_stkdefaultparams(void); void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i); -void m_stkparams(M_NOPAR); +void m_stkparams(void); void m_strtaction(M_ELEMENT m_elt); @@ -271,11 +271,11 @@ void m_textaction(M_WCHAR m_textchar); void m_textout(char *format, LOGICAL start, LOGICAL end); -LOGICAL m_textpermitted(M_NOPAR); +LOGICAL m_textpermitted(void); -M_WCHAR *m_thisfile(M_NOPAR); +M_WCHAR *m_thisfile(void); -int m_thisline(M_NOPAR); +int m_thisline(void); void m_trace(char *p); @@ -297,7 +297,7 @@ int m_mbmbupstrcmp(const char *p, const char *q); LOGICAL m_validinpar(M_WCHAR *string); -LOGICAL m_vldentref(M_NOPAR); +LOGICAL m_vldentref(void); 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 3ee0a6d0..e289b380 100644 --- a/cde/programs/dthelp/parser/pass1/parser/scan.c +++ b/cde/programs/dthelp/parser/pass1/parser/scan.c @@ -51,7 +51,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "sref.h" /* Actually read a character from an input stream */ -int m_actgetc(M_NOPAR) +int m_actgetc(void) { int c ; @@ -690,7 +690,7 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, } /* Scans past a comment within a markup declaration */ -void m_readcomments(M_NOPAR) +void m_readcomments(void) { int c ; M_HOLDTYPE dchar ; @@ -703,7 +703,7 @@ void m_readcomments(M_NOPAR) } /* Scanner */ -int m_scan(M_NOPAR) +int m_scan(void) { int c ; M_HOLDTYPE dchar ; @@ -1037,7 +1037,7 @@ while (TRUE) or contextual end tag [linestat == M_SOMETHING] 3) If a record end might be the last one in an element, save it */ -void m_sigre(M_NOPAR) +void m_sigre(void) { /* Check for first RE in content and no preceding content */ if (m_start && @@ -1113,7 +1113,7 @@ void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread) } /* Have encountered an M_ERO. If the entity reference is valid, process it*/ -LOGICAL m_vldentref(M_NOPAR) +LOGICAL m_vldentref(void) { M_HOLDTYPE dchar ; int next ; diff --git a/cde/programs/dthelp/parser/pass1/parser/setopt.c b/cde/programs/dthelp/parser/pass1/parser/setopt.c index 6bac3fc3..45e88642 100644 --- a/cde/programs/dthelp/parser/pass1/parser/setopt.c +++ b/cde/programs/dthelp/parser/pass1/parser/setopt.c @@ -30,7 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. /* Set program options */ -void m_setoptions(M_NOPAR) +void m_setoptions(void) { if (m_argc > 1) m_optstring(m_argv[1]) ; } diff --git a/cde/programs/dthelp/parser/pass1/parser/startdoc.c b/cde/programs/dthelp/parser/pass1/parser/startdoc.c index 7e1af1dc..cbd952c6 100644 --- a/cde/programs/dthelp/parser/pass1/parser/startdoc.c +++ b/cde/programs/dthelp/parser/pass1/parser/startdoc.c @@ -32,7 +32,7 @@ Copyright 1989 Hewlett-Packard Co. control after all entity declarations have been processed. Not needed in valid documents (when it is called just prior to global start-code), but may be useful in some applications nevertheless. */ -void m_startdoc(M_NOPAR) +void m_startdoc(void) { } diff --git a/cde/programs/dthelp/parser/pass1/parser/struct.c b/cde/programs/dthelp/parser/pass1/parser/struct.c index ebec9690..bff0065f 100644 --- a/cde/programs/dthelp/parser/pass1/parser/struct.c +++ b/cde/programs/dthelp/parser/pass1/parser/struct.c @@ -191,7 +191,7 @@ LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet) /* Make a copy of the stack entry at the top of the parse stack in a scratch area */ -M_PARSE *m_copystackelt(M_NOPAR) +M_PARSE *m_copystackelt(void) { M_OPENFSA *oldfsa ; M_OPENFSA **newfsa ; @@ -219,7 +219,7 @@ M_PARSE *m_copystackelt(M_NOPAR) } /* End of document */ -void m_done(M_NOPAR) +void m_done(void) { M_ELEMENT lastelt ; @@ -398,7 +398,7 @@ LOGICAL m_nextand(thisfsa, label) } /* Pops the parse stack*/ -void m_pop(M_NOPAR) +void m_pop(void) { M_PARSE *stackelt ; @@ -664,7 +664,7 @@ void m_strttag(M_ELEMENT val, LOGICAL net) makes more sense, is used by MARKUP, and is under consideration by the Standards committee; the latter is the current definition in the Standard */ -LOGICAL m_textpermitted(M_NOPAR) +LOGICAL m_textpermitted(void) { M_ANDGROUP pand ; M_OPENFSA *fsastack ; diff --git a/cde/programs/dthelp/parser/pass1/util/basic.h b/cde/programs/dthelp/parser/pass1/util/basic.h index 9af49823..04cb1f10 100644 --- a/cde/programs/dthelp/parser/pass1/util/basic.h +++ b/cde/programs/dthelp/parser/pass1/util/basic.h @@ -47,8 +47,6 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#define M_NOPAR void - char *MakeMByteString(const M_WCHAR *from); M_WCHAR *MakeWideCharString(const char *from); diff --git a/cde/programs/dthelp/parser/pass1/util/cont.h b/cde/programs/dthelp/parser/pass1/util/cont.h index 691aa26b..0c5e0137 100644 --- a/cde/programs/dthelp/parser/pass1/util/cont.h +++ b/cde/programs/dthelp/parser/pass1/util/cont.h @@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated. void countdown(M_TRIE *parent, int *count); -void dumpdlmptr(M_NOPAR); +void dumpdlmptr(void); void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)); @@ -53,17 +53,17 @@ void m_err1(char *text, char *arg); void getcode(int n); -void getcolon(M_NOPAR); +void getcolon(void); -int getContext(M_NOPAR); +int getContext(void); -LOGICAL getdname(M_NOPAR); +LOGICAL getdname(void); -void inccon(M_NOPAR); +void inccon(void); -void incdelim(M_NOPAR); +void incdelim(void); -void loaddelim(M_NOPAR); +void loaddelim(void); int m_lower(int c); @@ -81,7 +81,7 @@ void prtctxt(int column, int value); int readchar(LOGICAL cap); -void skiptoend(M_NOPAR); +void skiptoend(void); void unread(int c); diff --git a/cde/programs/dthelp/parser/pass1/util/conutil.c b/cde/programs/dthelp/parser/pass1/util/conutil.c index 8872d905..b9694a2a 100644 --- a/cde/programs/dthelp/parser/pass1/util/conutil.c +++ b/cde/programs/dthelp/parser/pass1/util/conutil.c @@ -40,7 +40,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "cont.h" /* Output declaration of dlmptr */ -void dumpdlmptr(M_NOPAR) +void dumpdlmptr(void) { int n; @@ -216,7 +216,7 @@ while (TRUE) } /* End proc getcode() */ /* Read the colon separating the two states in a transition pair */ -void getcolon(M_NOPAR) +void getcolon(void) { int c ; /* c is int instead of char for use with ungetc */ M_WCHAR wcl; @@ -240,7 +240,7 @@ if (c != wcl) } /* Read a context name from an input line */ -int getContext(M_NOPAR) +int getContext(void) { M_WCHAR name[CNAMELEN + 1]; int c ; /* c is int instead of char for use with ungetc */ @@ -309,7 +309,7 @@ return(ccount - 1); } /* Read a delimiter name from the input line */ -LOGICAL getdname(M_NOPAR) +LOGICAL getdname(void) { int c; M_WCHAR *p; @@ -353,7 +353,7 @@ return(TRUE); } /* Out of context space. Increase. */ -void inccon(M_NOPAR) +void inccon(void) { M_TRIE **newtrie = NULL; int *newtransit = NULL; @@ -400,7 +400,7 @@ void inccon(M_NOPAR) } /* Increase delimiter space. */ -void incdelim(M_NOPAR) +void incdelim(void) { int *newtransit = NULL; char **newdlm = NULL; @@ -444,7 +444,7 @@ dcount++; } /* Read delimiter definitions from delim.dat */ -void loaddelim(M_NOPAR) +void loaddelim(void) { int c; M_WCHAR *p; @@ -650,7 +650,7 @@ return(c); /* Called by utility procedure m_error() -- has content in other programs that use m_error() */ -void skiptoend(M_NOPAR) +void skiptoend(void) { } diff --git a/cde/programs/dthelp/parser/pass1/util/error.c b/cde/programs/dthelp/parser/pass1/util/error.c index d9274c4c..aa1f2a0c 100644 --- a/cde/programs/dthelp/parser/pass1/util/error.c +++ b/cde/programs/dthelp/parser/pass1/util/error.c @@ -56,7 +56,7 @@ void msgline(char *text); void msg1line(char *text, char *arg1); -void skiptoend(M_NOPAR); +void skiptoend(void); void m_wctrace(M_WCHAR *text); @@ -185,7 +185,7 @@ m_free(mb_arg5,"multi-byte string"); } /* Write error message suffix */ -void esuffix(M_NOPAR) +void esuffix(void) { fprintf(stderr, " (line %d) ****\n", m_line) ; fprintf(m_errfile, " (line %d) ****\n", m_line) ; diff --git a/cde/programs/dthelp/parser/pass1/util/initct.c b/cde/programs/dthelp/parser/pass1/util/initct.c index e655b3d9..237bdea8 100644 --- a/cde/programs/dthelp/parser/pass1/util/initct.c +++ b/cde/programs/dthelp/parser/pass1/util/initct.c @@ -29,7 +29,7 @@ #include "common.h" extern char m_chartype[M_CHARSETLEN] ; -void m_initctype(M_NOPAR) +void m_initctype(void) { int i ; diff --git a/cde/programs/dthelp/parser/pass1/util/malloc.c b/cde/programs/dthelp/parser/pass1/util/malloc.c index 69e54ce7..111e9a86 100644 --- a/cde/programs/dthelp/parser/pass1/util/malloc.c +++ b/cde/programs/dthelp/parser/pass1/util/malloc.c @@ -42,7 +42,7 @@ void m_exit(int status); void m_free(void *block, char *msg); -void m_heapdump(M_NOPAR); +void m_heapdump(void); void *m_malloc(int size, char *msg); @@ -81,7 +81,7 @@ void m_free(block, msg) } #if defined(MSDOS) -void m_heapdump(M_NOPAR) +void m_heapdump(void) { struct _heapinfo hinfo ; int heapstatus ; diff --git a/cde/programs/dthelp/parser/pass1/util/scanutil.c b/cde/programs/dthelp/parser/pass1/util/scanutil.c index e28c5f5f..e3100503 100644 --- a/cde/programs/dthelp/parser/pass1/util/scanutil.c +++ b/cde/programs/dthelp/parser/pass1/util/scanutil.c @@ -28,7 +28,7 @@ extern FILE *ifile; /* Getachar returns the next character from the input stream */ -int getachar(M_NOPAR) +int getachar(void) { int c; M_WCHAR wc,wnl; diff --git a/cde/programs/dthelp/parser/pass1/util/trie.c b/cde/programs/dthelp/parser/pass1/util/trie.c index 629ead8a..500647ed 100644 --- a/cde/programs/dthelp/parser/pass1/util/trie.c +++ b/cde/programs/dthelp/parser/pass1/util/trie.c @@ -85,7 +85,7 @@ void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c) } /* end entertree */ /* Gets a new node for a trie */ -M_TRIE *m_gettrienode(M_NOPAR) +M_TRIE *m_gettrienode(void) { M_TRIE *new ; diff --git a/cde/programs/dthelp/parser/pass1/util/trie.h b/cde/programs/dthelp/parser/pass1/util/trie.h index a9c595f0..f1fd061e 100644 --- a/cde/programs/dthelp/parser/pass1/util/trie.h +++ b/cde/programs/dthelp/parser/pass1/util/trie.h @@ -51,7 +51,7 @@ struct m_ptrie { } ; -M_TRIE *m_gettrienode(M_NOPAR); +M_TRIE *m_gettrienode(void); void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie); diff --git a/cde/programs/dthelp/parser/pass2/build/buildutl.c b/cde/programs/dthelp/parser/pass2/build/buildutl.c index e142f5fb..46692d6d 100644 --- a/cde/programs/dthelp/parser/pass2/build/buildutl.c +++ b/cde/programs/dthelp/parser/pass2/build/buildutl.c @@ -62,7 +62,7 @@ if (*flag) } /* Program initialization */ -void initialize(M_NOPAR) +void initialize(void) { char **mb_delims; M_WCHAR **wc_delims; @@ -90,7 +90,7 @@ ruleinit() ; /* Initialization before starting a new rule */ -void ruleinit(M_NOPAR) +void ruleinit(void) { /* Reinitialize for next rule */ lhs = NULL ; @@ -110,7 +110,7 @@ void ruleinit(M_NOPAR) } /* Rule end processing */ -void rulend(M_NOPAR) +void rulend(void) { STATE *fsa = NULL ; LOGICAL canbenull ; @@ -150,7 +150,7 @@ void rulend(M_NOPAR) } /* Skip rest of statement after an error */ -void skiptoend(M_NOPAR) +void skiptoend(void) { int i ; static int errlev = 0 ; diff --git a/cde/programs/dthelp/parser/pass2/build/except.c b/cde/programs/dthelp/parser/pass2/build/except.c index d6a4fc08..a00913c5 100644 --- a/cde/programs/dthelp/parser/pass2/build/except.c +++ b/cde/programs/dthelp/parser/pass2/build/except.c @@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "build.h" /* Add an exception (inclusion or exclusion) for the current element */ -void addex(M_NOPAR) +void addex(void) { excount++ ; *nextex = (EXCEPTION *) m_malloc(sizeof(EXCEPTION), "exception") ; diff --git a/cde/programs/dthelp/parser/pass2/build/fsa.c b/cde/programs/dthelp/parser/pass2/build/fsa.c index ad8067f8..b15c4b21 100644 --- a/cde/programs/dthelp/parser/pass2/build/fsa.c +++ b/cde/programs/dthelp/parser/pass2/build/fsa.c @@ -176,7 +176,7 @@ void dellist(list) /* Delstartarcs deletes the contents of the starta list of arcs from start states of a submodel */ -void delstartarcs(M_NOPAR) +void delstartarcs(void) { ARC *arcptr ; ARC *discard ; @@ -190,7 +190,7 @@ void delstartarcs(M_NOPAR) } /* Getand allocates and initializes a new andgroup structure */ -ANDGROUP *getand(M_NOPAR) +ANDGROUP *getand(void) { ANDGROUP *new ; @@ -203,7 +203,7 @@ ANDGROUP *getand(M_NOPAR) } /* Getstate obtains an FSA state */ -STATE *getstate(M_NOPAR) +STATE *getstate(void) { STATE *new ; @@ -477,7 +477,7 @@ LOGICAL permitspcd(a) /* Pop pops the submodel stack when the end of the current submodel is encountered */ -void pop(M_NOPAR) +void pop(void) { STACK *discard ; @@ -493,7 +493,7 @@ void pop(M_NOPAR) } /* Push pushes the submodel stack when a new group is encountered */ -void push(M_NOPAR) +void push(void) { STACK *new ; @@ -647,7 +647,7 @@ void savelhs(LOGICAL param) /* Called when arcs are added to the start state of a submodel that is also a start state of the parent model to set the parent model's starta list */ -void savestartarcs(M_NOPAR) +void savestartarcs(void) { ARC *carcptr, *parcptr ; diff --git a/cde/programs/dthelp/parser/pass2/build/out.c b/cde/programs/dthelp/parser/pass2/build/out.c index c15696b3..db2291a1 100644 --- a/cde/programs/dthelp/parser/pass2/build/out.c +++ b/cde/programs/dthelp/parser/pass2/build/out.c @@ -87,7 +87,7 @@ char *deftype(n) } /* Called after all input is read to generate output */ -void done(M_NOPAR) +void done(void) { if (! eltree.data) { @@ -167,7 +167,7 @@ void eltblocks(tempfile) /* Writes data about elements */ -void eltreeout(M_NOPAR) +void eltreeout(void) { M_WCHAR *p ; int enameindex = 0 ; @@ -245,7 +245,7 @@ char *enttype(n) } /* Outputs exception lists */ -void exout(M_NOPAR) +void exout(void) { EXCEPTION *ex ; int exindex = 0 ; @@ -268,7 +268,7 @@ void exout(M_NOPAR) } /* Outputs FSA definitions */ -void fsa(M_NOPAR) +void fsa(void) { int arcount = 0 ; STATE *pstate ; @@ -331,7 +331,7 @@ void fsa(M_NOPAR) } /* Writes data about parameters */ -void parout(M_NOPAR) +void parout(void) { PARAMETER *paramp ; LOGICAL first = TRUE ; @@ -480,7 +480,7 @@ char *partype(n) } /* Write short reference information */ -void srefout(M_NOPAR) +void srefout(void) { LOGICAL first = TRUE ; int *mapbysref = NULL; @@ -633,7 +633,7 @@ fputs(" <\\END-STRING>\n", tempfile) ; } /* Write template */ -void template(M_NOPAR) +void template(void) { FILE *tempfile ; M_ENTITY *ent ; diff --git a/cde/programs/dthelp/parser/pass2/build/param.c b/cde/programs/dthelp/parser/pass2/build/param.c index d46f7bb6..63feb9b7 100644 --- a/cde/programs/dthelp/parser/pass2/build/param.c +++ b/cde/programs/dthelp/parser/pass2/build/param.c @@ -38,7 +38,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Add a keyword to the list of possible values of a keyword parameter for the current element */ -void addkeyword(M_NOPAR) +void addkeyword(void) { int length ; PARAMETER *par ; @@ -87,7 +87,7 @@ ptypelen++ ; } /* Add a parameter to the current element */ -void addpar(M_NOPAR) +void addpar(void) { PARAMETER *paramp, *last = NULL ; int length ; @@ -263,7 +263,7 @@ switch (newpar->type) } /* Called at end of parameter attribute list rule */ -void prulend(M_NOPAR) +void prulend(void) { LHS *lhsp ; LHS *discard ; diff --git a/cde/programs/dthelp/parser/pass2/build/proto.h b/cde/programs/dthelp/parser/pass2/build/proto.h index 115f1e9a..152e6982 100644 --- a/cde/programs/dthelp/parser/pass2/build/proto.h +++ b/cde/programs/dthelp/parser/pass2/build/proto.h @@ -35,15 +35,15 @@ void adddefent(M_WCHAR *mapname); LOGICAL addent(M_WCHAR *name); -void addex(M_NOPAR); +void addex(void); -void addkeyword(M_NOPAR); +void addkeyword(void); LOGICAL addmapname(M_WCHAR *p, LOGICAL define); void addndent(M_WCHAR *p); -void addpar(M_NOPAR); +void addpar(void); void addsref(M_WCHAR *p); @@ -62,15 +62,15 @@ void copyintolist(STATELIST *from, STATELIST **to); void countdown(M_TRIE *parent, int *count); -void defmapname(M_NOPAR); +void defmapname(void); char *deftype(int n); void dellist(STATELIST **list); -void delstartarcs(M_NOPAR); +void delstartarcs(void); -void done(M_NOPAR); +void done(void); void dumpentnode(FILE *file, M_TRIE *value); @@ -90,9 +90,9 @@ void m_dumptrie(FILE *file, void eltblocks(FILE *tempfile); -void eltreeout(M_NOPAR); +void eltreeout(void); -void endmodel(M_NOPAR); +void endmodel(void); void entout(char *fname); @@ -106,7 +106,7 @@ 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 exout(void); void m_free(void *block, char *msg); @@ -114,23 +114,23 @@ void freetree(TREE *ruletree); void found(LOGICAL *flag, char *delim); -void fsa(M_NOPAR); +void fsa(void); -int getachar(M_NOPAR); +int getachar(void); -ANDGROUP *getand(M_NOPAR); +ANDGROUP *getand(void); LOGICAL getname(int first); -STATE *getstate(M_NOPAR); +STATE *getstate(void); int gettoken(int *c, int context); -TREE *gettreenode(M_NOPAR); +TREE *gettreenode(void); -void m_initctype(M_NOPAR); +void m_initctype(void); -void initialize(M_NOPAR); +void initialize(void); LOGICAL litproc(int delim); @@ -160,49 +160,49 @@ ELTSTRUCT *ntrelt(M_WCHAR *p); void m_openchk(FILE **ptr, char *name, char *mode); -void parout(M_NOPAR); +void parout(void); char *partype(int n); LOGICAL permitspcd(ARC *a); -void pop(M_NOPAR); +void pop(void); -void prulend(M_NOPAR); +void prulend(void); -void push(M_NOPAR); +void push(void); LOGICAL regenerate(TREE *start, TREE *stop); void repeat(TREE *root); -void ruleinit(M_NOPAR); +void ruleinit(void); -void rulend(M_NOPAR); +void rulend(void); LOGICAL samelabelarc(ARC *a, STATE *s); void savelhs(LOGICAL param); -void savestartarcs(M_NOPAR); +void savestartarcs(void); -int scan(M_NOPAR); +int scan(void); void setdefault(const M_WCHAR *string); void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional); -void skiptoend(M_NOPAR); +void skiptoend(void); int m_sprscon(int i, int j); -void srefout(M_NOPAR); +void srefout(void); STATE *startfsa(TREE *root, LOGICAL *canbenull); void tempelt(ELTSTRUCT *eltp, FILE *tempfile); -void template(M_NOPAR); +void template(void); char *typecon(int n); diff --git a/cde/programs/dthelp/parser/pass2/build/scan.c b/cde/programs/dthelp/parser/pass2/build/scan.c index 184e8e56..6412c9bf 100644 --- a/cde/programs/dthelp/parser/pass2/build/scan.c +++ b/cde/programs/dthelp/parser/pass2/build/scan.c @@ -74,7 +74,7 @@ return(TRUE); } /* Returns the next token to the main procedure */ -int scan(M_NOPAR) +int scan(void) { int c; int n; diff --git a/cde/programs/dthelp/parser/pass2/build/sref.c b/cde/programs/dthelp/parser/pass2/build/sref.c index 990c13ca..795d846f 100644 --- a/cde/programs/dthelp/parser/pass2/build/sref.c +++ b/cde/programs/dthelp/parser/pass2/build/sref.c @@ -192,7 +192,7 @@ delim->data = thissref; /* Prefix left-hand side with "M-" to create default short reference map name, truncating to M_NAMELEN characters if necessary */ -void defmapname(M_NOPAR) +void defmapname(void) { if (!wc_prefix) { diff --git a/cde/programs/dthelp/parser/pass2/build/tree.c b/cde/programs/dthelp/parser/pass2/build/tree.c index 717329bd..bf1dd249 100644 --- a/cde/programs/dthelp/parser/pass2/build/tree.c +++ b/cde/programs/dthelp/parser/pass2/build/tree.c @@ -36,7 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* Called after a right parenthesis is read while scanning a content model. Resets curcon if it is the outermost submodel. */ -void endmodel(M_NOPAR) +void endmodel(void) { curtree = curtree->parent ; if (! curtree->parent) curcon = LASTM ; @@ -58,7 +58,7 @@ void freetree(treep) } /* Gettreenode obtains a node to use in the tree representation of a rule */ -TREE *gettreenode(M_NOPAR) +TREE *gettreenode(void) { TREE *new ; diff --git a/cde/programs/dthelp/parser/pass2/eltdef/context.dat b/cde/programs/dthelp/parser/pass2/eltdef/context.dat index c95c2b3f..d84e3148 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/context.dat +++ b/cde/programs/dthelp/parser/pass2/eltdef/context.dat @@ -398,7 +398,7 @@ tagc postent:start codetagc:inentc { startcode(entity->codeindex, &inent, entfile, - "c", nopar, nopar, "") ; + "c", "void", "void", "") ; } close:preparam sschain:inss { @@ -420,11 +420,11 @@ tagc } scchain:insc { *getaction(scarray) = ++sactions ; - startcode(sactions, &insc, sfile, "s", nopar, nopar, "") ; + startcode(sactions, &insc, sfile, "s", "void", "void", "") ; } ecchain:inec { *getaction(ecarray) = ++eactions ; - startcode(eactions, &inec, efile, "e", nopar, nopar, "") ; + startcode(eactions, &inec, efile, "e", "void", "void", "") ; } stcchain:instc { *getaction(stcarray) = ++stactions ; diff --git a/cde/programs/dthelp/parser/pass2/eltdef/eltdef.h b/cde/programs/dthelp/parser/pass2/eltdef/eltdef.h index f8f32a38..ec73250e 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/eltdef.h +++ b/cde/programs/dthelp/parser/pass2/eltdef/eltdef.h @@ -215,7 +215,6 @@ ELTEXTERN int restart ELTINIT(RENTITY) ; #define stproto "M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END" #define stformal "m_string, M_START, M_END" #define stft " M_WCHAR *m_string ;\n LOGICAL M_START ;\n LOGICAL M_END ;\n" -#define nopar "M_NOPAR" /* Structures for generating defines for parameter values */ ELTEXTERN M_TRIE parval ; diff --git a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c index 8624f460..acfd50d7 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c +++ b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c @@ -92,7 +92,7 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto) /* Called when the C identifier to be #define'd to a parameter value is scanned */ -void cvalue(M_NOPAR) +void cvalue(void) { PARVAL *new; @@ -111,18 +111,18 @@ void cvalue(M_NOPAR) /* Called after last input character is read to place closing punctuation at end of output files and close them */ -void done(M_NOPAR) +void done(void) { M_ENTITY *ent; ACTION *actp; LOGICAL first; int i; - closeiffile(inent, entfile, codeent, "c", nopar); + closeiffile(inent, entfile, codeent, "c", "void"); closeiffile(intext, tfile, tactions, "t", tproto); closeiffile(inpc, pfile, pactions, "p", pproto); - closeiffile(insc, sfile, sactions, "s", nopar); - closeiffile(inec, efile, eactions, "e", nopar); + closeiffile(insc, sfile, sactions, "s", "void"); + closeiffile(inec, efile, eactions, "e", "void"); closeiffile(instc, stfile, stactions, "st", stproto); endstring(); @@ -190,7 +190,7 @@ void endcode(LOGICAL flag, FILE *file) } /* Called at the end of all initial fields in the interface definition */ -void endini(M_NOPAR) +void endini(void) { if (finitext) fputs(" putc(m_textchar, m_outfile);\n", tfile); @@ -209,7 +209,7 @@ void endini(M_NOPAR) /* End the sign-on message */ #include -void endsignon(M_NOPAR) +void endsignon(void) { time_t storetime; char *p; @@ -255,7 +255,7 @@ void endsignon(M_NOPAR) } /* Closes a start-string or end-string */ -void endstring(M_NOPAR) +void endstring(void) { if (instring) { if (stringstart) stringstart = FALSE; @@ -282,7 +282,7 @@ void enttype(type) } /* Free storage used for a context-specification chain */ -void freechain(M_NOPAR) +void freechain(void) { CHAIN *chainp, *dchainp; @@ -333,7 +333,7 @@ int *getaction(array) } /* Allocate new action structure */ -ACTION *getactstruct(M_NOPAR) +ACTION *getactstruct(void) { ACTION *new; @@ -347,7 +347,7 @@ ACTION *getactstruct(M_NOPAR) } /* Program initialization */ -void initialize(M_NOPAR) +void initialize(void) { char **mb_delims; M_WCHAR **wc_delims; @@ -411,13 +411,13 @@ fputs("#endif\n", ifh); startcode(pactions, &inpc, pfile, "p", pproto, pformal, pftype); startcode(tactions, &intext, tfile, "t", tproto, tformal, tftype); -startcode(sactions, &insc, sfile, "s", nopar, nopar, ""); -startcode(eactions, &inec, efile, "e", nopar, nopar, ""); +startcode(sactions, &insc, sfile, "s", "void", "void", ""); +startcode(eactions, &inec, efile, "e", "void", "void", ""); startcode(stactions, &instc, stfile, "st", stproto, stformal, stft); } /* Output definitions for strings */ -void outstring(M_NOPAR) +void outstring(void) { int c; @@ -480,7 +480,7 @@ for ( ; p ; p = p->next) } /* Skip rest of statement after an error */ -void skiptoend(M_NOPAR) +void skiptoend(void) { int i; static int errlev = 0; @@ -580,7 +580,7 @@ fprintf(file, "{\n/* line %d \"%s\" */\n", m_line, iffile); /* balance "}" */ } /* Begins processing a new element */ -void startelement(M_NOPAR) +void startelement(void) { CVARSTRUCT *cvarp; CVARSTRUCT *discard; @@ -601,7 +601,7 @@ void startelement(M_NOPAR) } /* Stores the name of a C variable read from the input file */ -void storecvar(M_NOPAR) +void storecvar(void) { CVARSTRUCT *new; @@ -616,7 +616,7 @@ void storecvar(M_NOPAR) /* Compares the parameter name associated with a C variable in the input file with the names of all parameters of the current element. Stores result for later output with code segments */ -void storepname(M_NOPAR) +void storepname(void) { int i, par; diff --git a/cde/programs/dthelp/parser/pass2/eltdef/entity.c b/cde/programs/dthelp/parser/pass2/eltdef/entity.c index 7c2e61d0..ed8d334e 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/entity.c +++ b/cde/programs/dthelp/parser/pass2/eltdef/entity.c @@ -35,7 +35,7 @@ #include "entext.h" /* Add an entity */ -void addent(M_NOPAR) +void addent(void) { M_ENTITY *new ; diff --git a/cde/programs/dthelp/parser/pass2/eltdef/proto.h b/cde/programs/dthelp/parser/pass2/eltdef/proto.h index 4c1a059b..fb74b475 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/proto.h +++ b/cde/programs/dthelp/parser/pass2/eltdef/proto.h @@ -30,7 +30,7 @@ void actptrout(ACTION **array, char *name); -void addent(M_NOPAR); +void addent(void); LOGICAL m_allwhite(const M_WCHAR *string); @@ -38,10 +38,10 @@ void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto); void countdown(M_TRIE *parent, int *count); -void cvalue(M_NOPAR); +void cvalue(void); -void done(M_NOPAR); +void done(void); void m_dumptrie(FILE *file, M_TRIE *xtrie, @@ -51,11 +51,11 @@ void m_dumptrie(FILE *file, void endcode(LOGICAL flag, FILE *file); -void endini(M_NOPAR); +void endini(void); -void endsignon(M_NOPAR); +void endsignon(void); -void endstring(M_NOPAR); +void endstring(void); void entout(char *fname); @@ -78,21 +78,21 @@ void m_exit(int status); void m_free(void *block, char *msg); -void freechain(M_NOPAR); +void freechain(void); -int getachar(M_NOPAR); +int getachar(void); int *getaction(ACTION **array); -ACTION *getactstruct(M_NOPAR); +ACTION *getactstruct(void); void getname(int first); int gettoken(int *c, int context); -void m_initctype(M_NOPAR); +void m_initctype(void); -void initialize(M_NOPAR); +void initialize(void); LOGICAL m_letter(M_WCHAR c); @@ -106,24 +106,24 @@ void m_openchk(FILE **ptr, char *name, char *mode); void outpval(M_TRIE *p); -void outstring(M_NOPAR); +void outstring(void); int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name); const M_WCHAR *m_partype(const int par, const M_WCHAR *string); -int scan(M_NOPAR); +int scan(void); -void skiptoend(M_NOPAR); +void skiptoend(void); void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto, char *formal, char *formtype); -void startelement(M_NOPAR); +void startelement(void); -void storecvar(M_NOPAR); +void storecvar(void); -void storepname(M_NOPAR); +void storepname(void); void undodelim(M_WCHAR *delim); diff --git a/cde/programs/dthelp/parser/pass2/eltdef/scan.c b/cde/programs/dthelp/parser/pass2/eltdef/scan.c index 916bc1e4..3c4d9198 100644 --- a/cde/programs/dthelp/parser/pass2/eltdef/scan.c +++ b/cde/programs/dthelp/parser/pass2/eltdef/scan.c @@ -86,7 +86,7 @@ ungetachar(c); } /* Reads the next token and returns it to the main procedure */ -int scan(M_NOPAR) +int scan(void) { int c; int n; diff --git a/cde/programs/dthelp/parser/pass2/htag2/custom.c b/cde/programs/dthelp/parser/pass2/htag2/custom.c index 69ad9f39..7869d97a 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/custom.c +++ b/cde/programs/dthelp/parser/pass2/htag2/custom.c @@ -37,7 +37,7 @@ Copyright (c) 1988, 1989 Hewlett-Packard Co. /* Standard startup code doesn't have room to load inherited environments in some cases. Since they're not used, don't bother. (Using Microsoft C compiler). */ -void _setenvp(M_NOPAR); +void _setenvp(void); void _setenvp(){} #endif @@ -70,7 +70,7 @@ else } /* Write error message prefix */ -void m_eprefix(M_NOPAR) +void m_eprefix(void) { m_errline("\n*****\n"); m_dumpline(m_thisfile(), m_thisline()); @@ -94,7 +94,7 @@ for ( ; *p ; p++) #include #endif /* Write error message suffix */ -void m_esuffix(M_NOPAR) +void m_esuffix(void) { m_errline(":\n"); m_lastchars(); @@ -265,7 +265,7 @@ return(NULL); } /* Open input file */ -void *m_openfirst(M_NOPAR) +void *m_openfirst(void) { return((void *) inFile); } diff --git a/cde/programs/dthelp/parser/pass2/htag2/fproto.h b/cde/programs/dthelp/parser/pass2/htag2/fproto.h index a5ce22b4..8633db31 100644 --- a/cde/programs/dthelp/parser/pass2/htag2/fproto.h +++ b/cde/programs/dthelp/parser/pass2/htag2/fproto.h @@ -68,9 +68,9 @@ void DeleteElement(ElementPtr pElement); void OptimizeAndEmit(ElementPtr pVirpage); -void PushCurrentElement(M_NOPAR); +void PushCurrentElement(void); -void PopCurrentElement(M_NOPAR); +void PopCurrentElement(void); char *mb_realloc( char *ptr, long size); @@ -106,12 +106,12 @@ void FcloseFile(FILE *file, char *name, int code); int StringToUpper(char *string); -void BuildIndex(M_NOPAR); +void BuildIndex(void); -void OpenDocument(M_NOPAR); +void OpenDocument(void); -void CloseDocument(M_NOPAR); +void CloseDocument(void); -void UpdateTossFileName(M_NOPAR); +void UpdateTossFileName(void); void SetLocale(M_WCHAR *pLang, M_WCHAR *pCharset); diff --git a/cde/programs/dthelp/parser/pass2/parser/actutil.c b/cde/programs/dthelp/parser/pass2/parser/actutil.c index 16c6a1e8..84d44c16 100644 --- a/cde/programs/dthelp/parser/pass2/parser/actutil.c +++ b/cde/programs/dthelp/parser/pass2/parser/actutil.c @@ -137,7 +137,7 @@ void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int * /* Process global end string. In separate procedure to keep all references to if.h in one source file and minimize recompilation if interface changes. */ -void m_globes(M_NOPAR) +void m_globes(void) { M_WCHAR *wc_string; @@ -149,7 +149,7 @@ m_free(wc_string,"wide character string"); /* Process global start string. In separate procedure to keep all references to if.h in one source file and minimize recompilation if interface changes. */ -void m_globss(M_NOPAR) +void m_globss(void) { M_WCHAR *wc_string; diff --git a/cde/programs/dthelp/parser/pass2/parser/eprefix.c b/cde/programs/dthelp/parser/pass2/parser/eprefix.c index 10a173f9..7383b2c4 100644 --- a/cde/programs/dthelp/parser/pass2/parser/eprefix.c +++ b/cde/programs/dthelp/parser/pass2/parser/eprefix.c @@ -29,7 +29,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "globdec.h" /* Write error message prefix */ -void m_eprefix(M_NOPAR) +void m_eprefix(void) { m_errline("\n*****\n") ; } diff --git a/cde/programs/dthelp/parser/pass2/parser/error.c b/cde/programs/dthelp/parser/pass2/parser/error.c index 36ac2ff6..3331b829 100644 --- a/cde/programs/dthelp/parser/pass2/parser/error.c +++ b/cde/programs/dthelp/parser/pass2/parser/error.c @@ -336,7 +336,7 @@ void m_getline(file, line) /* Dump last characters read from input stream to give context to an error message */ -void m_lastchars(M_NOPAR) +void m_lastchars(void) { int i; M_WCHAR buffer[2]; @@ -385,14 +385,14 @@ if ((m_svlncnt[m_sysecnt] && } /* Display information about the current element */ -void m_showcurelt(M_NOPAR) +void m_showcurelt(void) { if (m_stacktop->oldtop) m_dispcurelt(m_stacktop->file, m_stacktop->line); } /* Start an error message */ -void m_startmsg(M_NOPAR) +void m_startmsg(void) { m_eprefix(); m_errexit = TRUE; @@ -400,7 +400,7 @@ void m_startmsg(M_NOPAR) /* Return the name of the current input file (most recently opened, but unclosed SYSTEM entity) */ -M_WCHAR *m_thisfile(M_NOPAR) +M_WCHAR *m_thisfile(void) { int i; @@ -413,7 +413,7 @@ M_WCHAR *m_thisfile(M_NOPAR) } /* Return the line number in the current input file */ -int m_thisline(M_NOPAR) +int m_thisline(void) { return(m_line[m_sysecnt]); } diff --git a/cde/programs/dthelp/parser/pass2/parser/esuffix.c b/cde/programs/dthelp/parser/pass2/parser/esuffix.c index 50fca824..98e245b8 100644 --- a/cde/programs/dthelp/parser/pass2/parser/esuffix.c +++ b/cde/programs/dthelp/parser/pass2/parser/esuffix.c @@ -32,7 +32,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #endif /* Write error message suffix */ -void m_esuffix(M_NOPAR) +void m_esuffix(void) { m_errline("\n") ; m_dumpline(m_thisfile(), m_thisline()) ; diff --git a/cde/programs/dthelp/parser/pass2/parser/getsign.c b/cde/programs/dthelp/parser/pass2/parser/getsign.c index 58771466..5575d77d 100644 --- a/cde/programs/dthelp/parser/pass2/parser/getsign.c +++ b/cde/programs/dthelp/parser/pass2/parser/getsign.c @@ -34,7 +34,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. #include "parser.h" #include "signonx.h" -void m_getsignon(M_NOPAR) +void m_getsignon(void) { m_errline(m_signon) ; } diff --git a/cde/programs/dthelp/parser/pass2/parser/input.c b/cde/programs/dthelp/parser/pass2/parser/input.c index 430272fb..1245c7ca 100644 --- a/cde/programs/dthelp/parser/pass2/parser/input.c +++ b/cde/programs/dthelp/parser/pass2/parser/input.c @@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "parser.h" /* M_etcomplete is called when a complete end-tag has been read */ -void m_etcomplete(M_NOPAR) +void m_etcomplete(void) { if (! m_scanel) { M_WCHAR *wc_etago, *wc_tagc; @@ -91,7 +91,7 @@ void m_frcend(val) /* M_frcstart is called to force the start of an element when that element cannot legally occur in the current context but does appear in the text*/ -void m_frcstart(M_NOPAR) +void m_frcstart(void) { m_push(m_scanel, m_element[m_scanel - 1].start, m_scannet) ; if (m_scannet) m_netlevel++ ; @@ -108,7 +108,7 @@ void m_frcstart(M_NOPAR) /* M_holdproc processes a RE that was saved to test if it was the last RE in an element's content */ -void m_holdproc(M_NOPAR) +void m_holdproc(void) { if (m_stacktop->holdre) { m_stacktop->holdre = FALSE ; @@ -122,7 +122,7 @@ void m_holdproc(M_NOPAR) } /* M_stcomplete is called when a complete start tag has been recognized */ -void m_stcomplete(M_NOPAR) +void m_stcomplete(void) { if (! m_scanel) return ; if (m_strtproc(m_scanel)) diff --git a/cde/programs/dthelp/parser/pass2/parser/minim.c b/cde/programs/dthelp/parser/pass2/parser/minim.c index 5bfa4842..9421a446 100644 --- a/cde/programs/dthelp/parser/pass2/parser/minim.c +++ b/cde/programs/dthelp/parser/pass2/parser/minim.c @@ -43,7 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated. /* M_expecting reports to the user the possible valid content at a particular state in the parse of the document */ -void m_expecting(M_NOPAR) +void m_expecting(void) { LOGICAL expstart = TRUE ; M_PARSE *stackptr ; @@ -276,7 +276,7 @@ M_ELEMENT m_findunique(from, newleft) /* M_nullendtag is called when a null end tag is encountered; i.e., at the end of a short element */ -void m_nullendtag(M_NOPAR) +void m_nullendtag(void) { LOGICAL foundnet ; @@ -307,7 +307,7 @@ void m_nullendtag(M_NOPAR) /* Tests to see if an end tag may have been omitted at this point in the parse.*/ -LOGICAL m_omitend(M_NOPAR) +LOGICAL m_omitend(void) { M_ANDGROUP pand ; M_OPENFSA *fsastack ; diff --git a/cde/programs/dthelp/parser/pass2/parser/openfrst.c b/cde/programs/dthelp/parser/pass2/parser/openfrst.c index 9a734657..3bd2331b 100644 --- a/cde/programs/dthelp/parser/pass2/parser/openfrst.c +++ b/cde/programs/dthelp/parser/pass2/parser/openfrst.c @@ -28,7 +28,7 @@ #include "userinc.h" #include "globdec.h" -void *m_openfirst(M_NOPAR) +void *m_openfirst(void) { return((void *) stdin) ; } diff --git a/cde/programs/dthelp/parser/pass2/parser/param.c b/cde/programs/dthelp/parser/pass2/parser/param.c index 9fa2d524..9f63e3f5 100644 --- a/cde/programs/dthelp/parser/pass2/parser/param.c +++ b/cde/programs/dthelp/parser/pass2/parser/param.c @@ -117,7 +117,7 @@ LOGICAL m_attvonly(string) /* Check a name previously saved in m_saveatt to see if it is the name of a valid parameter for the current start tag */ -void m_findatt(M_NOPAR) +void m_findatt(void) { int par, i ; @@ -220,7 +220,7 @@ void m_parupper(par, string) /* Set all parameters to their default values for an element included by tag minimization */ -void m_stkdefaultparams(M_NOPAR) +void m_stkdefaultparams(void) { int i, par = 0 ; @@ -272,7 +272,7 @@ void m_stkonedef(par, scanel, poccur, i) } /* Stack parameter values */ -void m_stkparams(M_NOPAR) +void m_stkparams(void) { int i, par ; diff --git a/cde/programs/dthelp/parser/pass2/parser/parutil.c b/cde/programs/dthelp/parser/pass2/parser/parutil.c index 5cca22e3..d69d1581 100644 --- a/cde/programs/dthelp/parser/pass2/parser/parutil.c +++ b/cde/programs/dthelp/parser/pass2/parser/parutil.c @@ -48,7 +48,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "version.h" /* Adjust parsing state after each token if necessary */ -void m_adjuststate(M_NOPAR) +void m_adjuststate(void) { if (m_curcon == START) { if (m_netlevel) { @@ -79,7 +79,7 @@ void m_adjuststate(M_NOPAR) /* Tests whether the element named in a tag is defined; if so, returns its index; otherwise return FALSE */ -M_ELEMENT m_eltname(M_NOPAR) +M_ELEMENT m_eltname(void) { M_ELEMENT eltid ; @@ -103,7 +103,7 @@ return i; } /* Program initialization */ -void m_initialize(M_NOPAR) +void m_initialize(void) { char **mb_delims; M_WCHAR **wc_delims; diff --git a/cde/programs/dthelp/parser/pass2/parser/proto.h b/cde/programs/dthelp/parser/pass2/parser/proto.h index 11c9969d..f907af1c 100644 --- a/cde/programs/dthelp/parser/pass2/parser/proto.h +++ b/cde/programs/dthelp/parser/pass2/parser/proto.h @@ -21,9 +21,9 @@ * Floor, Boston, MA 02110-1301 USA */ /* $XConsortium: proto.h /main/3 1995/11/08 10:57:56 rswiston $ */ -int m_actgetc(M_NOPAR); +int m_actgetc(void); -void m_adjuststate(M_NOPAR); +void m_adjuststate(void); LOGICAL m_allwhite(const M_WCHAR *string); @@ -41,20 +41,20 @@ void m_closent(void *m_ptr); void m_codeent(int m_ent); -M_PARSE *m_copystackelt(M_NOPAR); +M_PARSE *m_copystackelt(void); 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_done(void); void m_dumpline(M_WCHAR *file, int line); void m_eduptype(int type); -M_ELEMENT m_eltname(M_NOPAR); +M_ELEMENT m_eltname(void); void m_endaction(M_ELEMENT m_elt); @@ -64,7 +64,7 @@ void m_endtag(M_ELEMENT c); void m_entexpand(M_ENTITY *openent); -void m_eprefix(M_NOPAR); +void m_eprefix(void); void m_err1(const char *text, const M_WCHAR *arg); @@ -87,15 +87,15 @@ void m_errline(char *p); void m_error(char *text); -void m_esuffix(M_NOPAR); +void m_esuffix(void); void m_exit(int status); -void m_etcomplete(M_NOPAR); +void m_etcomplete(void); LOGICAL m_excluded(M_ELEMENT elt); -void m_expecting(M_NOPAR); +void m_expecting(void); void m_expexpand(LOGICAL *expstart, M_STATE node, LOGICAL *required, LOGICAL *data); @@ -105,7 +105,7 @@ void m_exptend(LOGICAL *expstart, M_PARSE *stackptr); int m_findact(M_ELEMENT elt, int *array); -void m_findatt(M_NOPAR); +void m_findatt(void); void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild); @@ -116,7 +116,7 @@ M_ELEMENT m_findunique(M_STATE from, int *newleft); void m_frcend(M_ELEMENT val); -void m_frcstart(M_NOPAR); +void m_frcstart(void); void m_free(void *block, char *msg); @@ -141,23 +141,23 @@ void m_getline(M_WCHAR **file, int *line); void m_getname(M_WCHAR first); -void m_getsignon(M_NOPAR); +void m_getsignon(void); int m_gettoken(int *c, M_HOLDTYPE *dchar, int context); -void m_globes(M_NOPAR); +void m_globes(void); -void m_globss(M_NOPAR); +void m_globss(void); -void m_holdproc(M_NOPAR); +void m_holdproc(void); void m_inctest(int *count, int limit, char *message); -void m_initctype(M_NOPAR); +void m_initctype(void); -void m_initialize(M_NOPAR); +void m_initialize(void); -void m_lastchars(M_NOPAR); +void m_lastchars(void); int m_level(M_WCHAR *elt); @@ -183,17 +183,17 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, LO void m_ntrent(M_WCHAR *p); -void m_nullendtag(M_NOPAR); +void m_nullendtag(void); -LOGICAL m_omitend(M_NOPAR); +LOGICAL m_omitend(void); -LOGICAL m_omitstart(M_NOPAR); +LOGICAL m_omitstart(void); void m_openchk(FILE **ptr, char *name, char *mode); void *m_openent(M_WCHAR *entcontent); -void *m_openfirst(M_NOPAR); +void *m_openfirst(void); void m_optstring(char *p); @@ -217,45 +217,45 @@ 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_pop(void); 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_readcomments(void); void *m_realloc(void *ptr, int size, char *msg); -int m_scan(M_NOPAR); +int m_scan(void); void m_setmap(int map, LOGICAL useoradd); -void m_setoptions(M_NOPAR); +void m_setoptions(void); void m_setparam(M_WCHAR **cvar, int par); void m_shortref(int context); -void m_showcurelt(M_NOPAR); +void m_showcurelt(void); void m_signmsg(char *p); -void m_sigre(M_NOPAR); +void m_sigre(void); -void m_startdoc(M_NOPAR); +void m_startdoc(void); -void m_startmsg(M_NOPAR); +void m_startmsg(void); void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END); -void m_stcomplete(M_NOPAR); +void m_stcomplete(void); -void m_stkdefaultparams(M_NOPAR); +void m_stkdefaultparams(void); void m_stkonedef(int par, M_ELEMENT scanel, M_WCHAR **poccur, int i); -void m_stkparams(M_NOPAR); +void m_stkparams(void); void m_strtaction(M_ELEMENT m_elt); @@ -271,11 +271,11 @@ void m_textaction(M_WCHAR m_textchar); void m_textout(char *format, LOGICAL start, LOGICAL end); -LOGICAL m_textpermitted(M_NOPAR); +LOGICAL m_textpermitted(void); -M_WCHAR *m_thisfile(M_NOPAR); +M_WCHAR *m_thisfile(void); -int m_thisline(M_NOPAR); +int m_thisline(void); void m_trace(char *p); @@ -297,7 +297,7 @@ int m_mbmbupstrcmp(const char *p, const char *q); LOGICAL m_validinpar(M_WCHAR *string); -LOGICAL m_vldentref(M_NOPAR); +LOGICAL m_vldentref(void); 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 17a82192..d42ac8f1 100644 --- a/cde/programs/dthelp/parser/pass2/parser/scan.c +++ b/cde/programs/dthelp/parser/pass2/parser/scan.c @@ -51,7 +51,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "sref.h" /* Actually read a character from an input stream */ -int m_actgetc(M_NOPAR) +int m_actgetc(void) { int c ; @@ -693,7 +693,7 @@ void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart, } /* Scans past a comment within a markup declaration */ -void m_readcomments(M_NOPAR) +void m_readcomments(void) { int c ; M_HOLDTYPE dchar ; @@ -706,7 +706,7 @@ void m_readcomments(M_NOPAR) } /* Scanner */ -int m_scan(M_NOPAR) +int m_scan(void) { int c ; M_HOLDTYPE dchar ; @@ -1040,7 +1040,7 @@ while (TRUE) or contextual end tag [linestat == M_SOMETHING] 3) If a record end might be the last one in an element, save it */ -void m_sigre(M_NOPAR) +void m_sigre(void) { /* Check for first RE in content and no preceding content */ if (m_start && @@ -1116,7 +1116,7 @@ void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread) } /* Have encountered an M_ERO. If the entity reference is valid, process it*/ -LOGICAL m_vldentref(M_NOPAR) +LOGICAL m_vldentref(void) { M_HOLDTYPE dchar ; int next ; diff --git a/cde/programs/dthelp/parser/pass2/parser/setopt.c b/cde/programs/dthelp/parser/pass2/parser/setopt.c index 0d631052..6d161306 100644 --- a/cde/programs/dthelp/parser/pass2/parser/setopt.c +++ b/cde/programs/dthelp/parser/pass2/parser/setopt.c @@ -30,7 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co. /* Set program options */ -void m_setoptions(M_NOPAR) +void m_setoptions(void) { if (m_argc > 1) m_optstring(m_argv[1]) ; } diff --git a/cde/programs/dthelp/parser/pass2/parser/startdoc.c b/cde/programs/dthelp/parser/pass2/parser/startdoc.c index 955b277e..c4e35ab1 100644 --- a/cde/programs/dthelp/parser/pass2/parser/startdoc.c +++ b/cde/programs/dthelp/parser/pass2/parser/startdoc.c @@ -32,7 +32,7 @@ Copyright 1989 Hewlett-Packard Co. control after all entity declarations have been processed. Not needed in valid documents (when it is called just prior to global start-code), but may be useful in some applications nevertheless. */ -void m_startdoc(M_NOPAR) +void m_startdoc(void) { } diff --git a/cde/programs/dthelp/parser/pass2/parser/struct.c b/cde/programs/dthelp/parser/pass2/parser/struct.c index ebeb765e..164fa798 100644 --- a/cde/programs/dthelp/parser/pass2/parser/struct.c +++ b/cde/programs/dthelp/parser/pass2/parser/struct.c @@ -191,7 +191,7 @@ LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet) /* Make a copy of the stack entry at the top of the parse stack in a scratch area */ -M_PARSE *m_copystackelt(M_NOPAR) +M_PARSE *m_copystackelt(void) { M_OPENFSA *oldfsa ; M_OPENFSA **newfsa ; @@ -219,7 +219,7 @@ M_PARSE *m_copystackelt(M_NOPAR) } /* End of document */ -void m_done(M_NOPAR) +void m_done(void) { M_ELEMENT lastelt ; @@ -398,7 +398,7 @@ LOGICAL m_nextand(thisfsa, label) } /* Pops the parse stack*/ -void m_pop(M_NOPAR) +void m_pop(void) { M_PARSE *stackelt ; @@ -664,7 +664,7 @@ void m_strttag(M_ELEMENT val, LOGICAL net) makes more sense, is used by MARKUP, and is under consideration by the Standards committee; the latter is the current definition in the Standard */ -LOGICAL m_textpermitted(M_NOPAR) +LOGICAL m_textpermitted(void) { M_ANDGROUP pand ; M_OPENFSA *fsastack ; diff --git a/cde/programs/dthelp/parser/pass2/util/basic.h b/cde/programs/dthelp/parser/pass2/util/basic.h index 25937074..617d9d11 100644 --- a/cde/programs/dthelp/parser/pass2/util/basic.h +++ b/cde/programs/dthelp/parser/pass2/util/basic.h @@ -47,8 +47,6 @@ typedef wchar_t M_WCHAR; /* For function prototypes */ typedef char * M_POINTER; -#define M_NOPAR void - char *MakeMByteString(const M_WCHAR *from); M_WCHAR *MakeWideCharString(const char *from); diff --git a/cde/programs/dthelp/parser/pass2/util/cont.h b/cde/programs/dthelp/parser/pass2/util/cont.h index 542cfcc3..c93ae007 100644 --- a/cde/programs/dthelp/parser/pass2/util/cont.h +++ b/cde/programs/dthelp/parser/pass2/util/cont.h @@ -39,7 +39,7 @@ This product and information is proprietary of Tandem Computers Incorporated. void countdown(M_TRIE *parent, int *count); -void dumpdlmptr(M_NOPAR); +void dumpdlmptr(void); void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)); @@ -53,17 +53,17 @@ void m_err1(char *text, char *arg); void getcode(int n); -void getcolon(M_NOPAR); +void getcolon(void); -int getContext(M_NOPAR); +int getContext(void); -LOGICAL getdname(M_NOPAR); +LOGICAL getdname(void); -void inccon(M_NOPAR); +void inccon(void); -void incdelim(M_NOPAR); +void incdelim(void); -void loaddelim(M_NOPAR); +void loaddelim(void); int m_lower(int c); @@ -81,7 +81,7 @@ void prtctxt(int column, int value); int readchar(LOGICAL cap); -void skiptoend(M_NOPAR); +void skiptoend(void); void unread(int c); diff --git a/cde/programs/dthelp/parser/pass2/util/conutil.c b/cde/programs/dthelp/parser/pass2/util/conutil.c index 7f2a63f4..d427156d 100644 --- a/cde/programs/dthelp/parser/pass2/util/conutil.c +++ b/cde/programs/dthelp/parser/pass2/util/conutil.c @@ -40,7 +40,7 @@ This product and information is proprietary of Tandem Computers Incorporated. #include "cont.h" /* Output declaration of dlmptr */ -void dumpdlmptr(M_NOPAR) +void dumpdlmptr(void) { int n; @@ -216,7 +216,7 @@ while (TRUE) } /* End proc getcode() */ /* Read the colon separating the two states in a transition pair */ -void getcolon(M_NOPAR) +void getcolon(void) { int c ; /* c is int instead of char for use with ungetc */ M_WCHAR wcl; @@ -240,7 +240,7 @@ if (c != wcl) } /* Read a context name from an input line */ -int getContext(M_NOPAR) +int getContext(void) { M_WCHAR name[CNAMELEN + 1]; int c ; /* c is int instead of char for use with ungetc */ @@ -309,7 +309,7 @@ return(ccount - 1); } /* Read a delimiter name from the input line */ -LOGICAL getdname(M_NOPAR) +LOGICAL getdname(void) { int c; M_WCHAR *p; @@ -353,7 +353,7 @@ return(TRUE); } /* Out of context space. Increase. */ -void inccon(M_NOPAR) +void inccon(void) { M_TRIE **newtrie = NULL; int *newtransit = NULL; @@ -400,7 +400,7 @@ void inccon(M_NOPAR) } /* Increase delimiter space. */ -void incdelim(M_NOPAR) +void incdelim(void) { int *newtransit = NULL; char **newdlm = NULL; @@ -447,7 +447,7 @@ dcount++; } /* Read delimiter definitions from delim.dat */ -void loaddelim(M_NOPAR) +void loaddelim(void) { int c; M_WCHAR *p; @@ -653,7 +653,7 @@ return(c); /* Called by utility procedure m_error() -- has content in other programs that use m_error() */ -void skiptoend(M_NOPAR) +void skiptoend(void) { } diff --git a/cde/programs/dthelp/parser/pass2/util/error.c b/cde/programs/dthelp/parser/pass2/util/error.c index f0fcb25a..3b799666 100644 --- a/cde/programs/dthelp/parser/pass2/util/error.c +++ b/cde/programs/dthelp/parser/pass2/util/error.c @@ -56,7 +56,7 @@ void msgline(char *text); void msg1line(char *text, char *arg1); -void skiptoend(M_NOPAR); +void skiptoend(void); void m_wctrace(M_WCHAR *text); @@ -185,7 +185,7 @@ m_free(mb_arg5,"multi-byte string"); } /* Write error message suffix */ -void esuffix(M_NOPAR) +void esuffix(void) { fprintf(stderr, " (line %d) ****\n", m_line) ; fprintf(m_errfile, " (line %d) ****\n", m_line) ; diff --git a/cde/programs/dthelp/parser/pass2/util/initct.c b/cde/programs/dthelp/parser/pass2/util/initct.c index af8c7b2f..9be8dde0 100644 --- a/cde/programs/dthelp/parser/pass2/util/initct.c +++ b/cde/programs/dthelp/parser/pass2/util/initct.c @@ -29,9 +29,9 @@ #include "common.h" extern char m_chartype[M_CHARSETLEN] ; -void m_initctype(M_NOPAR); +void m_initctype(void); -void m_initctype(M_NOPAR) +void m_initctype(void) { int i ; diff --git a/cde/programs/dthelp/parser/pass2/util/malloc.c b/cde/programs/dthelp/parser/pass2/util/malloc.c index fe3ad8cf..abed1c7e 100644 --- a/cde/programs/dthelp/parser/pass2/util/malloc.c +++ b/cde/programs/dthelp/parser/pass2/util/malloc.c @@ -42,7 +42,7 @@ void m_exit(int status); void m_free(void *block, char *msg); -void m_heapdump(M_NOPAR); +void m_heapdump(void); void *m_malloc(int size, char *msg); @@ -79,7 +79,7 @@ void m_free(void *block, char *msg) } #if defined(MSDOS) -void m_heapdump(M_NOPAR) +void m_heapdump(void) { struct _heapinfo hinfo ; int heapstatus ; diff --git a/cde/programs/dthelp/parser/pass2/util/scanutil.c b/cde/programs/dthelp/parser/pass2/util/scanutil.c index 465090e3..c9ceed66 100644 --- a/cde/programs/dthelp/parser/pass2/util/scanutil.c +++ b/cde/programs/dthelp/parser/pass2/util/scanutil.c @@ -28,7 +28,7 @@ extern FILE *ifile; /* Getachar returns the next character from the input stream */ -int getachar(M_NOPAR) +int getachar(void) { int c; M_WCHAR wc,wnl; diff --git a/cde/programs/dthelp/parser/pass2/util/trie.c b/cde/programs/dthelp/parser/pass2/util/trie.c index 7fa7ff4a..945b1cee 100644 --- a/cde/programs/dthelp/parser/pass2/util/trie.c +++ b/cde/programs/dthelp/parser/pass2/util/trie.c @@ -85,7 +85,7 @@ void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c) } /* end entertree */ /* Gets a new node for a trie */ -M_TRIE *m_gettrienode(M_NOPAR) +M_TRIE *m_gettrienode(void) { M_TRIE *new ; diff --git a/cde/programs/dthelp/parser/pass2/util/trie.h b/cde/programs/dthelp/parser/pass2/util/trie.h index 931b85f0..6660e2bb 100644 --- a/cde/programs/dthelp/parser/pass2/util/trie.h +++ b/cde/programs/dthelp/parser/pass2/util/trie.h @@ -51,7 +51,7 @@ struct m_ptrie { } ; -M_TRIE *m_gettrienode(M_NOPAR); +M_TRIE *m_gettrienode(void); void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie); -- 2.25.1