dthelp: Remove always on macro M_NOPAR which was just there to support ancient compilers that don't have 'void'

This commit is contained in:
Peter Howkins
2018-06-23 00:48:36 +01:00
parent 725b02e6bf
commit 757249c65b
173 changed files with 882 additions and 894 deletions

View File

@@ -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;

View File

@@ -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") ;
}

View File

@@ -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]);
}

View File

@@ -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()) ;

View File

@@ -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) ;
}

View File

@@ -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))

View File

@@ -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 ;

View File

@@ -28,7 +28,7 @@
#include "userinc.h"
#include "globdec.h"
void *m_openfirst(M_NOPAR)
void *m_openfirst(void)
{
return((void *) stdin) ;
}

View File

@@ -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 ;

View File

@@ -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;

View File

@@ -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);

View File

@@ -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 ;

View File

@@ -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]) ;
}

View File

@@ -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)
{
}

View File

@@ -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 ;