external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dthelp: Remove define M_PROTO that was always turned on (for all platforms) that enabled ANSI not K&R function prototypes

Browse source
This commit is contained in:
Peter Howkins 2018-06-22 20:40:47 +01:00
parent de7e0dfcdd
commit 725b02e6bf
218 changed files with 2975 additions and 14075 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cde/programs/dthelp/parser.ccdf/htag/build/build.h
View file

@ -421,8 +421,4 @@ BUILDEXTERN LOGICAL entrule BUILDINIT(FALSE) ;
BUILDEXTERN M_WCHAR genname[M_NAMELEN + sizeof(M_PREFIX)] ;
M_WCHAR *MakeWideCharString(
#if defined(M_PROTO)
const char *from
#endif
);
M_WCHAR *MakeWideCharString(const char *from);

16
cde/programs/dthelp/parser.ccdf/htag/build/fsa.c
View file

@ -37,18 +37,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
/* Addarc adds an arc from FSA state <from> to state <to> setting other
fields as indicated by the other parameters.*/
#if defined(M_PROTO)
int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, int id, LOGICAL minim, ELTSTRUCT **errelt)
#else
int addarc(from, to, label, and, optional, id, minim, errelt)
STATE *from, *to ;
ELTSTRUCT *label ;
ANDGROUP *and ;
LOGICAL optional ;
int id ;
LOGICAL minim ;
ELTSTRUCT **errelt ;
#endif
{
ARC *parc, *qarc ;
int determ ;
@ -630,12 +619,7 @@ LOGICAL samelabelarc(a, s)
/* Saves the name of an element appearing on the left-hand side of a
grammar rule */
#if defined(M_PROTO)
void savelhs(LOGICAL param)
#else
void savelhs(param)
LOGICAL param ;
#endif
{
STATE *end ;
ELTSTRUCT *errelt ;

15
cde/programs/dthelp/parser.ccdf/htag/build/param.c
View file

@ -124,12 +124,7 @@ newpar->ptypep = NULL ;
/* Check that specified default value is legal parameter value */
#if defined(M_PROTO)
LOGICAL checkdefault( const M_WCHAR *string )
#else
LOGICAL checkdefault(string)
M_WCHAR *string ;
#endif /* M_PROTO */
{
const M_WCHAR *p ;
int len ;
@ -204,12 +199,7 @@ switch (newpar->type)
/* Normalize parameter default. Change tabs and RE's to spaces, capitalize
all letters (unless type is CDATA), remove extra space in lists */
#if defined(M_PROTO)
void normdefault(M_WCHAR *string )
#else
void normdefault(string)
M_WCHAR *string ;
#endif /* M_PROTO */
{
M_WCHAR *p, *q ;
int i ;
@ -292,12 +282,7 @@ ruleinit() ;
}
/* Make string the default for the current parameter of the current element */
#if defined(M_PROTO)
void setdefault(const M_WCHAR *string)
#else
void setdefault()
M_WCHAR *string;
#endif /* M_PROTO */
{
PTYPE *kw ;
int keycount ;

727
cde/programs/dthelp/parser.ccdf/htag/build/proto.h
View file

@ -26,589 +26,206 @@
*/
/* Proto.h contains function prototypes for program BUILD. */
/* Proto.h contains function prototypes for program BUILD. */
int addarc(
#if defined(M_PROTO)
STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional,
int id, LOGICAL minim, ELTSTRUCT **errelt
#endif
) ;
int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional,
int id, LOGICAL minim, ELTSTRUCT **errelt);
void adddefent(
#if defined(M_PROTO)
M_WCHAR *mapname
#endif
) ;
void adddefent(M_WCHAR *mapname);
LOGICAL addent(
#if defined(M_PROTO)
M_WCHAR *name
#endif
) ;
LOGICAL addent(M_WCHAR *name);
void addex(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void addex(M_NOPAR);
void addkeyword(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void addkeyword(M_NOPAR);
LOGICAL addmapname(
#if defined(M_PROTO)
M_WCHAR *p, LOGICAL define
#endif
) ;
LOGICAL addmapname(M_WCHAR *p, LOGICAL define);
void addndent(
#if defined(M_PROTO)
M_WCHAR *p
#endif
) ;
void addndent(M_WCHAR *p);
void addpar(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void addpar(M_NOPAR);
void addsref(
#if defined(M_PROTO)
M_WCHAR *p
#endif
) ;
void addsref(M_WCHAR *p);
LOGICAL m_allwhite(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
LOGICAL m_allwhite(const M_WCHAR *string);
void checkand(
#if defined(M_PROTO)
ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root,
ELTSTRUCT **errelt
#endif
) ;
void checkand(ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root,
ELTSTRUCT **errelt);
LOGICAL checkdefault(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
LOGICAL checkdefault(const M_WCHAR *string);
int checkdfsa(
#if defined(M_PROTO)
STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt
#endif
) ;
int checkdfsa(STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt);
int checkrepeat(
#if defined(M_PROTO)
STATE *from, ANDGROUP *and, ELTSTRUCT **errelt
#endif
) ;
int checkrepeat(STATE *from, ANDGROUP *and, ELTSTRUCT **errelt);
void copyintolist(
#if defined(M_PROTO)
STATELIST *from, STATELIST **to
#endif
) ;
void copyintolist(STATELIST *from, STATELIST **to);
void countdown(
#if defined(M_PROTO)
M_TRIE *parent, int *count
#endif
) ;
void countdown(M_TRIE *parent, int *count);
void defmapname(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void defmapname(M_NOPAR);
char *deftype(
#if defined(M_PROTO)
int n
#endif
) ;
char *deftype(int n);
void dellist(
#if defined(M_PROTO)
STATELIST **list
#endif
) ;
void dellist(STATELIST **list);
void delstartarcs(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void delstartarcs(M_NOPAR);
void done(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void done(M_NOPAR);
void dumpentnode(
#if defined(M_PROTO)
FILE *file, M_TRIE *value
#endif
) ;
void dumpentnode(FILE *file, M_TRIE *value);
void dumpmapnode(
#if defined(M_PROTO)
FILE *file, M_TRIE *value
#endif
) ;
void dumpmapnode(FILE *file, M_TRIE *value);
void dumpsrefnode(
#if defined(M_PROTO)
FILE *file,
M_TRIE *value
#endif
) ;
void dumpsrefnode(FILE *file,
M_TRIE *value);
void dumpptrie(
#if defined(M_PROTO)
M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef,
void (*proc)( FILE *, M_TRIE *)
#endif
) ;
void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef,
void (*proc)( FILE *, M_TRIE *));
void m_dumptrie(
#if defined(M_PROTO)
FILE *file,
void m_dumptrie(FILE *file,
M_TRIE *xtrie,
char *extname,
int *count,
void (*proc)(M_ENTITY *)
#endif
) ;
void eltblocks(
#if defined(M_PROTO)
FILE *tempfile
#endif
) ;
void eltreeout(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void endmodel(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void entout(
#if defined(M_PROTO)
char *fname
#endif
) ;
char *enttype(
#if defined(M_PROTO)
int n
#endif
) ;
void m_error(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_err1(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg
#endif
) ;
void m_mberr1(
#if defined(M_PROTO)
char *text, const char *arg
#endif
) ;
void m_err2(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2
#endif
) ;
void exout(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_free(
#if defined(M_PROTO)
void *block, char *msg
#endif
) ;
void freetree(
#if defined(M_PROTO)
TREE *ruletree
#endif
) ;
void found(
#if defined(M_PROTO)
LOGICAL *flag, char *delim
#endif
) ;
void fsa(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int getachar(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
ANDGROUP *getand(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL getname(
#if defined(M_PROTO)
int first
#endif
) ;
STATE *getstate(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int gettoken(
#if defined(M_PROTO)
int *c, int context
#endif
) ;
TREE *gettreenode(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_initctype(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void initialize(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL litproc(
#if defined(M_PROTO)
int delim
#endif
) ;
void main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
void makeand(
#if defined(M_PROTO)
LOGICAL *canbenull, TREE *root, int optional
#endif
) ;
LOGICAL makefsa(
#if defined(M_PROTO)
TREE *root, int optional
#endif
) ;
void makeor(
#if defined(M_PROTO)
LOGICAL *canbenull, TREE *root
#endif
) ;
void makeseq(
#if defined(M_PROTO)
LOGICAL *canbenull, TREE *root, int optional
#endif
) ;
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void msgline(
#if defined(M_PROTO)
char *text
#endif
) ;
void msg1line(
#if defined(M_PROTO)
char *text, char *arg1
#endif
) ;
void nondeterm(
#if defined(M_PROTO)
TREE *root, int c, ELTSTRUCT *eltp
#endif
) ;
void normdefault(
#if defined(M_PROTO)
M_WCHAR *string
#endif
) ;
LOGICAL notinlist(
#if defined(M_PROTO)
STATELIST *item, STATELIST *list
#endif
) ;
ELTSTRUCT *ntrelt(
#if defined(M_PROTO)
M_WCHAR *p
#endif
) ;
void m_openchk(
#if defined(M_PROTO)
FILE **ptr, char *name, char *mode
#endif
) ;
void parout(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
char *partype(
#if defined(M_PROTO)
int n
#endif
) ;
LOGICAL permitspcd(
#if defined(M_PROTO)
ARC *a
#endif
) ;
void pop(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void prulend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void push(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL regenerate(
#if defined(M_PROTO)
TREE *start, TREE *stop
#endif
) ;
void repeat(
#if defined(M_PROTO)
TREE *root
#endif
) ;
void ruleinit(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void rulend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL samelabelarc(
#if defined(M_PROTO)
ARC *a, STATE *s
#endif
) ;
void savelhs(
#if defined(M_PROTO)
LOGICAL param
#endif
) ;
void savestartarcs(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int scan(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void setdefault(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
void simplebranch(
#if defined(M_PROTO)
TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional
#endif
) ;
void skiptoend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int m_sprscon(
#if defined(M_PROTO)
int i, int j
#endif
) ;
void srefout(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
STATE *startfsa(
#if defined(M_PROTO)
TREE *root, LOGICAL *canbenull
#endif
) ;
void tempelt(
#if defined(M_PROTO)
ELTSTRUCT *eltp, FILE *tempfile
#endif
) ;
void template(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
char *typecon(
#if defined(M_PROTO)
int n
#endif
) ;
void undodelim(
#if defined(M_PROTO)
M_WCHAR *delim
#endif
) ;
void ungetachar(
#if defined(M_PROTO)
int c
#endif
) ;
int m_wcupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const M_WCHAR *q
#endif
) ;
int m_wcmbupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const char *q
#endif
) ;
int m_mbmbupstrcmp(
#if defined(M_PROTO)
const char *p, const char *q
#endif
) ;
void warning(
#if defined(M_PROTO)
char *text
#endif
) ;
void warning1(
#if defined(M_PROTO)
char *text, M_WCHAR *arg
#endif
) ;
void warning2(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2
#endif
) ;
void warning3(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
#endif
) ;
void warning4(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4
#endif
) ;
LOGICAL m_whitespace(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
void (*proc)(M_ENTITY *));
void eltblocks(FILE *tempfile);
void eltreeout(M_NOPAR);
void endmodel(M_NOPAR);
void entout(char *fname);
char *enttype(int n);
void m_error(char *text);
void m_err1(const char *text, const M_WCHAR *arg);
void m_mberr1(char *text, const char *arg);
void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
void exout(M_NOPAR);
void m_free(void *block, char *msg);
void freetree(TREE *ruletree);
void found(LOGICAL *flag, char *delim);
void fsa(M_NOPAR);
int getachar(M_NOPAR);
ANDGROUP *getand(M_NOPAR);
LOGICAL getname(int first);
STATE *getstate(M_NOPAR);
int gettoken(int *c, int context);
TREE *gettreenode(M_NOPAR);
void m_initctype(M_NOPAR);
void initialize(M_NOPAR);
LOGICAL litproc(int delim);
void main(int argc, char **argv);
void makeand(LOGICAL *canbenull, TREE *root, int optional);
LOGICAL makefsa(TREE *root, int optional);
void makeor(LOGICAL *canbenull, TREE *root);
void makeseq(LOGICAL *canbenull, TREE *root, int optional);
void *m_malloc(int size, char *msg);
void msgline(char *text);
void msg1line(char *text, char *arg1);
void nondeterm(TREE *root, int c, ELTSTRUCT *eltp);
void normdefault(M_WCHAR *string);
LOGICAL notinlist(STATELIST *item, STATELIST *list);
ELTSTRUCT *ntrelt(M_WCHAR *p);
void m_openchk(FILE **ptr, char *name, char *mode);
void parout(M_NOPAR);
char *partype(int n);
LOGICAL permitspcd(ARC *a);
void pop(M_NOPAR);
void prulend(M_NOPAR);
void push(M_NOPAR);
LOGICAL regenerate(TREE *start, TREE *stop);
void repeat(TREE *root);
void ruleinit(M_NOPAR);
void rulend(M_NOPAR);
LOGICAL samelabelarc(ARC *a, STATE *s);
void savelhs(LOGICAL param);
void savestartarcs(M_NOPAR);
int scan(M_NOPAR);
void setdefault(const M_WCHAR *string);
void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional);
void skiptoend(M_NOPAR);
int m_sprscon(int i, int j);
void srefout(M_NOPAR);
STATE *startfsa(TREE *root, LOGICAL *canbenull);
void tempelt(ELTSTRUCT *eltp, FILE *tempfile);
void template(M_NOPAR);
char *typecon(int n);
void undodelim(M_WCHAR *delim);
void ungetachar(int c);
int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q);
int m_wcmbupstrcmp(const M_WCHAR *p, const char *q);
int m_mbmbupstrcmp(const char *p, const char *q);
void warning(char *text);
void warning1(char *text, M_WCHAR *arg);
void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2);
void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);
void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4);
LOGICAL m_whitespace(M_WCHAR c);

6
cde/programs/dthelp/parser.ccdf/htag/build/sref.c
View file

@ -100,13 +100,7 @@ return(TRUE);
}
/* Add a short reference map name */
#if defined(M_PROTO)
LOGICAL addmapname(M_WCHAR* p, LOGICAL define)
#else
LOGICAL addmapname(p, define)
M_WCHAR *p;
LOGICAL define;
#endif
{
MAP *old;
MAP *new;

32
cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c
View file

@ -66,23 +66,14 @@ void actptrout(array, name)
/* Close a code file and write jump table at the end */
#if defined(M_PROTO)
void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto)
#else
void closeiffile(flag, file, count, table, proto)
LOGICAL flag;
FILE *file;
int count;
char *table;
char *proto;
#endif
{
int i;
endcode(flag, file);
if (count) {
fprintf(file,
"void (*m_%stable[])(\n#if defined(M_PROTO)\n %s\n#endif\n ) = {\n",
"void (*m_%stable[])(%s) = {\n",
table, proto);
fprintf(file, " m_%s1, /* Place holder for 1-based indexing */\n",
table);
@ -94,7 +85,7 @@ void closeiffile(flag, file, count, table, proto)
}
else
fprintf(file,
"void (*m_%stable[1])(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n",
"void (*m_%stable[1])(%s) ;\n",
table, proto);
fclose(file);
}
@ -193,13 +184,7 @@ void done(M_NOPAR)
}
/* Called when finished reading a section of code from the input file */
#if defined(M_PROTO)
void endcode(LOGICAL flag, FILE *file)
#else
void endcode(flag, file)
LOGICAL flag;
FILE *file;
#endif
{
if (flag) fprintf(file, "}}\n\n");
}
@ -563,21 +548,14 @@ endcode(*flag, file);
*flag = TRUE;
/* protoype */
fprintf(file,
"void m_%s%d(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n",
"void m_%s%d(%s) ;\n",
prefix,
caseno,
proto);
/* ANSI defines */
fputs("#if defined(M_PROTO)\n", file);
fprintf(file, "void m_%s%d(%s)\n", prefix, caseno, proto);
fputs("#else\n", file);
fprintf(file,
"void m_%s%d(%s)\n%s\n#endif\n {\n", /* balance the "}" */
prefix,
caseno,
formal,
formtype);
fprintf(file, "void m_%s%d(%s)\n {\n", prefix, caseno, proto);
);
for (cvarp = cvarlist ; cvarp ; cvarp = cvarp->next)
{

332
cde/programs/dthelp/parser.ccdf/htag/eltdef/proto.h
View file

@ -28,334 +28,112 @@
/* Proto.h contains function prototypes for program ELTDEF. */
void actptrout(
#if defined(M_PROTO)
ACTION **array, char *name
#endif
) ;
void actptrout(ACTION **array, char *name);
void addent(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void addent(M_NOPAR);
LOGICAL m_allwhite(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
LOGICAL m_allwhite(const M_WCHAR *string);
void closeiffile(
#if defined(M_PROTO)
LOGICAL flag, FILE *file, int count, char *table, char *proto
#endif
) ;
void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto);
void countdown(
#if defined(M_PROTO)
M_TRIE *parent, int *count
#endif
) ;
void countdown(M_TRIE *parent, int *count);
void cvalue(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void cvalue(M_NOPAR);
void done(M_NOPAR);
void done(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count, void (*proc)(M_ENTITY *));
void m_dumptrie(
#if defined(M_PROTO)
FILE *file,
M_TRIE *xtrie,
char *extname,
int *count,
void (*proc)(M_ENTITY *)
#endif
) ;
void endcode(LOGICAL flag, FILE *file);
void endcode(
#if defined(M_PROTO)
LOGICAL flag, FILE *file
#endif
) ;
void endini(M_NOPAR);
void endini(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void endsignon(M_NOPAR);
void endsignon(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void endstring(M_NOPAR);
void endstring(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void entout(char *fname);
void entout(
#if defined(M_PROTO)
char *fname
#endif
) ;
void enttype(int type);
void enttype(
#if defined(M_PROTO)
int type
#endif
) ;
void m_error(char *text);
void m_error(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_err1(const char *text, const M_WCHAR *arg);
void m_err1(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg
#endif
) ;
void m_mberr1(char *text, const char *arg);
void m_mberr1(
#if defined(M_PROTO)
char *text, const char *arg
#endif
) ;
void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
void m_err2(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2
#endif
) ;
void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);
void m_err3(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
#endif
) ;
void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5);
void m_err5(
#if defined(M_PROTO)
char *text,
M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5
#endif
) ;
void m_exit(int status);
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_free(void *block, char *msg);
void m_free(
#if defined(M_PROTO)
void *block, char *msg
#endif
) ;
void freechain(M_NOPAR);
void freechain(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int getachar(M_NOPAR);
int getachar(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int *getaction(ACTION **array);
int *getaction(
#if defined(M_PROTO)
ACTION **array
#endif
) ;
ACTION *getactstruct(M_NOPAR);
ACTION *getactstruct(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void getname(int first);
void getname(
#if defined(M_PROTO)
int first
#endif
) ;
int gettoken(int *c, int context);
int gettoken(
#if defined(M_PROTO)
int *c, int context
#endif
) ;
void m_initctype(M_NOPAR);
void m_initctype(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void initialize(M_NOPAR);
void initialize(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL m_letter(M_WCHAR c);
LOGICAL m_letter(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
LOGICAL litproc(int delim);
LOGICAL litproc(
#if defined(M_PROTO)
int delim
#endif
) ;
void main(int argc, char **argv);
void main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
void *m_malloc(int size, char *msg);
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void m_openchk(FILE **ptr, char *name, char *mode);
void m_openchk(
#if defined(M_PROTO)
FILE **ptr, char *name, char *mode
#endif
) ;
void outpval(M_TRIE *p);
void outpval(
#if defined(M_PROTO)
M_TRIE *p
#endif
) ;
void outstring(M_NOPAR);
void outstring(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name);
int m_packedlook(
#if defined(M_PROTO)
M_PTRIE *xptrie, M_WCHAR *name
#endif
) ;
const M_WCHAR *m_partype(const int par, const M_WCHAR *string);
const M_WCHAR *m_partype(
#if defined(M_PROTO)
const int par, const M_WCHAR *string
#endif
) ;
int scan(M_NOPAR);
int scan(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void skiptoend(M_NOPAR);
void skiptoend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto,
char *formal, char *formtype);
void startcode(
#if defined(M_PROTO)
int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto,
char *formal, char *formtype
#endif
) ;
void startelement(M_NOPAR);
void startelement(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void storecvar(M_NOPAR);
void storecvar(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void storepname(M_NOPAR);
void storepname(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void undodelim(M_WCHAR *delim);
void undodelim(
#if defined(M_PROTO)
M_WCHAR *delim
#endif
) ;
void ungetachar(int c);
void ungetachar(
#if defined(M_PROTO)
int c
#endif
) ;
int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q);
int m_wcupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const M_WCHAR *q
#endif
) ;
int m_wcmbupstrcmp(const M_WCHAR *p, const char *q);
int m_wcmbupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const char *q
#endif
) ;
int m_mbmbupstrcmp(const char *p, const char *q);
int m_mbmbupstrcmp(
#if defined(M_PROTO)
const char *p, const char *q
#endif
) ;
void value(M_WCHAR *p);
void value(
#if defined(M_PROTO)
M_WCHAR *p
#endif
) ;
void warning(char *text);
void warning(
#if defined(M_PROTO)
char *text
#endif
) ;
void warning1(char *text, M_WCHAR *arg);
void warning1(
#if defined(M_PROTO)
char *text, M_WCHAR *arg
#endif
) ;
LOGICAL m_whitespace(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
LOGICAL m_whitespace(M_WCHAR c);

45
cde/programs/dthelp/parser.ccdf/htag/helptag/default.c
View file

@ -30,12 +30,7 @@ Copyright 1988, 1989, 1992 Hewlett-Packard Co.
#include "userinc.h"
#include "globdec.h"
#if defined(M_PROTO)
int vextextsize(const M_WCHAR *keyword)
#else
int vextextsize(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return NORMAL;
@ -47,12 +42,7 @@ m_err1("Unexpected value for ex/vex textsize parameter: %s", keyword);
return NORMAL;
}
#if defined(M_PROTO)
int vgloss(const M_WCHAR *keyword)
#else
int vgloss(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return GLOSS;
@ -63,12 +53,7 @@ m_err1("Unexpected value for gloss parameter: %s", keyword);
return GLOSS;
}
#if defined(M_PROTO)
int vcenter(const M_WCHAR *keyword)
#else
int vcenter(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return CENTER;
@ -80,12 +65,7 @@ m_err1("Unexpected value for center parameter: %s", keyword);
return CENTER;
}
#if defined(M_PROTO)
int vnumber(const M_WCHAR *keyword)
#else
int vnumber(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return NONUMBER;
@ -96,12 +76,7 @@ m_err1("Unexpected value for number parameter: %s", keyword);
return NONUMBER;
}
#if defined(M_PROTO)
LOGICAL vstack(const M_WCHAR *keyword)
#else
LOGICAL vnumber(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return FALSE;
@ -112,12 +87,7 @@ m_err1("Unexpected value for number parameter: %s", keyword);
return FALSE;
}
#if defined(M_PROTO)
int vordertype(const M_WCHAR *keyword)
#else
int vordertype(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return ARABIC;
@ -131,12 +101,7 @@ m_err1("Unexpected list order type: %s", keyword);
return ARABIC;
}
#if defined(M_PROTO)
int vrsectpage(const M_WCHAR *keyword)
#else
int vrsectpage(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return NEWPAGE;
@ -147,12 +112,7 @@ m_err1("Unexpected value for rsectpage parameter: %s", keyword);
return NEWPAGE;
}
#if defined(M_PROTO)
int vspacing(const M_WCHAR *keyword)
#else
int vspacing(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return LOOSE;
@ -163,12 +123,7 @@ m_err1("Unexpected value for spacing parameter: %s", keyword);
return LOOSE;
}
#if defined(M_PROTO)
int vtype(const M_WCHAR *keyword)
#else
int vtype(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return BULLET;

1008
cde/programs/dthelp/parser.ccdf/htag/helptag/fproto.h
View file

File diff suppressed because it is too large Load diff

133
cde/programs/dthelp/parser.ccdf/htag/helptag/help.c
View file

@ -877,15 +877,8 @@ m_free(string, "GetDefaultHeaderString return");
/* Verify that val is an acceptable real number value */
#if defined(M_PROTO)
M_WCHAR *
checkreal (M_WCHAR *val, M_WCHAR *paramname, LOGICAL msgout, M_WCHAR *elt)
#else
M_WCHAR *checkreal (val, paramname, msgout, elt)
M_WCHAR *val, *paramname;
LOGICAL msgout;
M_WCHAR *elt;
#endif
{
/* returns val if a valid real number, else NULL */
double num;
@ -950,13 +943,7 @@ else
/* Starting stuff for <EX> and <VEX> */
#if defined(M_PROTO)
void exvexstart (M_WCHAR *type, M_WCHAR *textsize, char *listinfo)
#else
void exvexstart (type, textsize, listinfo)
M_WCHAR *type, *textsize;
char *listinfo;
#endif
{
int tsize;
@ -1520,15 +1507,7 @@ fputs(">\n", outfile);
/* Express a sequence number as a letter in an alpha list or appendix */
#if defined(M_PROTO)
void itoletter(int n, char start, char *dest, int length)
#else
void itoletter(n, start, dest, length)
int n;
char start;
char *dest;
int length;
#endif
{
char invert[10];
char *p, *q;
@ -1837,13 +1816,7 @@ m_exit(0);
}
/* Start a new helpnode */
#if defined(M_PROTO)
void starthelpnode(M_WCHAR *id, LOGICAL suppress_topic_map)
#else
void starthelpnode(id, suppress_topic_map)
M_WCHAR *id;
LOGICAL suppress_topic_map; /* should we suppress .tpc entry */
#endif
{
int i;
char *mbyte;
@ -1944,13 +1917,7 @@ if (!suppress_topic_map)
} /* End starthelpnode(id) */
#if defined(M_PROTO)
void mb_starthelpnode(char *id, LOGICAL suppress_topic_map)
#else
void mb_starthelpnode(id, suppress_topic_map)
char *id;
LOGICAL suppress_topic_map; /* should we suppress .tpc entry */
#endif
{
M_WCHAR *wc;
@ -2372,17 +2339,10 @@ return((long) num );
the string returned must be m_free'd.
*/
char *
#if defined(M_PROTO)
GetDefaultHeaderString(
char *elementName,
unsigned char desiredType,
char *defaultString )
#else
GetDefaultHeaderString(elementName, desiredType, defaultString)
char *elementName;
unsigned char desiredType;
char *defaultString;
#endif
{
unsigned char type,wheredef;
M_WCHAR *content;
@ -2484,7 +2444,6 @@ m_free(elementName,"wide character string");
}
#if defined(M_PROTO)
void paragraph(M_WCHAR *indent,
M_WCHAR *id,
M_WCHAR *gentity,
@ -2493,24 +2452,6 @@ void paragraph(M_WCHAR *indent,
M_WCHAR *glinktype,
M_WCHAR *gdescription,
char *listinfo)
#else
void paragraph(indent,
id,
gentity,
gposition,
ghyperlink,
glinktype,
gdescription,
listinfo)
M_WCHAR *indent;
M_WCHAR *id;
M_WCHAR *gentity;
M_WCHAR *gposition;
M_WCHAR *ghyperlink;
M_WCHAR *glinktype;
M_WCHAR *gdescription;
char *listinfo;
#endif
{
if (id)
{
@ -2569,7 +2510,6 @@ fprintf(outfile, "%s>", listinfo);
unleaded = FALSE;
}
#if defined(M_PROTO)
void figure(
M_WCHAR *number,
M_WCHAR *tonumber,
@ -2600,67 +2540,6 @@ void figure(
M_WCHAR *glinktype,
M_WCHAR *gdescription,
char *listinfo)
#else
void figure(
number,
tonumber,
id,
file,
figpos,
cappos,
oldtype,
xwidth,
xdepth,
xhadjust,
xvadjust,
border,
type,
xmagnify,
video,
strip,
mirror,
margin,
clip,
penwidth,
snap,
autoscale,
plottype,
callout,
textsize,
ghyperlink,
glinktype,
gdescription,
listinfo)
M_WCHAR *number;
M_WCHAR *tonumber;
M_WCHAR *id;
M_WCHAR *file;
M_WCHAR *figpos;
M_WCHAR *cappos;
M_WCHAR *oldtype;
M_WCHAR *xwidth;
M_WCHAR *xdepth;
M_WCHAR *xhadjust;
M_WCHAR *xvadjust;
M_WCHAR *border;
M_WCHAR *type;
M_WCHAR *xmagnify;
M_WCHAR *video;
M_WCHAR *strip;
M_WCHAR *mirror;
M_WCHAR *margin;
M_WCHAR *clip;
M_WCHAR *penwidth;
M_WCHAR *snap;
M_WCHAR *autoscale;
M_WCHAR *plottype;
M_WCHAR *callout;
M_WCHAR *textsize;
M_WCHAR *ghyperlink;
M_WCHAR *glinktype;
M_WCHAR *gdescription;
char *listinfo;
#endif
{
unsigned char etype,wheredef;
char *string =
@ -2919,14 +2798,7 @@ if (ftonumber)
m_free(string, "default header string return");
}
#if defined(M_PROTO)
void endterm( M_WCHAR *base, M_WCHAR *gloss, int linktype)
#else
void endterm( base, gloss, linktype)
M_WCHAR *base;
M_WCHAR *gloss;
int linktype;
#endif
{
M_WCHAR *p;
M_WCHAR wnl, wsp, wus;
@ -3004,12 +2876,7 @@ if (vgloss(gloss) == GLOSS)
if (echo) mb_echohead("++");
}
#if defined(M_PROTO)
M_WCHAR wc_toupper(M_WCHAR wc)
#else
M_WCHAR wc_toupper(wc)
M_WCHAR wc;
#endif
{
if ((wc >= 0) && (wc <= 255))
{

18
cde/programs/dthelp/parser.ccdf/htag/helptag/option.c
View file

@ -37,12 +37,7 @@
#define TAGDOTOPT "helptag.opt"
#define DOTOPT ".opt"
#if defined(M_PROTO)
void options(LOGICAL filelenonly)
#else
void options(filelenonly)
LOGICAL filelenonly;
#endif
{
int i;
FILE *optfile;
@ -149,13 +144,7 @@ optval = M_NULLVAL;
/* Set a single option */
/* Workonly parameter described with function options()*/
#if defined(M_PROTO)
void setopt(char *string, LOGICAL filelenonly)
#else
void setopt(string, filelenonly)
char *string;
LOGICAL filelenonly;
#endif
{
char *p;
int thisopt;
@ -280,14 +269,7 @@ else switch(thisopt + 1)
}
/* Process a value for a command line option */
#if defined(M_PROTO)
LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly)
#else
LOGICAL setvalopt(thisopt, string, filelenonly)
int thisopt;
char *string;
LOGICAL filelenonly;
#endif
{
char *p;
int i;

68
cde/programs/dthelp/parser.ccdf/htag/helptag/out.c
View file

@ -89,12 +89,7 @@ echo = savhd = FALSE;
}
/* Process a character in an environment where spaces must be escaped */
#if defined(M_PROTO)
void esoutchar(M_WCHAR textchar)
#else
void esoutchar(textchar)
M_WCHAR textchar;
#endif
{
static M_WCHAR wsp = 0;
@ -115,12 +110,7 @@ outchar(textchar, outfile);
}
/* Process a character in an example or an image paragraph */
#if defined(M_PROTO)
void exoutchar(M_WCHAR textchar)
#else
void exoutchar(textchar)
M_WCHAR textchar;
#endif
{
static M_WCHAR wsp = 0, wre;
@ -146,12 +136,7 @@ else outchar(textchar, outfile);
}
/* Write a character to be passed to the index file */
#if defined(M_PROTO)
void indexchar(M_WCHAR textchar)
#else
void indexchar(textchar)
M_WCHAR textchar;
#endif
{
if (idxsavlen + 4 > (sizeof(idxsav) / sizeof(M_WCHAR)))
{
@ -163,26 +148,14 @@ idxsav[idxsavlen++] = textchar;
/* Processes output for call out text */
#if defined(M_PROTO)
void outcall(M_WCHAR textchar, FILE *outfile)
#else
void outcall(textchar, outfile)
M_WCHAR textchar;
FILE *outfile;
#endif
{
if (textchar != M_RE)
outchar(textchar, outfile);
}
/* Processes a data character */
#if defined(M_PROTO)
void outchar(M_WCHAR textchar, FILE *outfile)
#else
void outchar(textchar, outfile)
M_WCHAR textchar;
FILE *outfile;
#endif
{
M_WCHAR buffer[2];
static M_WCHAR wnl = 0;
@ -263,13 +236,7 @@ if (unleaded) /* unleaded is a one-shot flag */
}
/* Really output a character */
#if defined(M_PROTO)
void realoutchar(M_WCHAR textchar, FILE *outfile)
#else
void realoutchar(textchar, outfile)
M_WCHAR textchar;
FILE *outfile;
#endif
{
rshnewclear();
if (! abbrev || fabbrev)
@ -313,22 +280,7 @@ if (! abbrev || fabbrev)
/* Save a character in the array used to store table of contents entries
when processing a head */
#if defined(M_PROTO)
void shchar(M_WCHAR textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, LOGICAL *errflg)
#else
void shchar(textchar, len, max, string, proc, msg, errflg)
M_WCHAR textchar;
int *len;
int max;
M_WCHAR *string;
void (*proc)(
#if defined(M_PROTO)
M_WCHAR *string
#endif
);
char *msg;
LOGICAL *errflg;
#endif
{
char mb_textchar[32]; /* arbitrarily large */
unsigned char index;
@ -361,27 +313,12 @@ else
}
#if defined(M_PROTO)
void mb_shchar(char textchar,
int *len,
int max,
M_WCHAR *string,
void (*proc)(M_WCHAR *string),
char *msg, LOGICAL *errflg)
#else
void mb_shchar(textchar, len, max, string, proc, msg, errflg)
char textchar;
int *len;
int max;
M_WCHAR *string;
void (*proc)(
#if defined(M_PROTO)
M_WCHAR *string
#endif
);
char *msg;
LOGICAL *errflg;
#endif
{
M_WCHAR wc_textchar;
@ -530,12 +467,7 @@ svtclen += length;
}
/* Process a character in a term */
#if defined(M_PROTO)
void termchar(M_WCHAR textchar)
#else
void termchar(textchar)
M_WCHAR textchar;
#endif
{
if (termp - term >= MAXTERM)
{

14
cde/programs/dthelp/parser.ccdf/htag/helptag/xref.c
View file

@ -333,21 +333,9 @@ while (TRUE)
/* Save a cross-reference ID and associated expansion */
#if defined(M_PROTO)
void setid(M_WCHAR *id, LOGICAL where, LOGICAL csensitive, LOGICAL inchapter,
char *chapter, M_WCHAR *xrffile, int xrfline, LOGICAL xrefable)
#else
void setid(id, where, csensitive, inchapter, chapter, xrffile, xrfline, xrefable)
M_WCHAR *id;
LOGICAL where;
LOGICAL csensitive;
LOGICAL inchapter;
char *chapter;
M_WCHAR *xrffile;
int xrfline;
LOGICAL xrefable;
#endif
{
s{
struct xref *old;
struct xref *xref;
char *buffer;

17
cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c
View file

@ -107,17 +107,7 @@ int m_findact(elt, array)
}
/* Recursive procedure called by findact() to search m_action */
#if defined(M_PROTO)
void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild)
#else
void m_findchain(stackptr, start, chainin, chainout, index, wild)
M_PARSE *stackptr;
int start;
int chainin;
int *chainout;
int *index;
LOGICAL wild;
#endif
{
int node;
M_PARSE *stackp;
@ -241,14 +231,7 @@ void m_strtaction(m_elt)
}
/* Output a start-string or end-string */
#if defined(M_PROTO)
void m_textout(char *format, LOGICAL start, LOGICAL end)
#else
void m_textout(format, start, end)
char *format;
LOGICAL start;
LOGICAL end;
#endif
{
M_WCHAR name[M_NAMELEN + 1];
int i, par;

8
cde/programs/dthelp/parser.ccdf/htag/parser/cyclent.c
View file

@ -36,15 +36,7 @@
#include "parser.h"
#include "entext.h"
#if defined(M_PROTO)
M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, unsigned char *wheredef)
#else
M_WCHAR *m_cyclent(init, type, content, wheredef)
LOGICAL init ;
unsigned char *type ;
M_WCHAR **content ;
unsigned char *wheredef ;
#endif
{
static M_TRIE *current ;
static M_TRIE *ancestor[M_NAMELEN + 1] ;

6
cde/programs/dthelp/parser.ccdf/htag/parser/entity.c
View file

@ -43,13 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
#include "entext.h"
/* Process the name in a usemap delaration */
#if defined(M_PROTO)
void m_ckmap(M_WCHAR *name, LOGICAL useoradd)
#else
void m_ckmap(name, useoradd)
M_WCHAR *name ;
LOGICAL useoradd ;
#endif
{
int mapid ;

69
cde/programs/dthelp/parser.ccdf/htag/parser/error.c
View file

@ -52,15 +52,9 @@ void m_error(text)
}
/* Issue error message (one argument) */
#if defined(M_PROTO)
void m_err1(
const char *text,
const M_WCHAR *arg)
#else
void m_err1(text, arg)
char *text;
M_WCHAR *arg;
#endif
{
char *buffer, *mb_arg;
@ -77,15 +71,9 @@ m_esuffix();
}
#if defined(M_PROTO)
void m_mberr1(
const char *text,
const char *arg)
#else
void m_err1(text, arg)
char *text;
char *arg;
#endif
{
M_WCHAR *wc_arg;
@ -95,17 +83,10 @@ void m_err1(text, arg)
}
/* Issue error message (two arguments) */
#if defined(M_PROTO)
void m_err2(
const char *text,
const M_WCHAR *arg1,
const M_WCHAR *arg2)
#else
void m_err2(text, arg1, arg2)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
#endif
{
char *buffer;
char *mb_arg1,*mb_arg2;
@ -126,19 +107,11 @@ void m_err2(text, arg1, arg2)
}
/* Issue error message (three arguments) */
#if defined(M_PROTO)
void m_err3(
char *text,
M_WCHAR *arg1,
M_WCHAR *arg2,
M_WCHAR *arg3)
#else
void m_err3(text, arg1, arg2, arg3)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2, *mb_arg3;
@ -164,21 +137,12 @@ void m_err3(text, arg1, arg2, arg3)
}
/* Issue error message (four arguments) */
#if defined(M_PROTO)
void m_err4(
char *text,
M_WCHAR *arg1,
M_WCHAR *arg2,
M_WCHAR *arg3,
M_WCHAR *arg4)
#else
void m_err4(text, arg1, arg2, arg3, arg4)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
M_WCHAR *arg4;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2,*mb_arg3,*mb_arg4;
@ -207,7 +171,6 @@ void m_err4(text, arg1, arg2, arg3, arg4)
}
/* Issue error message (five arguments) */
#if defined(M_PROTO)
void m_err5(
char *text,
M_WCHAR *arg1,
@ -215,15 +178,6 @@ void m_err5(
M_WCHAR *arg3,
M_WCHAR *arg4,
M_WCHAR *arg5)
#else
void m_err5(text, arg1, arg2, arg3, arg4, arg5)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
M_WCHAR *arg4;
M_WCHAR *arg5;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5;
@ -261,7 +215,6 @@ void m_err5(text, arg1, arg2, arg3, arg4, arg5)
}
/* Issue error message (six arguments) */
#if defined(M_PROTO)
void m_err6(
char *text,
M_WCHAR *arg1,
@ -270,16 +223,6 @@ void m_err6(
M_WCHAR *arg4,
M_WCHAR *arg5,
M_WCHAR *arg6)
#else
void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
M_WCHAR *arg4;
M_WCHAR *arg5;
M_WCHAR *arg6;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6;
@ -321,7 +264,6 @@ void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6)
}
/* Issue error message (seven arguments) */
#if defined(M_PROTO)
void m_err7(
char *text,
M_WCHAR *arg1,
@ -331,17 +273,6 @@ void m_err7(
M_WCHAR *arg5,
M_WCHAR *arg6,
M_WCHAR *arg7)
#else
void m_err7(text, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
M_WCHAR *arg4;
M_WCHAR *arg5;
M_WCHAR *arg6;
M_WCHAR *arg7;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6, *mb_arg7;

7
cde/programs/dthelp/parser.ccdf/htag/parser/findpar.c
View file

@ -41,14 +41,7 @@
Returns 0 if elt is not a valid element name, if param is specified
but is not a valid parameter name, or if param is NULL and value is
not a valid value of any of elt's parameters. */
#if defined(M_PROTO)
int m_findpar( const char *elt , const char *param , const M_WCHAR *value )
#else
int m_findpar(elt, param, value)
char *elt ;
char *param ;
M_WCHAR *value ;
#endif /* M_PROTO */
{
M_ELEMENT eltid ;
int par ;

6
cde/programs/dthelp/parser.ccdf/htag/parser/param.c
View file

@ -290,13 +290,7 @@ void m_stkparams(M_NOPAR)
}
/* Update the default of a parameter whose default is #CURRENT */
#if defined(M_PROTO)
void m_updatedefault(const int par , const M_WCHAR *string )
#else
void m_updatedefault(par, string)
int par ;
M_WCHAR *string ;
#endif /* M_PROTO */
{
if (m_parameter[par - 1].deftype != M_CURRENT &&
m_parameter[par - 1].deftype != M_CHANGEDCUR) return ;

2
cde/programs/dthelp/parser.ccdf/htag/parser/parser.h
View file

@ -345,8 +345,6 @@ M_PAREXTERN int m_wsused ;
/* Temporary pointers to parameter values. Used while scanning start tag
before element is placed on parse stack.*/
M_PAREXTERN
#if defined M_PROTO
#endif
M_WCHAR *m_poccur[
#if defined(M_PARDEF)
M_MAXPAR ? M_MAXPAR : 1

7
cde/programs/dthelp/parser.ccdf/htag/parser/parvalok.c
View file

@ -34,14 +34,7 @@
/* Function callable by interface designers. Returns TRUE if specified value
is a legal value for the indicated parameter of the given element,
FALSE otherwise. */
#if defined(M_PROTO)
LOGICAL m_parvalok( M_WCHAR *elt , M_WCHAR *param , const M_WCHAR *value )
#else
LOGICAL m_parvalok(elt, param, value)
M_WCHAR *elt ;
M_WCHAR *param ;
M_WCHAR *value ;
#endif /* M_PROTO */
{
M_ELEMENT eltid ;
int par ;

1101
cde/programs/dthelp/parser.ccdf/htag/parser/proto.h
View file

File diff suppressed because it is too large Load diff

41
cde/programs/dthelp/parser.ccdf/htag/parser/scan.c
View file

@ -398,12 +398,7 @@ int m_getachar(dchar)
}
/* Reads a name token */
#if defined(M_PROTO)
void m_getname(M_WCHAR first)
#else
void m_getname(first)
M_WCHAR first ;
#endif
{
M_WCHAR *p ;
M_HOLDTYPE dchar ;
@ -645,14 +640,7 @@ void m_litproc(delim)
}
/* Called when a missing tagc delimiter is detected */
#if defined(M_PROTO)
void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start)
#else
void m_missingtagc(c, dchar, start)
int c ;
M_HOLDTYPE dchar ;
LOGICAL start ;
#endif
{
if (! m_wholetag) {
if (start) m_mberr1("Invalid parameter or missing %s", m_tagc);
@ -665,18 +653,8 @@ void m_missingtagc(c, dchar, start)
/* Have found one character in a possible short reference delimiter.
Prepare to look for the next one */
#if defined(M_PROTO)
void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart,
LOGICAL skipblank, unsigned char type)
#else
void m_nextdelimchar(n, i, linestart, newlinestart, skipblank, type)
int *n ;
int i ;
LOGICAL *linestart ;
LOGICAL newlinestart ;
LOGICAL skipblank ;
unsigned char type ;
#endif
{
int k ;
char mb_re,mb_seqchar, mb_rschar;
@ -858,13 +836,7 @@ int m_scan(M_NOPAR)
/* Process explicit or implied USEMAP or ADDMAP */
#if defined(M_PROTO)
void m_setmap(int map, LOGICAL useoradd)
#else
void m_setmap(map, useoradd)
int map ;
LOGICAL useoradd ;
#endif
{
int i ;
int sref ;
@ -1082,13 +1054,7 @@ void m_sigre(M_NOPAR)
/* Returns a context-dependent delimiter string to input stream so
characters can be reread one at a time in another context */
#if defined(M_PROTO)
void m_undodelim(M_WCHAR *delim, LOGICAL flag)
#else
void m_undodelim(delim, flag)
M_WCHAR *delim ;
LOGICAL flag ;
#endif
{
M_WCHAR *p ;
@ -1105,14 +1071,7 @@ void m_undodelim(delim, flag)
/* Place a character on the current input stream. The character may have
been scanned and determined not to be part of the current token or it
may be in the expansion of an entity*/
#if defined(M_PROTO)
void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread)
#else
void m_ungetachar(c, dchar, preread)
int c ;
M_HOLDTYPE dchar ;
LOGICAL preread ;
#endif
{
char buffer[10] ;
int length;

7
cde/programs/dthelp/parser.ccdf/htag/parser/string.c
View file

@ -31,14 +31,7 @@
/* Include generated code */
#include "stfile.c"
#if defined(M_PROTO)
void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END)
#else
void m_stcaction(m_string, M_START, M_END)
M_WCHAR *m_string ;
LOGICAL M_START ;
LOGICAL M_END ;
#endif
{
m_stackpar = m_stacktop->stparam ;
(*m_sttable[m_stacktop->stccase])(m_string, M_START, M_END) ;

25
cde/programs/dthelp/parser.ccdf/htag/parser/struct.c
View file

@ -88,13 +88,7 @@ int m_checkstart(val)
If VAL is not the element at the top of the parse stack, m_ckend
checks to see if the end of VAL can validly end nested
elements as well. */
#if defined(M_PROTO)
LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet)
#else
LOGICAL m_ckend(val, neednet)
M_ELEMENT val ;
LOGICAL neednet ;
#endif
{
M_PARSE *stackptr ;
M_OPENFSA *fsastack ;
@ -423,14 +417,7 @@ void m_pop(M_NOPAR)
/* Pushes a new item onto the parse stack, setting its element, current,
and neednet fields as indicated by the parameters*/
#if defined(M_PROTO)
void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need)
#else
void m_push(elt, current, need)
M_ELEMENT elt ;
M_STATE current ;
LOGICAL need ;
#endif
{
M_PARSE *newstack ;
@ -651,13 +638,7 @@ LOGICAL m_strtproc(scanval)
}
/* Processes explicit or implied start tag*/
#if defined(M_PROTO)
void m_strttag(M_ELEMENT val, LOGICAL net)
#else
void m_strttag(val, net)
M_ELEMENT val ;
LOGICAL net ;
#endif
{
m_transition(val, TRUE) ;
if (val) {
@ -723,13 +704,7 @@ LOGICAL m_textpermitted(M_NOPAR)
/* Returns TRUE iff LABEL allowed in the current state of the current
element (without expanding any minimization). May result in changes
to the stack of FSA's for this element if and-groups open or close. */
#if defined(M_PROTO)
LOGICAL m_transition(M_ELEMENT label, LOGICAL recur)
#else
LOGICAL m_transition(label, recur)
M_ELEMENT label ;
LOGICAL recur ;
#endif
{
M_ARC parc ;
M_OPENFSA *newfsa ;

5
cde/programs/dthelp/parser.ccdf/htag/parser/text.c
View file

@ -36,12 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
#include "tfile.c"
/* When a text character occurs */
#if defined(M_PROTO)
void m_textaction(M_WCHAR m_textchar)
#else
void m_textaction(m_textchar)
M_WCHAR m_textchar ;
#endif
{
char buffer[10] ;
char mb_re;

17
cde/programs/dthelp/parser.ccdf/htag/util/allwhite.c
View file

@ -26,25 +26,12 @@
*/
#include "basic.h"
LOGICAL m_allwhite(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
LOGICAL m_allwhite(const M_WCHAR *string);
LOGICAL m_whitespace(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
LOGICAL m_whitespace(M_WCHAR c);
/* Test if a string contains only white space characters */
#if defined(M_PROTO)
LOGICAL m_allwhite(const M_WCHAR *string )
#else
LOGICAL m_allwhite(string)
M_WCHAR *string ;
#endif /* M_PROTO */
{
const M_WCHAR *p ;

66
cde/programs/dthelp/parser.ccdf/htag/util/basic.h
View file

@ -46,69 +46,23 @@ typedef wchar_t M_WCHAR;
/* For function prototypes */
typedef char * M_POINTER;
#if defined(hpux) || defined(__aix) || defined(sun)
/* Old unix stuff
*#define void int
*#define M_NOPAR
*/
/* New Ansi style */
#define M_PROTO
#define M_NOPAR void
#else
#define M_PROTO
#define M_NOPAR void
#endif
char *MakeMByteString(
#if defined(M_PROTO)
const M_WCHAR *from
#endif
);
char *MakeMByteString(const M_WCHAR *from);
M_WCHAR *MakeWideCharString(
#if defined(M_PROTO)
const char *from
#endif
);
M_WCHAR *MakeWideCharString(const char *from);
int w_strcmp(
#if defined(M_PROTO)
const M_WCHAR *string1, const M_WCHAR *string2
#endif
);
int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2);
M_WCHAR *w_strcpy(
#if defined(M_PROTO)
M_WCHAR *string1, const M_WCHAR *string2
#endif
);
M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2);
M_WCHAR *w_strncpy(
#if defined(M_PROTO)
M_WCHAR *string1, const M_WCHAR *string2, int max
#endif
);
M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max);
int w_strlen(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
);
int w_strlen(const M_WCHAR *string);
M_WCHAR *w_strchr(
#if defined(M_PROTO)
M_WCHAR *string, const M_WCHAR chr
#endif
);
M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr);
M_WCHAR *w_strstr(
#if defined(M_PROTO)
M_WCHAR *string1, M_WCHAR *string2
#endif
);
M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2);
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void *m_malloc(int size, char *msg);

174
cde/programs/dthelp/parser.ccdf/htag/util/cont.h
View file

@ -37,179 +37,63 @@ This product and information is proprietary of Tandem Computers Incorporated.
#define CONTINIT(a)
#endif
void countdown(
#if defined(M_PROTO)
M_TRIE *parent, int *count
#endif
) ;
void countdown(M_TRIE *parent, int *count);
void dumpdlmptr(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void dumpdlmptr(M_NOPAR);
void dumpnode(
#if defined(M_PROTO)
LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)
#endif
) ;
void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc));
void dumptree(
#if defined(M_PROTO)
LOGICAL sparse
#endif
) ;
void dumptree(LOGICAL sparse);
void enterdelim(
#if defined(M_PROTO)
int n
#endif
) ;
void enterdelim(int n);
void m_error(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_error(char *text);
void m_err1(
#if defined(M_PROTO)
char *text, char *arg
#endif
) ;
void m_err1(char *text, char *arg);
void getcode(
#if defined(M_PROTO)
int n
#endif
) ;
void getcode(int n);
void getcolon(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void getcolon(M_NOPAR);
int getcontext(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int getcontext(M_NOPAR);
LOGICAL getdname(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL getdname(M_NOPAR);
void inccon(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void inccon(M_NOPAR);
void incdelim(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void incdelim(M_NOPAR);
void loaddelim(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void loaddelim(M_NOPAR);
int m_lower(
#if defined(M_PROTO)
int c
#endif
) ;
int m_lower(int c);
void main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
void main(int argc, char **argv);
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void *m_malloc(int size, char *msg);
void nextcon(
#if defined(M_PROTO)
LOGICAL sparse
#endif
) ;
void nextcon(LOGICAL sparse);
void m_openchk(
#if defined(M_PROTO)
FILE **ptr, char *name, char *mode
#endif
) ;
void m_openchk(FILE **ptr, char *name, char *mode);
void printval(
#if defined(M_PROTO)
FILE *file, M_TRIE *value
#endif
) ;
void printval(FILE *file, M_TRIE *value);
void prtctxt(
#if defined(M_PROTO)
int column, int value
#endif
) ;
void prtctxt(int column, int value);
int readchar(
#if defined(M_PROTO)
LOGICAL cap
#endif
) ;
int readchar(LOGICAL cap);
void skiptoend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void skiptoend(M_NOPAR);
void unread(
#if defined(M_PROTO)
int c
#endif
) ;
void unread(int c);
int m_upper(
#if defined(M_PROTO)
int c
#endif
) ;
int m_upper(int c);
void warning(
#if defined(M_PROTO)
char *text
#endif
) ;
void warning(char *text);
void warning1(
#if defined(M_PROTO)
char *text, char *arg
#endif
) ;
void warning1(char *text, char *arg);
void warning2(
#if defined(M_PROTO)
char *text, char *arg1, char *arg2
#endif
) ;
void warning2(char *text, char *arg1, char *arg2);
LOGICAL m_whitespace(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
LOGICAL m_whitespace(M_WCHAR c);
#define NOMORE -1

15
cde/programs/dthelp/parser.ccdf/htag/util/conutil.c
View file

@ -55,12 +55,7 @@ void dumpdlmptr(M_NOPAR)
}
/* Output the generated data structures */
#if defined(M_PROTO)
void dumptree(LOGICAL sparse)
#else
void dumptree(sparse)
LOGICAL sparse;
#endif
{
int i, count = 0;
@ -563,12 +558,7 @@ loading = FALSE;
}
/* Output transition matrix */
#if defined(M_PROTO)
void nextcon(LOGICAL sparse)
#else
void nextcon(sparse)
LOGICAL sparse;
#endif
{
int i, j;
int firstinrow;
@ -635,12 +625,7 @@ void prtctxt(column, value)
/* Read the next input character */
#if defined(M_PROTO)
int readchar(LOGICAL cap)
#else
int readchar(cap)
LOGICAL cap;
#endif
{
int c;
M_WCHAR wnl;

10
cde/programs/dthelp/parser.ccdf/htag/util/emptyfil.c
View file

@ -29,15 +29,7 @@
#endif
#include "basic.h"
void main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
void main(argc, argv)
int argc ;
char **argv ;
void main(int argc, char **argv)
{
if (argc != 2) {
fprintf(stderr, "Usage: emptyfil filename\n") ;

23
cde/programs/dthelp/parser.ccdf/htag/util/entout.c
View file

@ -25,23 +25,11 @@
/* Entout has procedures to write generated entity TRIE */
void entptr(
#if defined(M_PROTO)
M_ENTITY *data
#endif
) ;
void entptr(M_ENTITY *data);
char *typetype(
#if defined(M_PROTO)
int n
#endif
) ;
char *typetype(int n);
char *typewhere(
#if defined(M_PROTO)
unsigned char n
#endif
) ;
char *typewhere(unsigned char n);
/* Macro names written to output file */
char xdbuild[] = "M_DBUILD" ;
@ -213,12 +201,7 @@ char *typetype(n)
}
/* Typewhere returns a string indicating where the nth entity was defined.*/
#if defined(M_PROTO)
char *typewhere(unsigned char n)
#else
char *typewhere(n)
unsigned char n ;
#endif
{
switch(n) {
case M_DBUILD: return(xdbuild) ;

175
cde/programs/dthelp/parser.ccdf/htag/util/error.c
View file

@ -33,128 +33,47 @@ extern FILE *m_errfile ;
extern int m_line ;
extern LOGICAL errexit ;
void eprefix(
#if defined(M_PROTO)
LOGICAL flag
#endif
) ;
void eprefix(LOGICAL flag);
void m_errline(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_errline(char *text);
void m_error(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_error(char *text);
void m_err1(
#if defined(M_PROTO)
char *text, const M_WCHAR *arg
#endif
) ;
void m_err1(char *text, const M_WCHAR *arg);
void m_mberr1(
#if defined(M_PROTO)
char *text, const char *arg
#endif
) ;
void m_mberr1(char *text, const char *arg);
void m_err2(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2
#endif
) ;
void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
void m_err3(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
#endif
) ;
void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);
void m_err5(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4,
M_WCHAR *arg5
#endif
) ;
void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4,
M_WCHAR *arg5);
void esuffix(
#if defined(M_PROTO)
void
#endif
) ;
void esuffix(void);
void msgline(
#if defined(M_PROTO)
char *text
#endif
) ;
void msgline(char *text);
void msg1line(
#if defined(M_PROTO)
char *text, char *arg1
#endif
) ;
void msg1line(char *text, char *arg1);
void skiptoend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void skiptoend(M_NOPAR);
void m_wctrace(
#if defined(M_PROTO)
M_WCHAR *text
#endif
) ;
void m_wctrace(M_WCHAR *text);
void m_trace(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_trace(char *text);
void warning(
#if defined(M_PROTO)
char *text
#endif
) ;
void warning(char *text);
void warning1(
#if defined(M_PROTO)
char *text, M_WCHAR *arg
#endif
) ;
void warning1(char *text, M_WCHAR *arg);
void warning2(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2
#endif
) ;
void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2);
void warning3(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
#endif
) ;
void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);
void warning4(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4
#endif
) ;
void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4);
/* Write error message prefix */
#if defined(M_PROTO)
void eprefix(LOGICAL flag)
#else
void eprefix(flag)
LOGICAL flag ;
#endif
{
if (flag) errexit = TRUE ;
fprintf(stderr, "\n**** ") ;
@ -184,13 +103,7 @@ void m_error(text)
/* Writes an error message with one argument to standard error and file
"error" */
#if defined(M_PROTO)
void m_err1(char *text, const M_WCHAR *arg)
#else
void m_err1(text, arg)
char *text;
M_WCHAR *arg ;
#endif
{
char *mb_arg;
@ -203,13 +116,7 @@ skiptoend() ;
m_free(mb_arg,"multi-byte string");
}
#if defined(M_PROTO)
void m_mberr1(char *text, const char *arg)
#else
void m_err1(text, arg)
char *text;
char *arg ;
#endif
{
eprefix(TRUE) ;
fprintf(stderr, text, arg) ;
@ -220,13 +127,7 @@ skiptoend() ;
/* Writes an error message with two arguments to standard error and file
"error" */
#if defined(M_PROTO)
void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2)
#else
void m_err2(text, arg1, arg2)
char *text;
M_WCHAR *arg1, *arg2 ;
#endif
{
char *mb_arg1, *mb_arg2;
@ -243,13 +144,7 @@ m_free(mb_arg2,"multi-byte string");
/* Writes an error message with three arguments to standard error and file
"error" */
#if defined(M_PROTO)
void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3)
#else
void m_err3(text, arg1, arg2, arg3)
char *text;
M_WCHAR *arg1, *arg2, *arg3 ;
#endif
{
char *mb_arg1, *mb_arg2, *mb_arg3;
@ -268,14 +163,8 @@ m_free(mb_arg3,"multi-byte string");
/* Writes an error message with five arguments to standard error and file
"error" */
#if defined(M_PROTO)
void m_err5( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3,
M_WCHAR *arg4, M_WCHAR *arg5)
#else
void m_err5(text, arg1, arg2, arg3, arg4, arg5)
char *text;
M_WCHAR *arg1, *arg2, *arg3, *arg4, *arg5 ;
#endif
{
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5;
@ -347,13 +236,7 @@ void warning(text)
/* Writes a nonfatal error message with one argument to standard error
and file "error" */
#if defined(M_PROTO)
void warning1( char *text, M_WCHAR *arg)
#else
void warning1(text, arg)
char *text;
M_WCHAR *arg ;
#endif
{
char *mb_arg;
@ -367,13 +250,7 @@ m_free(mb_arg,"multi-byte string");
/* Writes a nonfatal error message with two arguments to standard error
and file "error" */
#if defined(M_PROTO)
void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2)
#else
void warning2(text, arg1, arg2)
char *text;
M_WCHAR *arg1, *arg2 ;
#endif
{
char *mb_arg1, *mb_arg2;
@ -389,13 +266,7 @@ m_free(mb_arg2,"multi-byte string");
/* Writes a nonfatal error message with three arguments to standard error
and file "error" */
#if defined(M_PROTO)
void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3)
#else
void warning3(text, arg1, arg2, arg3)
char *text;
M_WCHAR *arg1, *arg2, *arg3 ;
#endif
{
char *mb_arg1, *mb_arg2, *mb_arg3;
@ -413,14 +284,8 @@ m_free(mb_arg3,"multi-byte string");
/* Writes a nonfatal error message with four arguments to standard error
and file "error" */
#if defined(M_PROTO)
void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3,
M_WCHAR *arg4)
#else
void warning4(text, arg1, arg2, arg3, arg4)
char *text;
M_WCHAR *arg1, *arg2, *arg3, *arg4 ;
#endif
{
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4;

6
cde/programs/dthelp/parser.ccdf/htag/util/exit.c
View file

@ -30,11 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
#endif
#include "basic.h"
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_exit(int status);
/* Exit function called by utilities used in PARSER and other programs in
the MARKUP system */

18
cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c
View file

@ -58,23 +58,11 @@ struct data {
char linedir[] = "#line" ;
char *p = linedir, *q = linedir + 1 ;
void main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
void main(int argc, char **argv);
void copyfile(
#if defined(m_proto)
char *pfile1, char *pfile2
#endif
) ;
void copyfile(char *pfile1, char *pfile2);
int nextchar(
#if defined (M_PROTO)
FILE *file, struct data *data
#endif
) ;
int nextchar(FILE *file, struct data *data);
void main(argc, argv)
int argc ;

18
cde/programs/dthelp/parser.ccdf/htag/util/inctest.c
View file

@ -30,23 +30,11 @@
#endif
#include "basic.h"
void m_err1(
#if defined(M_PROTO)
const char *text, const char *arg
#endif
) ;
void m_err1(const char *text, const char *arg);
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_exit(int status);
void m_inctest(
#if defined(M_PROTO)
int *count, int limit, char *message
#endif
) ;
void m_inctest(int *count, int limit, char *message);
/* Increment a count and test against a limit */
void m_inctest(count, limit, message)

6
cde/programs/dthelp/parser.ccdf/htag/util/initct.c
View file

@ -29,11 +29,7 @@
#include "common.h"
extern char m_chartype[M_CHARSETLEN] ;
void m_initctype(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_initctype(M_NOPAR);
void m_initctype(M_NOPAR)
{

12
cde/programs/dthelp/parser.ccdf/htag/util/itoa.c
View file

@ -27,17 +27,9 @@
#include <string.h>
#include "basic.h"
char *m_itoa(
#if defined(M_PROTO)
int n, char *s
#endif
) ;
char *m_itoa(int n, char *s);
void reverse(
#if defined(M_PROTO)
char *s
#endif
) ;
void reverse(char *s);
char *m_itoa(n, s) /* convert n to characters in s */
char s[];

11
cde/programs/dthelp/parser.ccdf/htag/util/letter.c
View file

@ -27,18 +27,7 @@
#include "basic.h"
LOGICAL m_letter(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
#if defined(M_PROTO)
LOGICAL m_letter(M_WCHAR c)
#else
LOGICAL m_letter(c)
M_WCHAR c ;
#endif
{
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) return(TRUE) ;
return(FALSE) ;

11
cde/programs/dthelp/parser.ccdf/htag/util/lower.c
View file

@ -27,17 +27,8 @@
#include "basic.h"
int m_lower(
#if defined(M_PROTO)
int c
#endif
) ;
/* Force a letter to lowercase */
int m_lower(c)
int c ;
int m_lower(int c)
{
if (c >= 'A' && c <= 'Z') c += 'a' - 'A' ;
return(c) ;

48
cde/programs/dthelp/parser.ccdf/htag/util/malloc.c
View file

@ -36,53 +36,21 @@
extern LOGICAL m_heapchk ;
extern LOGICAL m_malftrace ;
void m_errline(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_errline(char *text);
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_exit(int status);
void m_free(
#if defined(M_PROTO)
void *block, char *msg
#endif
) ;
void m_free(void *block, char *msg);
void m_heapdump(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_heapdump(M_NOPAR);
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void *m_malloc(int size, char *msg);
void *m_realloc(
#if defined(M_PROTO)
void *ptr, int size, char *msg
#endif
) ;
void *m_realloc(void *ptr, int size, char *msg);
void *m_trace(
#if defined(M_PROTO)
char *text
#endif
) ;
void *m_trace(char *text);
void *m_wctrace(
#if defined(M_PROTO)
M_WCHAR *text
#endif
) ;
void *m_wctrace(M_WCHAR *text);
void m_free(block, msg)
void *block ;

16
cde/programs/dthelp/parser.ccdf/htag/util/openchk.c
View file

@ -33,22 +33,12 @@
extern FILE *m_errfile ;
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_exit(int status);
void m_openchk(
#if defined(M_PROTO)
FILE **ptr, char *name, char *mode
#endif
) ;
void m_openchk(FILE **ptr, char *name, char *mode);
/* Open a file and check that the open succeeded */
void m_openchk(ptr, name, mode)
FILE **ptr ;
char *name, *mode ;
void m_openchk(FILE **ptrm, char *name, char *mode)
{
*ptr = fopen(name, mode) ;
if (*ptr) return ;

6
cde/programs/dthelp/parser.ccdf/htag/util/paramu.c
View file

@ -33,13 +33,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
/* Check to see if string is a valid value for parameter par. If so
return a pointer to the keyword if it's a keyword parameter and otherwise
a pointer to string. If not valid, return FALSE. */
#if defined(M_PROTO)
const M_WCHAR *m_partype(const int par , const M_WCHAR *string )
#else
M_WCHAR *m_partype(par, string)
int par ;
M_WCHAR *string ;
#endif /* M_PROTO */
{
LOGICAL first = TRUE ;
int kw ;

6
cde/programs/dthelp/parser.ccdf/htag/util/sparse.h
View file

@ -29,11 +29,7 @@
#if defined(sparse)
#define m_newcon(i, j) m_sprscon(i, j)
int m_sprscon(
#if defined(M_PROTO)
int i, int j
#endif
) ;
int m_sprscon(int i, int j);
#else
#define m_newcon(i, j) m_nextcon[i][j]

29
cde/programs/dthelp/parser.ccdf/htag/util/trie.c
View file

@ -45,26 +45,12 @@ extern FILE *m_errfile ;
extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ;
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void *m_malloc(int size, char *msg);
void m_entercharintrie(
#if defined(M_PROTO)
M_TRIE **currentnode, M_WCHAR c
#endif
) ;
void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c);
/* Enters the next character of a string into a trie */
#if defined(M_PROTO)
void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c)
#else
void m_entercharintrie(currentnode, c)
M_TRIE **currentnode ;
M_WCHAR c ;
#endif
{
M_TRIE *newnode ;
@ -112,13 +98,7 @@ M_TRIE *m_gettrienode(M_NOPAR)
/* M_lookfortrie(p, xtrie) looks for string p in the specified trie,
returning its data value if found and otherwise FALSE */
#if defined(M_PROTO)
void *m_lookfortrie( const M_WCHAR *p , const M_TRIE *xtrie )
#else
void *m_lookfortrie(p, xtrie)
M_WCHAR *p ;
M_TRIE *xtrie ;
#endif /* M_PROTO */
{
M_TRIE *currentnode ;
@ -141,10 +121,7 @@ void *m_lookfortrie(p, xtrie)
}
/* Enters a string and associated data value into a trie */
void *m_ntrtrie(p, xtrie, dataval)
M_WCHAR *p ;
M_TRIE *xtrie ;
void *dataval ;
void *m_ntrtrie(M_WCHAR *p, M_TRIE *xtrie, void *dataval)
{
M_TRIE *currentnode ;
void *n ;

24
cde/programs/dthelp/parser.ccdf/htag/util/trie.h
View file

@ -51,26 +51,10 @@ struct m_ptrie {
} ;
M_TRIE *m_gettrienode(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
M_TRIE *m_gettrienode(M_NOPAR);
void *m_lookfortrie(
#if defined(M_PROTO)
const M_WCHAR *p, const M_TRIE *xtrie
#endif
) ;
void *m_lookfortrie(const M_WCHAR *p, const M_TRIE *xtrie);
void *m_ntrtrie(
#if defined(M_PROTO)
M_WCHAR *p, M_TRIE *xtrie, void *dataval
#endif
) ;
void *m_ntrtrie(M_WCHAR *p, M_TRIE *xtrie, void *dataval);
void *m_resettrie(
#if defined(M_PROTO)
M_TRIE *xtrie, M_WCHAR *p, void *value
#endif
) ;
void *m_resettrie(M_TRIE *xtrie, M_WCHAR *p, void *value);

27
cde/programs/dthelp/parser.ccdf/htag/util/triecnt.c
View file

@ -31,24 +31,12 @@
#include "basic.h"
#include "trie.h"
void countdown(
#if defined(M_PROTO)
M_TRIE *parent, int *count
#endif
) ;
void countdown(M_TRIE *parent, int *count);
void dumpnode(
#if defined(M_PROTO)
LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count,
void (*proc)(FILE *file, void *value)
#endif
) ;
void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count,
void (*proc)(FILE *file, void *value));
void printval(
#if defined(M_PROTO)
FILE *file, void *value
#endif
) ;
void printval(FILE *file, void *value);
/* Count the descendants of a node in order to generate declarations for
the packed form of a trie*/
@ -71,12 +59,7 @@ void dumpnode(first, file, trieptr, count, proc)
FILE *file ;
M_TRIE *trieptr ;
int *count ;
void (*proc) (
#if defined (M_PROTO)
FILE *file,
void *value
#endif
) ;
void (*proc) (FILE *file, void *value);
{
M_TRIE *p ;
int savecount ;

20
cde/programs/dthelp/parser.ccdf/htag/util/triedump.c
View file

@ -29,18 +29,10 @@
#include "basic.h"
#include "trie.h"
void countdown(
#if defined(M_PROTO)
M_TRIE *parent, int *count
#endif
) ;
void countdown(M_TRIE *parent, int *count);
void m_dumptrie(
#if defined(M_PROTO)
FILE *file, M_TRIE *xtrie, char *extname, int *count,
void (*proc)(void *value)
#endif
) ;
void m_dumptrie(FILE *file, M_TRIE *xtrie, char *extname, int *count,
void (*proc)(void *value));
/* Write the C declaration of a trie */
void m_dumptrie(file, xtrie, extname, count, proc)
@ -48,11 +40,7 @@ void m_dumptrie(file, xtrie, extname, count, proc)
M_TRIE *xtrie ;
char *extname ;
int *count ;
void (*proc)(
#if defined(M_PROTO)
void *value
#endif
) ;
void (*proc)(void *value);
{
int firstson ;
M_TRIE *p ;

29
cde/programs/dthelp/parser.ccdf/htag/util/triepdmp.c
View file

@ -29,25 +29,13 @@
#include "basic.h"
#include "trie.h"
void countdown(
#if defined(M_PROTO)
M_TRIE *parent, int *count
#endif
) ;
void countdown(M_TRIE *parent, int *count);
void dumpnode(
#if defined(M_PROTO)
LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count,
void (*proc)(FILE *file, void *value)
#endif
) ;
void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count,
void (*proc)(FILE *file, void *value));
void dumpptrie(
#if defined(M_PROTO)
M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef,
void (*proc)(FILE *file, void *value)
#endif
) ;
void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef,
void (*proc)(FILE *file, void *value));
/* Write the declaration of a packed trie to the specified files */
void dumpptrie(intname, extname, file, externdef, defdef, proc)
@ -56,12 +44,7 @@ void dumpptrie(intname, extname, file, externdef, defdef, proc)
FILE *file ;
char *externdef ;
char *defdef ;
void (*proc) (
#if defined (M_PROTO)
FILE *file,
void *value
#endif
) ;
void (*proc) (FILE *file, void *value);
{
LOGICAL first = TRUE ;
int count = 0 ;

11
cde/programs/dthelp/parser.ccdf/htag/util/trieplk.c
View file

@ -36,17 +36,10 @@
extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ;
int m_packedlook(
#if defined(M_PROTO)
M_PTRIE *xptrie,
M_WCHAR *name
#endif
) ;
int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name);
/* Look for the string NAME in the packed trie PTRIE */
int m_packedlook(xptrie, name)
M_PTRIE *xptrie ;
M_WCHAR *name ;
int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name)
{
int current = 0 ;
int i ;

35
cde/programs/dthelp/parser.ccdf/htag/util/upcmp8.c
View file

@ -32,30 +32,13 @@
#include "common.h"
extern M_CHARTYPE m_ctarray[256] ;
int m_wcupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const M_WCHAR *q
#endif
) ;
int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q);
int m_wcmbupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const char *q
#endif
) ;
int m_wcmbupstrcmp(const M_WCHAR *p, const char *q);
int m_mbmbupstrcmp(
#if defined(M_PROTO)
const char *p, const char *q
#endif
) ;
int m_mbmbupstrcmp(const char *p, const char *q);
#if defined(M_PROTO)
int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q )
#else
int m_wcupstrcmp(p, q)
M_WCHAR *p, *q ;
#endif /* M_PROTO */
{
do {
if (m_ctupper(*p) < m_ctupper(*q)) return(-1) ;
@ -65,13 +48,7 @@ int m_wcupstrcmp(p, q)
return(0) ;
}
#if defined(M_PROTO)
int m_wcmbupstrcmp(const M_WCHAR *p, const char *q)
#else
int m_wcmbupstrcmp(p, q)
M_WCHAR *p;
char *q ;
#endif
{
M_WCHAR *wc;
int retval;
@ -82,13 +59,7 @@ int m_wcmbupstrcmp(p, q)
return retval;
}
#if defined(M_PROTO)
int m_mbmbupstrcmp(const char *p, const char *q)
#else
int m_mbmbupstrcmp(p, q)
char *p;
char *q ;
#endif
{
M_WCHAR *w_p, *w_q;
int retval;

9
cde/programs/dthelp/parser.ccdf/htag/util/upper.c
View file

@ -29,14 +29,7 @@
#include "basic.h"
int m_upper(
#if defined(M_PROTO)
int c
#endif
) ;
int m_upper(c)
int c ;
int m_upper(int c)
{
if (c >= 'a' && c <= 'z') c += 'A' - 'a' ;
return(c) ;

12
cde/programs/dthelp/parser.ccdf/htag/util/upstrcmp.c
View file

@ -29,17 +29,9 @@
#include "basic.h"
int m_upper(
#if defined(M_PROTO)
int c
#endif
) ;
int m_upper(int c);
int m_upstrcmp(
#if defined(M_PROTO)
char *p, char *q
#endif
) ;
int m_upstrcmp(char *p, char *q);
int m_upstrcmp(p, q)
char *p, *q ;

44
cde/programs/dthelp/parser.ccdf/htag/util/wchar.c
View file

@ -30,13 +30,7 @@
/* compare two wide character strings */
#if defined(M_PROTO)
int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2)
#else
int w_strcmp(string1, string2)
M_WCHAR *string1;
M_WCHAR *string2;
#endif
{
M_WCHAR c1, c2, null;
@ -58,13 +52,7 @@ while (1)
/* copy a wide character string */
#if defined(M_PROTO)
M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2)
#else
M_WCHAR *w_strcpy(string1, string2)
M_WCHAR *string1;
M_WCHAR *string2;
#endif
{
M_WCHAR *string1start;
@ -77,14 +65,7 @@ return string1start;
/* copy a wide character string, stopping after "max" moves */
#if defined(M_PROTO)
M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max)
#else
M_WCHAR *w_strncpy(string1, string2, max)
M_WCHAR *string1;
M_WCHAR *string2;
int max;
#endif
{
M_WCHAR *string1start;
@ -97,12 +78,7 @@ return string1start;
/* get the length of a wide character string */
#if defined(M_PROTO)
int w_strlen(const M_WCHAR *string)
#else
int w_strlen(string)
M_WCHAR *string;
#endif
{
int length;
@ -115,12 +91,7 @@ return length;
/* find wide character "chr" in wide string "string" */
#if defined(M_PROTO)
M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr)
#else
M_WCHAR *w_strchr(string, chr)
M_WCHAR *string, chr;
#endif
{
M_WCHAR *where;
@ -140,12 +111,7 @@ else
/* find wide character "chr" in wide string "string" */
#if defined(M_PROTO)
M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2)
#else
M_WCHAR *w_strstr(string1, string2)
M_WCHAR *string1, *string2;
#endif
{
M_WCHAR *where1, *where2;
@ -180,12 +146,7 @@ return NULL;
/* make a multi-byte string from a wide character string */
#if defined(M_PROTO)
char *MakeMByteString(const M_WCHAR *wc_string)
#else
char *MakeMByteString(wc_string)
M_WCHAR *wc_string;
#endif
{
char *mb_string;
int length;
@ -210,12 +171,7 @@ return mb_string;
/* make a wide character string from a multi-byte string */
#if defined(M_PROTO)
M_WCHAR *MakeWideCharString(const char *mb_string)
#else
M_WCHAR *MakeWideCharString(mb_string)
char *mb_string;
#endif
{
M_WCHAR *wc_string, *wc_stringStart;
int length, incr;

11
cde/programs/dthelp/parser.ccdf/htag/util/whitesp.c
View file

@ -27,19 +27,8 @@
#include "basic.h"
LOGICAL m_whitespace(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
/* Test if character c is a blank, tab, or carriage return */
#if defined(M_PROTO)
LOGICAL m_whitespace(M_WCHAR c)
#else
LOGICAL m_whitespace(c)
M_WCHAR c ;
#endif
{
char mb_c[32]; /* arbitrarily large */
int length;

6
cde/programs/dthelp/parser/canon1/build/build.h
View file

@ -421,8 +421,4 @@ BUILDEXTERN LOGICAL entrule BUILDINIT(FALSE) ;
BUILDEXTERN M_WCHAR genname[M_NAMELEN + sizeof(M_PREFIX)] ;
M_WCHAR *MakeWideCharString(
#if defined(M_PROTO)
const char *from
#endif
);
M_WCHAR *MakeWideCharString(const char *from);

16
cde/programs/dthelp/parser/canon1/build/fsa.c
View file

@ -37,18 +37,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
/* Addarc adds an arc from FSA state <from> to state <to> setting other
fields as indicated by the other parameters.*/
#if defined(M_PROTO)
int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional, int id, LOGICAL minim, ELTSTRUCT **errelt)
#else
int addarc(from, to, label, and, optional, id, minim, errelt)
STATE *from, *to ;
ELTSTRUCT *label ;
ANDGROUP *and ;
LOGICAL optional ;
int id ;
LOGICAL minim ;
ELTSTRUCT **errelt ;
#endif
{
ARC *parc, *qarc ;
int determ ;
@ -630,12 +619,7 @@ LOGICAL samelabelarc(a, s)
/* Saves the name of an element appearing on the left-hand side of a
grammar rule */
#if defined(M_PROTO)
void savelhs(LOGICAL param)
#else
void savelhs(param)
LOGICAL param ;
#endif
{
STATE *end ;
ELTSTRUCT *errelt ;

15
cde/programs/dthelp/parser/canon1/build/param.c
View file

@ -124,12 +124,7 @@ newpar->ptypep = NULL ;
/* Check that specified default value is legal parameter value */
#if defined(M_PROTO)
LOGICAL checkdefault( const M_WCHAR *string )
#else
LOGICAL checkdefault(string)
M_WCHAR *string ;
#endif /* M_PROTO */
{
const M_WCHAR *p ;
int len ;
@ -205,12 +200,7 @@ switch (newpar->type)
/* Normalize parameter default. Change tabs and RE's to spaces, capitalize
all letters (unless type is CDATA), remove extra space in lists */
#if defined(M_PROTO)
void normdefault(M_WCHAR *string )
#else
void normdefault(string)
M_WCHAR *string ;
#endif /* M_PROTO */
{
M_WCHAR *p, *q ;
int i, ret ;
@ -296,12 +286,7 @@ ruleinit() ;
}
/* Make string the default for the current parameter of the current element */
#if defined(M_PROTO)
void setdefault(const M_WCHAR *string)
#else
void setdefault()
M_WCHAR *string;
#endif /* M_PROTO */
{
PTYPE *kw ;
int keycount ;

726
cde/programs/dthelp/parser/canon1/build/proto.h
View file

@ -28,587 +28,203 @@
/* Proto.h contains function prototypes for program BUILD. */
int addarc(
#if defined(M_PROTO)
STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional,
int id, LOGICAL minim, ELTSTRUCT **errelt
#endif
) ;
int addarc(STATE *from, STATE *to, ELTSTRUCT *label, ANDGROUP *and, LOGICAL optional,
int id, LOGICAL minim, ELTSTRUCT **errelt);
void adddefent(
#if defined(M_PROTO)
M_WCHAR *mapname
#endif
) ;
void adddefent(M_WCHAR *mapname);
LOGICAL addent(
#if defined(M_PROTO)
M_WCHAR *name
#endif
) ;
LOGICAL addent(M_WCHAR *name);
void addex(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void addex(M_NOPAR);
void addkeyword(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void addkeyword(M_NOPAR);
LOGICAL addmapname(
#if defined(M_PROTO)
M_WCHAR *p, LOGICAL define
#endif
) ;
LOGICAL addmapname(M_WCHAR *p, LOGICAL define);
void addndent(
#if defined(M_PROTO)
M_WCHAR *p
#endif
) ;
void addndent(M_WCHAR *p);
void addpar(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void addpar(M_NOPAR);
void addsref(
#if defined(M_PROTO)
M_WCHAR *p
#endif
) ;
void addsref(M_WCHAR *p);
LOGICAL m_allwhite(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
LOGICAL m_allwhite(const M_WCHAR *string);
void checkand(
#if defined(M_PROTO)
ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root,
ELTSTRUCT **errelt
#endif
) ;
void checkand(ANDGROUP *andstart, ANDGROUP *andptr, STATE *start, TREE *root,
ELTSTRUCT **errelt);
LOGICAL checkdefault(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
LOGICAL checkdefault(const M_WCHAR *string);
int checkdfsa(
#if defined(M_PROTO)
STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt
#endif
) ;
int checkdfsa(STATE *from, ELTSTRUCT *label, ANDGROUP *and, int id, ELTSTRUCT **errelt);
int checkrepeat(
#if defined(M_PROTO)
STATE *from, ANDGROUP *and, ELTSTRUCT **errelt
#endif
) ;
int checkrepeat(STATE *from, ANDGROUP *and, ELTSTRUCT **errelt);
void copyintolist(
#if defined(M_PROTO)
STATELIST *from, STATELIST **to
#endif
) ;
void copyintolist(STATELIST *from, STATELIST **to);
void countdown(
#if defined(M_PROTO)
M_TRIE *parent, int *count
#endif
) ;
void countdown(M_TRIE *parent, int *count);
void defmapname(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void defmapname(M_NOPAR);
char *deftype(
#if defined(M_PROTO)
int n
#endif
) ;
char *deftype(int n);
void dellist(
#if defined(M_PROTO)
STATELIST **list
#endif
) ;
void dellist(STATELIST **list);
void delstartarcs(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void delstartarcs(M_NOPAR);
void done(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void done(M_NOPAR);
void dumpentnode(
#if defined(M_PROTO)
FILE *file, M_TRIE *value
#endif
) ;
void dumpentnode(FILE *file, M_TRIE *value);
void dumpmapnode(
#if defined(M_PROTO)
FILE *file, M_TRIE *value
#endif
) ;
void dumpmapnode(FILE *file, M_TRIE *value);
void dumpsrefnode(
#if defined(M_PROTO)
FILE *file,
M_TRIE *value
#endif
) ;
void dumpsrefnode(FILE *file,
M_TRIE *value);
void dumpptrie(
#if defined(M_PROTO)
M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef,
void (*proc)( FILE *, M_TRIE *)
#endif
) ;
void dumpptrie(M_TRIE *intname, char *extname, FILE *file, char *externdef, char *defdef,
void (*proc)( FILE *, M_TRIE *));
void m_dumptrie(
#if defined(M_PROTO)
FILE *file,
void m_dumptrie(FILE *file,
M_TRIE *xtrie,
char *extname,
int *count,
void (*proc)(M_ENTITY *)
#endif
) ;
void eltblocks(
#if defined(M_PROTO)
FILE *tempfile
#endif
) ;
void eltreeout(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void endmodel(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void entout(
#if defined(M_PROTO)
char *fname
#endif
) ;
char *enttype(
#if defined(M_PROTO)
int n
#endif
) ;
void m_error(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_err1(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg
#endif
) ;
void m_mberr1(
#if defined(M_PROTO)
char *text, const char *arg
#endif
) ;
void m_err2(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2
#endif
) ;
void exout(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_free(
#if defined(M_PROTO)
void *block, char *msg
#endif
) ;
void freetree(
#if defined(M_PROTO)
TREE *ruletree
#endif
) ;
void found(
#if defined(M_PROTO)
LOGICAL *flag, char *delim
#endif
) ;
void fsa(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int getachar(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
ANDGROUP *getand(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL getname(
#if defined(M_PROTO)
int first
#endif
) ;
STATE *getstate(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int gettoken(
#if defined(M_PROTO)
int *c, int context
#endif
) ;
TREE *gettreenode(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_initctype(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void initialize(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL litproc(
#if defined(M_PROTO)
int delim
#endif
) ;
int main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
void makeand(
#if defined(M_PROTO)
LOGICAL *canbenull, TREE *root, int optional
#endif
) ;
LOGICAL makefsa(
#if defined(M_PROTO)
TREE *root, int optional
#endif
) ;
void makeor(
#if defined(M_PROTO)
LOGICAL *canbenull, TREE *root
#endif
) ;
void makeseq(
#if defined(M_PROTO)
LOGICAL *canbenull, TREE *root, int optional
#endif
) ;
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void msgline(
#if defined(M_PROTO)
char *text
#endif
) ;
void msg1line(
#if defined(M_PROTO)
char *text, char *arg1
#endif
) ;
void nondeterm(
#if defined(M_PROTO)
TREE *root, int c, ELTSTRUCT *eltp
#endif
) ;
void normdefault(
#if defined(M_PROTO)
M_WCHAR *string
#endif
) ;
LOGICAL notinlist(
#if defined(M_PROTO)
STATELIST *item, STATELIST *list
#endif
) ;
ELTSTRUCT *ntrelt(
#if defined(M_PROTO)
M_WCHAR *p
#endif
) ;
void m_openchk(
#if defined(M_PROTO)
FILE **ptr, char *name, char *mode
#endif
) ;
void parout(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
char *partype(
#if defined(M_PROTO)
int n
#endif
) ;
LOGICAL permitspcd(
#if defined(M_PROTO)
ARC *a
#endif
) ;
void pop(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void prulend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void push(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL regenerate(
#if defined(M_PROTO)
TREE *start, TREE *stop
#endif
) ;
void repeat(
#if defined(M_PROTO)
TREE *root
#endif
) ;
void ruleinit(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void rulend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL samelabelarc(
#if defined(M_PROTO)
ARC *a, STATE *s
#endif
) ;
void savelhs(
#if defined(M_PROTO)
LOGICAL param
#endif
) ;
void savestartarcs(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int scan(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void setdefault(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
void simplebranch(
#if defined(M_PROTO)
TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional
#endif
) ;
void skiptoend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int m_sprscon(
#if defined(M_PROTO)
int i, int j
#endif
) ;
void srefout(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
STATE *startfsa(
#if defined(M_PROTO)
TREE *root, LOGICAL *canbenull
#endif
) ;
void tempelt(
#if defined(M_PROTO)
ELTSTRUCT *eltp, FILE *tempfile
#endif
) ;
void template(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
char *typecon(
#if defined(M_PROTO)
int n
#endif
) ;
void undodelim(
#if defined(M_PROTO)
M_WCHAR *delim
#endif
) ;
void ungetachar(
#if defined(M_PROTO)
int c
#endif
) ;
int m_wcupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const M_WCHAR *q
#endif
) ;
int m_wcmbupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const char *q
#endif
) ;
int m_mbmbupstrcmp(
#if defined(M_PROTO)
const char *p, const char *q
#endif
) ;
void warning(
#if defined(M_PROTO)
char *text
#endif
) ;
void warning1(
#if defined(M_PROTO)
char *text, M_WCHAR *arg
#endif
) ;
void warning2(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2
#endif
) ;
void warning3(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
#endif
) ;
void warning4(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4
#endif
) ;
LOGICAL m_whitespace(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
void (*proc)(M_ENTITY *));
void eltblocks(FILE *tempfile);
void eltreeout(M_NOPAR);
void endmodel(M_NOPAR);
void entout(char *fname);
char *enttype(int n);
void m_error(char *text);
void m_err1(const char *text, const M_WCHAR *arg);
void m_mberr1(char *text, const char *arg);
void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
void exout(M_NOPAR);
void m_free(void *block, char *msg);
void freetree(TREE *ruletree);
void found(LOGICAL *flag, char *delim);
void fsa(M_NOPAR);
int getachar(M_NOPAR);
ANDGROUP *getand(M_NOPAR);
LOGICAL getname(int first);
STATE *getstate(M_NOPAR);
int gettoken(int *c, int context);
TREE *gettreenode(M_NOPAR);
void m_initctype(M_NOPAR);
void initialize(M_NOPAR);
LOGICAL litproc(int delim);
int main(int argc, char **argv);
void makeand(LOGICAL *canbenull, TREE *root, int optional);
LOGICAL makefsa(TREE *root, int optional);
void makeor(LOGICAL *canbenull, TREE *root);
void makeseq(LOGICAL *canbenull, TREE *root, int optional);
void *m_malloc(int size, char *msg);
void msgline(char *text);
void msg1line(char *text, char *arg1);
void nondeterm(TREE *root, int c, ELTSTRUCT *eltp);
void normdefault(M_WCHAR *string);
LOGICAL notinlist(STATELIST *item, STATELIST *list);
ELTSTRUCT *ntrelt(M_WCHAR *p);
void m_openchk(FILE **ptr, char *name, char *mode);
void parout(M_NOPAR);
char *partype(int n);
LOGICAL permitspcd(ARC *a);
void pop(M_NOPAR);
void prulend(M_NOPAR);
void push(M_NOPAR);
LOGICAL regenerate(TREE *start, TREE *stop);
void repeat(TREE *root);
void ruleinit(M_NOPAR);
void rulend(M_NOPAR);
LOGICAL samelabelarc(ARC *a, STATE *s);
void savelhs(LOGICAL param);
void savestartarcs(M_NOPAR);
int scan(M_NOPAR);
void setdefault(const M_WCHAR *string);
void simplebranch(TREE *root, ELTSTRUCT *value, ANDGROUP *group, int optional);
void skiptoend(M_NOPAR);
int m_sprscon(int i, int j);
void srefout(M_NOPAR);
STATE *startfsa(TREE *root, LOGICAL *canbenull);
void tempelt(ELTSTRUCT *eltp, FILE *tempfile);
void template(M_NOPAR);
char *typecon(int n);
void undodelim(M_WCHAR *delim);
void ungetachar(int c);
int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q);
int m_wcmbupstrcmp(const M_WCHAR *p, const char *q);
int m_mbmbupstrcmp(const char *p, const char *q);
void warning(char *text);
void warning1(char *text, M_WCHAR *arg);
void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2);
void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);
void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4);
LOGICAL m_whitespace(M_WCHAR c);

6
cde/programs/dthelp/parser/canon1/build/sref.c
View file

@ -101,13 +101,7 @@ return(TRUE);
}
/* Add a short reference map name */
#if defined(M_PROTO)
LOGICAL addmapname(M_WCHAR* p, LOGICAL define)
#else
LOGICAL addmapname(p, define)
M_WCHAR *p;
LOGICAL define;
#endif
{
MAP *old;
MAP *new;

31
cde/programs/dthelp/parser/canon1/eltdef/eltutil.c
View file

@ -66,23 +66,14 @@ void actptrout(array, name)
/* Close a code file and write jump table at the end */
#if defined(M_PROTO)
void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto)
#else
void closeiffile(flag, file, count, table, proto)
LOGICAL flag;
FILE *file;
int count;
char *table;
char *proto;
#endif
{
int i;
endcode(flag, file);
if (count) {
fprintf(file,
"void (*m_%stable[])(\n#if defined(M_PROTO)\n %s\n#endif\n ) = {\n",
"void (*m_%stable[])(%s) = {\n",
table, proto);
fprintf(file, " m_%s1, /* Place holder for 1-based indexing */\n",
table);
@ -94,7 +85,7 @@ void closeiffile(flag, file, count, table, proto)
}
else
fprintf(file,
"void (*m_%stable[1])(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n",
"void (*m_%stable[1])(%s) ;\n",
table, proto);
fclose(file);
}
@ -193,13 +184,7 @@ void done(M_NOPAR)
}
/* Called when finished reading a section of code from the input file */
#if defined(M_PROTO)
void endcode(LOGICAL flag, FILE *file)
#else
void endcode(flag, file)
LOGICAL flag;
FILE *file;
#endif
{
if (flag) fprintf(file, "}}\n\n");
}
@ -563,21 +548,13 @@ endcode(*flag, file);
*flag = TRUE;
/* protoype */
fprintf(file,
"void m_%s%d(\n#if defined(M_PROTO)\n %s\n#endif\n ) ;\n",
"void m_%s%d(%s);\n",
prefix,
caseno,
proto);
/* ANSI defines */
fputs("#if defined(M_PROTO)\n", file);
fprintf(file, "void m_%s%d(%s)\n", prefix, caseno, proto);
fputs("#else\n", file);
fprintf(file,
"void m_%s%d(%s)\n%s\n#endif\n {\n", /* balance the "}" */
prefix,
caseno,
formal,
formtype);
fprintf(file, "void m_%s%d(%s)\n {\n", prefix, caseno, proto);
for (cvarp = cvarlist ; cvarp ; cvarp = cvarp->next)
{

330
cde/programs/dthelp/parser/canon1/eltdef/proto.h
View file

@ -28,334 +28,118 @@
/* Proto.h contains function prototypes for program ELTDEF. */
void actptrout(
#if defined(M_PROTO)
ACTION **array, char *name
#endif
) ;
void actptrout(ACTION **array, char *name);
void addent(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void addent(M_NOPAR);
LOGICAL m_allwhite(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
LOGICAL m_allwhite(const M_WCHAR *string);
void closeiffile(
#if defined(M_PROTO)
LOGICAL flag, FILE *file, int count, char *table, char *proto
#endif
) ;
void closeiffile(LOGICAL flag, FILE *file, int count, char *table, char *proto);
void countdown(
#if defined(M_PROTO)
M_TRIE *parent, int *count
#endif
) ;
void countdown(M_TRIE *parent, int *count);
void cvalue(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void cvalue(M_NOPAR);
void done(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void done(M_NOPAR);
void m_dumptrie(
#if defined(M_PROTO)
FILE *file,
void m_dumptrie(FILE *file,
M_TRIE *xtrie,
char *extname,
int *count,
void (*proc)(M_ENTITY *)
#endif
) ;
void (*proc)(M_ENTITY *));
void endcode(
#if defined(M_PROTO)
LOGICAL flag, FILE *file
#endif
) ;
void endcode(LOGICAL flag, FILE *file);
void endini(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void endini(M_NOPAR);
void endsignon(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void endsignon(M_NOPAR);
void endstring(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void endstring(M_NOPAR);
void entout(
#if defined(M_PROTO)
char *fname
#endif
) ;
void entout(char *fname);
void enttype(
#if defined(M_PROTO)
int type
#endif
) ;
void enttype(int type);
void m_error(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_error(char *text);
void m_err1(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg
#endif
) ;
void m_err1(const char *text, const M_WCHAR *arg);
void m_mberr1(
#if defined(M_PROTO)
char *text, const char *arg
#endif
) ;
void m_mberr1(char *text, const char *arg);
void m_err2(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2
#endif
) ;
void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
void m_err3(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
#endif
) ;
void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);
void m_err5(
#if defined(M_PROTO)
char *text,
M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5
#endif
) ;
void m_err5(char *text,
M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4, M_WCHAR *arg5);
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_exit(int status);
void m_free(
#if defined(M_PROTO)
void *block, char *msg
#endif
) ;
void m_free(void *block, char *msg);
void freechain(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void freechain(M_NOPAR);
int getachar(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int getachar(M_NOPAR);
int *getaction(
#if defined(M_PROTO)
ACTION **array
#endif
) ;
int *getaction(ACTION **array);
ACTION *getactstruct(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
ACTION *getactstruct(M_NOPAR);
void getname(
#if defined(M_PROTO)
int first
#endif
) ;
void getname(int first);
int gettoken(
#if defined(M_PROTO)
int *c, int context
#endif
) ;
int gettoken(int *c, int context);
void m_initctype(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_initctype(M_NOPAR);
void initialize(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void initialize(M_NOPAR);
LOGICAL m_letter(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
LOGICAL m_letter(M_WCHAR c);
LOGICAL litproc(
#if defined(M_PROTO)
int delim
#endif
) ;
LOGICAL litproc(int delim);
int main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
int main(int argc, char **argv);
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void *m_malloc(int size, char *msg);
void m_openchk(
#if defined(M_PROTO)
FILE **ptr, char *name, char *mode
#endif
) ;
void m_openchk(FILE **ptr, char *name, char *mode);
void outpval(
#if defined(M_PROTO)
M_TRIE *p
#endif
) ;
void outpval(M_TRIE *p);
void outstring(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void outstring(M_NOPAR);
int m_packedlook(
#if defined(M_PROTO)
M_PTRIE *xptrie, M_WCHAR *name
#endif
) ;
int m_packedlook(M_PTRIE *xptrie, M_WCHAR *name);
const M_WCHAR *m_partype(
#if defined(M_PROTO)
const int par, const M_WCHAR *string
#endif
) ;
const M_WCHAR *m_partype(const int par, const M_WCHAR *string);
int scan(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int scan(M_NOPAR);
void skiptoend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void skiptoend(M_NOPAR);
void startcode(
#if defined(M_PROTO)
int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto,
char *formal, char *formtype
#endif
) ;
void startcode(int caseno, LOGICAL *flag, FILE *file, char *prefix, char *proto,
char *formal, char *formtype);
void startelement(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void startelement(M_NOPAR);
void storecvar(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void storecvar(M_NOPAR);
void storepname(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void storepname(M_NOPAR);
void undodelim(
#if defined(M_PROTO)
M_WCHAR *delim
#endif
) ;
void undodelim(M_WCHAR *delim);
void ungetachar(
#if defined(M_PROTO)
int c
#endif
) ;
void ungetachar(int c);
int m_wcupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const M_WCHAR *q
#endif
) ;
int m_wcupstrcmp(const M_WCHAR *p, const M_WCHAR *q);
int m_wcmbupstrcmp(
#if defined(M_PROTO)
const M_WCHAR *p, const char *q
#endif
) ;
int m_wcmbupstrcmp(const M_WCHAR *p, const char *q);
int m_mbmbupstrcmp(
#if defined(M_PROTO)
const char *p, const char *q
#endif
) ;
int m_mbmbupstrcmp(const char *p, const char *q);
void value(
#if defined(M_PROTO)
M_WCHAR *p
#endif
) ;
void value(M_WCHAR *p);
void warning(
#if defined(M_PROTO)
char *text
#endif
) ;
void warning(char *text);
void warning1(
#if defined(M_PROTO)
char *text, M_WCHAR *arg
#endif
) ;
void warning1(char *text, M_WCHAR *arg);
LOGICAL m_whitespace(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
LOGICAL m_whitespace(M_WCHAR c);

45
cde/programs/dthelp/parser/canon1/helptag/default.c
View file

@ -30,12 +30,7 @@ Copyright 1988, 1989, 1992 Hewlett-Packard Co.
#include "userinc.h"
#include "globdec.h"
#if defined(M_PROTO)
int vextextsize(const M_WCHAR *keyword)
#else
int vextextsize(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return NORMAL;
@ -47,12 +42,7 @@ m_err1("Unexpected value for ex/vex textsize parameter: %s", keyword);
return NORMAL;
}
#if defined(M_PROTO)
int vgloss(const M_WCHAR *keyword)
#else
int vgloss(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return GLOSS;
@ -63,12 +53,7 @@ m_err1("Unexpected value for gloss parameter: %s", keyword);
return GLOSS;
}
#if defined(M_PROTO)
int vcenter(const M_WCHAR *keyword)
#else
int vcenter(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return CENTER;
@ -80,12 +65,7 @@ m_err1("Unexpected value for center parameter: %s", keyword);
return CENTER;
}
#if defined(M_PROTO)
int vnumber(const M_WCHAR *keyword)
#else
int vnumber(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return NONUMBER;
@ -96,12 +76,7 @@ m_err1("Unexpected value for number parameter: %s", keyword);
return NONUMBER;
}
#if defined(M_PROTO)
LOGICAL vstack(const M_WCHAR *keyword)
#else
LOGICAL vnumber(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return FALSE;
@ -112,12 +87,7 @@ m_err1("Unexpected value for number parameter: %s", keyword);
return FALSE;
}
#if defined(M_PROTO)
int vordertype(const M_WCHAR *keyword)
#else
int vordertype(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return ARABIC;
@ -131,12 +101,7 @@ m_err1("Unexpected list order type: %s", keyword);
return ARABIC;
}
#if defined(M_PROTO)
int vspacing(const M_WCHAR *keyword)
#else
int vspacing(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return LOOSE;
@ -147,12 +112,7 @@ m_err1("Unexpected value for spacing parameter: %s", keyword);
return LOOSE;
}
#if defined(M_PROTO)
int vlonglabel(const M_WCHAR *keyword)
#else
int vlonglabel(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return WRAP;
@ -163,12 +123,7 @@ m_err1("Unexpected value for longlabel parameter: %s", keyword);
return WRAP;
}
#if defined(M_PROTO)
int vtype(const M_WCHAR *keyword)
#else
int vtype(keyword)
M_WCHAR *keyword;
#endif /* M_PROTO */
{
if (!keyword) return BULLET;

598
cde/programs/dthelp/parser/canon1/helptag/fproto.h
View file

@ -24,452 +24,186 @@
/* Copyright (c) 1988, 1989, 1990 Hewlett-Packard Co. */
/* Function prototypes for HP Tag/TeX translator */
void assert_hometopic_exists(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void assert_hometopic_exists(M_NOPAR);
/* osf has basename() defined in system header file, change
* basename() to fbasename(). --XPG4 standard.
*/
void fbasename(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void fbasename(M_NOPAR);
void chapstart(
#if defined(M_PROTO)
M_WCHAR *id
#endif
) ;
void chapstart(M_WCHAR *id);
void checkgloss(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void checkgloss(M_NOPAR);
M_WCHAR *checkid(
#if defined(M_PROTO)
M_WCHAR *id
#endif
) ;
M_WCHAR *checkid(M_WCHAR *id);
void checkmsghead (
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void checkmsghead (M_NOPAR);
void dumpxref(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void dumpxref(M_NOPAR);
void echohead(
#if defined(M_PROTO)
M_WCHAR *p
#endif
) ;
void echohead(M_WCHAR *p);
void mb_echohead(
#if defined(M_PROTO)
char *p
#endif
) ;
void mb_echohead(char *p);
void endhead(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void endhead(M_NOPAR);
void esoutchar(
#if defined(M_PROTO)
M_WCHAR textchar
#endif
) ;
void esoutchar(M_WCHAR textchar);
void vexoutchar(
#if defined(M_PROTO)
M_WCHAR textchar
#endif
) ;
void vexoutchar(M_WCHAR textchar);
void exoutchar(
#if defined(M_PROTO)
M_WCHAR textchar
#endif
) ;
void exoutchar(M_WCHAR textchar);
void imoutchar(
#if defined(M_PROTO)
M_WCHAR textchar
#endif
) ;
void imoutchar(M_WCHAR textchar);
int getqualified (
#if defined(M_PROTO)
M_WCHAR *qualname, M_WCHAR *unqualname
#endif
) ;
int getqualified (M_WCHAR *qualname, M_WCHAR *unqualname);
void handle_link_and_graphic(
#if defined(M_PROTO)
M_WCHAR *parent, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink,
M_WCHAR *glinktype, M_WCHAR *gdescription
#endif
);
void handle_link_and_graphic(M_WCHAR *parent, M_WCHAR *gentity, M_WCHAR *gposition, M_WCHAR *ghyperlink,
M_WCHAR *glinktype, M_WCHAR *gdescription);
void idstring(
#if defined(M_PROTO)
M_WCHAR *string
#endif
) ;
void idstring(M_WCHAR *string);
void indexchar(
#if defined(M_PROTO)
M_WCHAR textchar
#endif
) ;
void indexchar(M_WCHAR textchar);
void Item(
#if defined(M_PROTO)
M_WCHAR *id
#endif
) ;
void Item(M_WCHAR *id);
char *m_itoa(
#if defined(M_PROTO)
int n, char *s
#endif
) ;
char *m_itoa(int n, char *s);
LOGICAL m_letter(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
LOGICAL m_letter(M_WCHAR c);
void loadxref(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void loadxref(M_NOPAR);
int m_lower(
#if defined(M_PROTO)
int c
#endif
) ;
int m_lower(int c);
void options(
#if defined(M_PROTO)
LOGICAL filelenonly
#endif
) ;
void options(LOGICAL filelenonly);
void outchar(
#if defined(M_PROTO)
M_WCHAR textchar, FILE *outfile
#endif
) ;
void outchar(M_WCHAR textchar, FILE *outfile );
void outpi(
#if defined(M_PROTO)
int enttype, M_WCHAR *pi, M_WCHAR *entname
#endif
) ;
void outpi(int enttype, M_WCHAR *pi, M_WCHAR *entname);
void realoutchar(
#if defined(M_PROTO)
M_WCHAR textchar, FILE *outfile
#endif
) ;
void realoutchar(M_WCHAR textchar, FILE *outfile);
void rsectstart(
#if defined(M_PROTO)
M_WCHAR *id
#endif
) ;
void rsectstart(M_WCHAR *id);
void rseqend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void rseqend(M_NOPAR);
M_WCHAR *searchforfile(
#if defined(M_PROTO)
M_WCHAR *file
#endif
) ;
M_WCHAR *searchforfile(M_WCHAR *file);
void setid(
#if defined(M_PROTO)
M_WCHAR *id,
void setid(M_WCHAR *id,
LOGICAL where,
LOGICAL csensitive,
LOGICAL inchapter,
char *chapter,
M_WCHAR *xrffile,
int xrfline,
LOGICAL xrefable
#endif
) ;
LOGICAL xrefable );
void setopt(
#if defined(M_PROTO)
char *string, LOGICAL filelenonly
#endif
) ;
void setopt(char *string, LOGICAL filelenonly);
LOGICAL setvalopt(
#if defined(M_PROTO)
int thisopt, char *string, LOGICAL filelenonly
#endif
) ;
LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly);
void shchar(
#if defined(M_PROTO)
M_WCHAR textchar,
void shchar(M_WCHAR textchar,
int *len,
int max,
M_WCHAR *string,
void (*proc)(M_WCHAR *string),
char *msg,
LOGICAL *errflg
#endif
) ;
LOGICAL *errflg);
void mb_shchar(
#if defined(M_PROTO)
char textchar,
void mb_shchar(char textchar,
int *len,
int max,
M_WCHAR *string,
void (*proc)(M_WCHAR *string),
char *msg,
LOGICAL *errflg
#endif
) ;
LOGICAL *errflg);
void shstring(
#if defined(M_PROTO)
M_WCHAR *addstring,
void shstring(M_WCHAR *addstring,
int *len,
int max,
M_WCHAR *storestring,
char *msg,
LOGICAL *errflg
#endif
) ;
LOGICAL *errflg);
void mb_shstring(
#if defined(M_PROTO)
char *addstring,
void mb_shstring(char *addstring,
int *len,
int max,
M_WCHAR *storestring,
char *msg,
LOGICAL *errflg
#endif
) ;
LOGICAL *errflg);
void starthelpnode(
#if defined(M_PROTO)
M_WCHAR *ssi,
void starthelpnode(M_WCHAR *ssi,
M_WCHAR *id,
int level
#endif
) ;
int level);
void mb_starthelpnode(
#if defined(M_PROTO)
char *ssi,
void mb_starthelpnode(char *ssi,
char *id,
int level
#endif
) ;
int level);
void StartLabList(
#if defined(M_PROTO)
M_WCHAR *spacing,
M_WCHAR *longlabel
#endif
) ;
void StartLabList(M_WCHAR *spacing,
M_WCHAR *longlabel);
void StartList(
#if defined(M_PROTO)
M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont
#endif
) ;
void StartList(M_WCHAR *type, M_WCHAR *order, M_WCHAR *spacing, M_WCHAR *cont);
void EndList(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void EndList(M_NOPAR);
void strcode(
#if defined(M_PROTO)
M_WCHAR *string, FILE *outfile
#endif
) ;
void strcode(M_WCHAR *string, FILE *outfile);
void mb_strcode(
#if defined(M_PROTO)
char *string, FILE *outfile
#endif
) ;
void mb_strcode(char *string, FILE *outfile);
char *strstr(
#if defined(M_PROTO)
const char *s1, const char *s2
#endif
) ;
char *strstr(const char *s1, const char *s2);
void svhdstring(
#if defined(M_PROTO)
M_WCHAR *string
#endif
) ;
void svhdstring(M_WCHAR *string);
void svtcstring(
#if defined(M_PROTO)
M_WCHAR *string
#endif
) ;
void svtcstring(M_WCHAR *string);
void termchar(
#if defined(M_PROTO)
M_WCHAR textchar
#endif
) ;
void termchar(M_WCHAR textchar);
void termpi(
#if defined(M_PROTO)
int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname
#endif
) ;
void termpi(int m_enttype, M_WCHAR *m_pi, M_WCHAR *m_entname);
void texinit(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void texinit(M_NOPAR);
int vextextsize(
#if defined(M_PROTO)
const M_WCHAR *keyword
#endif
) ;
int vextextsize(const M_WCHAR *keyword);
int vgloss(
#if defined(M_PROTO)
const M_WCHAR *keyword
#endif
) ;
int vgloss(const M_WCHAR *keyword);
int vcenter(
#if defined(M_PROTO)
const M_WCHAR *keyword
#endif
) ;
int vcenter(const M_WCHAR *keyword);
int vnumber(
#if defined(M_PROTO)
const M_WCHAR *keyword
#endif
) ;
int vnumber(const M_WCHAR *keyword);
LOGICAL vstack(
#if defined(M_PROTO)
const M_WCHAR *keyword
#endif
) ;
LOGICAL vstack(const M_WCHAR *keyword);
int vordertype(
#if defined(M_PROTO)
const M_WCHAR *keyword
#endif
) ;
int vordertype(const M_WCHAR *keyword);
int vlonglabel(
#if defined(M_PROTO)
const M_WCHAR *keyword
#endif
) ;
int vlonglabel(const M_WCHAR *keyword);
int vspacing(
#if defined(M_PROTO)
const M_WCHAR *keyword
#endif
) ;
int vspacing(const M_WCHAR *keyword);
int vtype(
#if defined(M_PROTO)
const M_WCHAR *keyword
#endif
) ;
int vtype(const M_WCHAR *keyword);
void xrefexpand(
#if defined(M_PROTO)
M_WCHAR *id
#endif
) ;
void xrefexpand(M_WCHAR *id);
int m_upper(
#if defined(M_PROTO)
int c
#endif
) ;
int m_upper(int c);
char *GetDefaultHeaderString(
#if defined(M_PROTO)
char *elementName,
char *GetDefaultHeaderString(char *elementName,
unsigned char desiredType,
char *defaultString
#endif
) ;
char *defaultString);
void SetDefaultLocale(
#if defined(M_PROTO)
M_NOPAR
#endif
);
void SetDefaultLocale(M_NOPAR);
char *MakeMByteString(
#if defined(M_PROTO)
const M_WCHAR *from
#endif
);
char *MakeMByteString(const M_WCHAR *from);
M_WCHAR *MakeWideCharString(
#if defined(M_PROTO)
const char *from
#endif
);
M_WCHAR *MakeWideCharString(const char *from);
void paragraph(
#if defined(M_PROTO)
M_WCHAR *indent,
void paragraph(M_WCHAR *indent,
M_WCHAR *id,
M_WCHAR *gentity,
M_WCHAR *gposition,
M_WCHAR *ghyperlink,
M_WCHAR *glinktype,
M_WCHAR *gdescription
#endif
);
M_WCHAR *gdescription);
void figure(
#if defined(M_PROTO)
M_WCHAR *number,
void figure( M_WCHAR *number,
M_WCHAR *tonumber,
M_WCHAR *id,
M_WCHAR *file,
@ -477,180 +211,70 @@ void figure(
M_WCHAR *cappos,
M_WCHAR *ghyperlink,
M_WCHAR *glinktype,
M_WCHAR *gdescription
#endif
);
M_WCHAR *gdescription);
void endterm(
#if defined(M_PROTO)
M_WCHAR *base,
void endterm( M_WCHAR *base,
M_WCHAR *gloss,
char *linktype
#endif
);
char *linktype);
M_WCHAR wc_toupper(
#if defined(M_PROTO)
M_WCHAR wc
#endif
);
M_WCHAR wc_toupper( M_WCHAR wc);
M_WCHAR *wc_stringtoupper(
#if defined(M_PROTO)
M_WCHAR *wcp
#endif
);
M_WCHAR *wc_stringtoupper( M_WCHAR *wcp);
int NextId(
#if defined(M_PROTO)
M_NOPAR
#endif
);
int NextId(M_NOPAR);
char *GetLanguage(
#if defined(M_PROTO)
M_NOPAR
#endif
);
char *GetLanguage(M_NOPAR);
char *GetCharset(
#if defined(M_PROTO)
M_NOPAR
#endif
);
char *GetCharset(M_NOPAR);
void HandleLink(
#if defined(M_PROTO)
M_WCHAR *hyperlink,
void HandleLink( M_WCHAR *hyperlink,
M_WCHAR *type,
M_WCHAR *description
#endif
);
M_WCHAR *description);
char *mb_realloc(
#if defined(M_PROTO)
char *ptr, long size
#endif
);
char *mb_realloc( char *ptr, long size);
char *mb_malloc(
#if defined(M_PROTO)
long size
#endif
);
char *mb_malloc( long size);
void mb_free(
#if defined(M_PROTO)
char **pptr
#endif
);
void mb_free( char **pptr);
void Add2ToRowVec(
#if defined(M_PROTO)
int *length, char **rowvec, char *id1, char *id2
#endif
);
void Add2ToRowVec( int *length, char **rowvec, char *id1, char *id2);
void StartEx(
#if defined(M_PROTO)
M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize
#endif
);
void StartEx(M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize);
void EndEx(
#if defined(M_PROTO)
M_NOPAR
#endif
);
void EndEx(M_NOPAR);
void StartNCW(
#if defined(M_PROTO)
char *which
#endif
);
void StartNCW(char *which);
void StartBlock(
#if defined(M_PROTO)
char *pclass, char *ssi, char *id
#endif
);
void StartBlock(char *pclass, char *ssi, char *id);
void AddToSNB(
#if defined(M_PROTO)
char *id, char *iconName
#endif
);
void AddToSNB(char *id, char *iconName);
void StartNCWtext(
#if defined(M_PROTO)
char *which, char *iconFile, char *headingString
#endif
);
void StartNCWtext(char *which, char *iconFile, char *headingString);
void IncludeToss(
#if defined(M_PROTO)
M_NOPAR
#endif
);
void IncludeToss(M_NOPAR);
M_WCHAR *CycleEnt(
#if defined(M_PROTO)
LOGICAL init,
M_WCHAR *CycleEnt( LOGICAL init,
unsigned char *type,
M_WCHAR ***content,
unsigned char *wheredef
#endif
);
unsigned char *wheredef);
void ModifyEntities(
#if defined(M_PROTO)
M_NOPAR
#endif
);
void ModifyEntities(M_NOPAR);
void PushForm(
#if defined(M_PROTO)
char *class,
void PushForm(char *class,
char *ssi,
char *id
#endif
) ;
char *id);
void PushForm2(
#if defined(M_PROTO)
char *class,
void PushForm2(char *class,
char *ssi,
char *id1,
char *id2
#endif
) ;
char *id2);
void PopForm(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void PopForm(M_NOPAR);
void PopForm2(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void PopForm2(M_NOPAR);
void PopFormMaybe(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void PopFormMaybe(M_NOPAR);
void EmitSavedAnchors(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void EmitSavedAnchors(M_NOPAR);
void CloseVirpage(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void CloseVirpage(M_NOPAR);

204
cde/programs/dthelp/parser/canon1/helptag/help.c
View file

@ -349,13 +349,7 @@ m_free(string, "GetDefaultHeaderString return");
/* construct a qualified file name */
#if defined(M_PROTO)
static int mb_getqualified(char *qualname, char *unqualname)
#else
static int mb_getqualified(qualname, unqualname)
char *qualname;
char *unqualname;
#endif
{
#if defined(hpux) || defined(_AIX) || defined(sun) || defined(__linux__) || defined(CSRG_BASED)
@ -689,12 +683,7 @@ if (!ghyperlink && (glinktype || gdescription))
}
/* Process an item in a list */
#if defined(M_PROTO)
void Item(M_WCHAR *id)
#else
void Item(id)
M_WCHAR *id;
#endif
{
char orderString[32];
static char *ROMAN0[] =
@ -998,16 +987,9 @@ return(NULL);
/* Start a new helpnode */
#if defined(M_PROTO)
void starthelpnode(M_WCHAR *ssi,
M_WCHAR *id,
int level)
#else
void starthelpnode(ssi, id, level)
M_WCHAR *ssi;
M_WCHAR *id;
int level;
#endif
{
int i;
char *mbyte, *mb_ssi;
@ -1061,16 +1043,9 @@ snbstart = ftell(outfile);
} /* End starthelpnode(id) */
#if defined(M_PROTO)
void mb_starthelpnode(char *ssi,
char *id,
int level)
#else
void mb_starthelpnode(ssi, id, level)
char *ssi;
char *id;
int level;
#endif
{
M_WCHAR *wc_ssi, *wc_id;
@ -1131,15 +1106,10 @@ if (list <= MAXLISTLEV)
/* Start a list */
#if defined(M_PROTO)
void StartList(M_WCHAR *type,
M_WCHAR *order,
M_WCHAR *spacing,
M_WCHAR *cont)
#else
void StartList(type, order, spacing, cont)
M_WCHAR *type, *order, *spacing, *cont;
#endif
{
LIST *nextlist;
CONTCHAIN *chain;
@ -1420,17 +1390,10 @@ postpreamble = ftell(outfile);
the string returned must be m_free'd.
*/
char *
#if defined(M_PROTO)
GetDefaultHeaderString(
char *elementName,
unsigned char desiredType,
char *defaultString )
#else
GetDefaultHeaderString(elementName, desiredType, defaultString)
char *elementName;
unsigned char desiredType;
char *defaultString;
#endif
{
unsigned char type,wheredef;
M_WCHAR *content;
@ -1497,13 +1460,7 @@ return "";
* standard versions.
*/
static void
#if defined(M_PROTO)
SetStdLocale(char *pLang, char *pCharset)
#else
SetStdLocale(pLang, pCharset)
char *pLang;
char *pCharset;
#endif
{
static const char *cString = "C";
static const char *isoString = "ISO-8859-1";
@ -1632,11 +1589,7 @@ _DtLcxCloseDb(&myDb);
* fashion.
*/
static char *
#if defined(M_PROTO)
GetStdLocale()
#else
GetStdLocale()
#endif
{
static char buffer[256];
static char *cString = "C";
@ -1795,7 +1748,6 @@ if (charset && (charset != (dotPtr+1)))
}
#if defined(M_PROTO)
void paragraph(M_WCHAR *indent,
M_WCHAR *id,
M_WCHAR *gentity,
@ -1803,22 +1755,6 @@ void paragraph(M_WCHAR *indent,
M_WCHAR *ghyperlink,
M_WCHAR *glinktype,
M_WCHAR *gdescription)
#else
void paragraph(indent,
id,
gentity,
gposition,
ghyperlink,
glinktype,
gdescription)
M_WCHAR *indent;
M_WCHAR *id;
M_WCHAR *gentity;
M_WCHAR *gposition;
M_WCHAR *ghyperlink;
M_WCHAR *glinktype;
M_WCHAR *gdescription;
#endif
{
char *firstString, *indentString;
@ -1862,7 +1798,6 @@ handle_link_and_graphic(m_parent(0),
}
#if defined(M_PROTO)
void figure(
M_WCHAR *number,
M_WCHAR *tonumber,
@ -1873,28 +1808,6 @@ void figure(
M_WCHAR *ghyperlink,
M_WCHAR *glinktype,
M_WCHAR *gdescription)
#else
void figure(
number,
tonumber,
id,
file,
figpos,
cappos,
ghyperlink,
glinktype,
gdescription)
M_WCHAR *number;
M_WCHAR *tonumber;
M_WCHAR *id;
M_WCHAR *file;
M_WCHAR *figpos;
M_WCHAR *cappos;
M_WCHAR *border;
M_WCHAR *ghyperlink;
M_WCHAR *glinktype;
M_WCHAR *gdescription;
#endif
{
char snb_id[32];
unsigned char etype,wheredef;
@ -2126,14 +2039,7 @@ if (ftonumber)
m_free(string, "default header string return");
}
#if defined(M_PROTO)
void endterm(M_WCHAR *base, M_WCHAR *gloss, char *linktype)
#else
void endterm( base, gloss, linktype)
M_WCHAR *base;
M_WCHAR *gloss;
char *linktype;
#endif
{
M_WCHAR *p;
M_WCHAR dterm[MAXTERM+1];
@ -2253,12 +2159,7 @@ if (vgloss(gloss) == GLOSS)
if (echo) mb_echohead("++");
}
#if defined(M_PROTO)
M_WCHAR wc_toupper(M_WCHAR wc)
#else
M_WCHAR wc_toupper(wc)
M_WCHAR wc;
#endif
{
if ((wc >= 0) && (wc <= 255))
{
@ -2267,12 +2168,7 @@ if ((wc >= 0) && (wc <= 255))
return wc;
}
#if defined(M_PROTO)
M_WCHAR *wc_stringtoupper(M_WCHAR *wcp)
#else
M_WCHAR *wc_stringtoupper(wcp)
M_WCHAR *wcp;
#endif
{
M_WCHAR *newstring, *nsp;
@ -2322,14 +2218,7 @@ return pCharset;
}
#if defined(M_PROTO)
void HandleLink(M_WCHAR *hyperlink, M_WCHAR *type, M_WCHAR *description)
#else
void HandleLink(hyperlink, type, description)
M_WCHAR *hyperlink;
M_WCHAR *type;
M_WCHAR *description;
#endif
{
char *mb_hyperlink, mb_undefined[64];
char buffer[BIGBUF];
@ -2485,13 +2374,7 @@ mb_strcode(">", outfile);
}
#if defined(M_PROTO)
char *mb_realloc(char *ptr, long size)
#else
char *mb_realloc(ptr, size)
char *ptr;
long size;
#endif
{
void *vptr;
size_t ssize;
@ -2511,12 +2394,7 @@ return (char *) vptr;
}
#if defined(M_PROTO)
char *mb_malloc(long size)
#else
char *mb_malloc(size)
long size;
#endif
{
char *cptr;
size_t ssize;
@ -2534,12 +2412,7 @@ return cptr;
}
#if defined(M_PROTO)
void mb_free(char **pptr)
#else
void *mb_free(pptr)
char **pptr;
#endif
{
#if DEBUG_MB_MALLOC
@ -2551,14 +2424,7 @@ free((void *) *pptr);
*pptr = NULL;
}
#if defined(M_PROTO)
static void AddToRowVec(int *length, char **rowvec, char *id)
#else
static void AddToRowVec(length, rowvec, id)
int *length;
char **rowvec;
char *id;
#endif
{
char tempRowVec[BIGBUF];
int rowVecLen;
@ -2571,14 +2437,7 @@ strcpy(*rowvec + *length - 1, tempRowVec);
}
#if defined(M_PROTO)
void Add2ToRowVec(int *length, char **rowvec, char *id1, char *id2)
#else
void Add2ToRowVec(length, rowvec, id1, id2)
int *length;
char **rowvec;
char *id1, *id2;
#endif
{
char tempRowVec[BIGBUF];
int rowVecLen;
@ -2591,14 +2450,7 @@ strcpy(*rowvec + *length - 1, tempRowVec);
}
#if defined(M_PROTO)
void StartEx(M_WCHAR *notes, M_WCHAR *lines, M_WCHAR *textsize)
#else
void StartEx(*notes, *lines, *textsize)
M_WCHAR *notes;
M_WCHAR *lines;
M_WCHAR *textsize;
#endif
{
exTextSize = vextextsize(textsize);
stackex = vstack(notes);
@ -2614,11 +2466,7 @@ svexlen = 1;
}
#if defined(M_PROTO)
void EndEx()
#else
void EndEx()
#endif
void EndEx(void)
{
char *annotation;
int annotLen;
@ -2683,24 +2531,14 @@ if (saveexseg)
}
#if defined(M_PROTO)
void StartNCW(char *which)
#else
void StartNCW(which)
char *which;
#endif
{
notehead = FALSE;
PushForm(NULL, which, NULL);
}
#if defined(M_PROTO)
void StartBlock(char *pclass, char *ssi, char *id)
#else
void StartBlock(pclass, ssi, id)
char *pclass, *ssi, *id;
#endif
{
char localId[32];
char *realId;
@ -2739,14 +2577,7 @@ firstPInBlock = TRUE;
}
#if defined(M_PROTO)
void StartNCWtext(char *which, char *iconFile, char *headingString)
#else
void StartNCWtext(which, iconFile, headingString)
char *which;
char *iconFile;
char *headingString;
#endif
{
char *icon, *heading;
@ -2777,13 +2608,7 @@ m_free(icon, "icon name");
}
#if defined(M_PROTO)
void AddToSNB(char *id, char *xid)
#else
void AddToSNB(id, xid)
char *id;
char *xid;
#endif
{
char tmpsnb[BIGBUF];
int snblen;
@ -2807,11 +2632,7 @@ else
}
#if defined(M_PROTO)
void IncludeToss()
#else
void IncludeToss()
#endif
{
char pathbuf[BIGBUF];
char *try = pathbuf;
@ -2896,18 +2717,10 @@ mb_free(&mb_inputname);
/* Cyclent.c contains procedure m_cyclent(), callable by interface
designers, to cycle through all defined entities, returning information
about them */
#if defined(M_PROTO)
M_WCHAR *CycleEnt(LOGICAL init,
unsigned char *type,
M_WCHAR ***content,
unsigned char *wheredef)
#else
M_WCHAR *m_cyclent(init, type, content, wheredef)
LOGICAL init ;
unsigned char *type ;
M_WCHAR ***content ;
unsigned char *wheredef ;
#endif
{
static M_TRIE *current ;
static M_TRIE *ancestor[M_NAMELEN + 1] ;
@ -2990,14 +2803,7 @@ while (name = CycleEnt(FALSE, &type, &content, &wheredef));
}
#if defined(M_PROTO)
void PushForm(char *class, char *ssi, char *id)
#else
void PushForm(class, ssi, id)
char *class;
char *ssi;
char *id;
#endif
{
char localId[SDLNAMESIZ+10];
char *realId;
@ -3061,15 +2867,7 @@ needFData = TRUE;
}
#if defined(M_PROTO)
void PushForm2(char *class, char *ssi, char *id1, char *id2)
#else
void PushForm2(class, ssi, id1, id2)
char *class;
char *ssi;
char *id1;
char *id2;
#endif
{
char id[32];
int stackSize;

18
cde/programs/dthelp/parser/canon1/helptag/option.c
View file

@ -37,12 +37,7 @@
#define TAGDOTOPT "helptag.opt"
#define DOTOPT ".opt"
#if defined(M_PROTO)
void options(LOGICAL filelenonly)
#else
void options(filelenonly)
LOGICAL filelenonly;
#endif
{
int i;
FILE *optfile;
@ -149,13 +144,7 @@ optval = M_NULLVAL;
/* Set a single option */
/* Workonly parameter described with function options()*/
#if defined(M_PROTO)
void setopt(char *string, LOGICAL filelenonly)
#else
void setopt(string, filelenonly)
char *string;
LOGICAL filelenonly;
#endif
{
char *p;
int thisopt;
@ -280,14 +269,7 @@ else switch(thisopt + 1)
}
/* Process a value for a command line option */
#if defined(M_PROTO)
LOGICAL setvalopt(int thisopt, char *string, LOGICAL filelenonly)
#else
LOGICAL setvalopt(thisopt, string, filelenonly)
int thisopt;
char *string;
LOGICAL filelenonly;
#endif
{
char *p;
int i;

72
cde/programs/dthelp/parser/canon1/helptag/out.c
View file

@ -121,12 +121,7 @@ if (savesnb)
/* Process a character in an environment where spaces must be escaped */
#if defined(M_PROTO)
void esoutchar(M_WCHAR textchar)
#else
void esoutchar(textchar)
M_WCHAR textchar;
#endif
{
static M_WCHAR wsp = 0;
@ -147,12 +142,7 @@ outchar(textchar, outfile);
}
/* Process a character in a verbatim example */
#if defined(M_PROTO)
void vexoutchar(M_WCHAR textchar)
#else
void vexoutchar(textchar)
M_WCHAR textchar;
#endif
{
static M_WCHAR wla = 0;
char *holdSaveExSeg;
@ -177,12 +167,7 @@ else
}
/* Process a character in an example */
#if defined(M_PROTO)
void exoutchar(M_WCHAR textchar)
#else
void exoutchar(textchar)
M_WCHAR textchar;
#endif
{
char exbuff[32]; /* arbitrarily large */
int bufflen;
@ -212,12 +197,7 @@ savex = holdSavex;
}
/* Process a character in an image paragraph */
#if defined(M_PROTO)
void imoutchar(M_WCHAR textchar)
#else
void imoutchar(textchar)
M_WCHAR textchar;
#endif
{
char imbuff[32]; /* arbitrarily large */
int bufflen;
@ -240,12 +220,7 @@ else
}
/* Write a character to be passed to the index file */
#if defined(M_PROTO)
void indexchar(M_WCHAR textchar)
#else
void indexchar(textchar)
M_WCHAR textchar;
#endif
{
if (idxsavlen + 4 > (sizeof(idxsav) / sizeof(M_WCHAR)))
{
@ -257,13 +232,7 @@ idxsav[idxsavlen++] = textchar;
/* Processes a data character */
#if defined(M_PROTO)
void outchar(M_WCHAR textchar, FILE *outfile)
#else
void outchar(textchar, outfile)
M_WCHAR textchar;
FILE *outfile;
#endif
{
M_WCHAR buffer[2];
static M_WCHAR wnl = 0;
@ -333,13 +302,7 @@ if (echo)
/* Really output a character */
#if defined(M_PROTO)
void realoutchar(M_WCHAR textchar, FILE *outfile)
#else
void realoutchar(textchar, outfile)
M_WCHAR textchar;
FILE *outfile;
#endif
{
char mb_textchar[32]; /* arbitrarily large */
int length, i;
@ -379,22 +342,7 @@ if (savtc)
/* Save a character in the array used to store table of contents entries
when processing a head */
#if defined(M_PROTO)
void shchar(M_WCHAR textchar, int *len, int max, M_WCHAR *string, void (*proc)(M_WCHAR *string), char *msg, LOGICAL *errflg)
#else
void shchar(textchar, len, max, string, proc, msg, errflg)
M_WCHAR textchar;
int *len;
int max;
M_WCHAR *string;
void (*proc)(
#if defined(M_PROTO)
M_WCHAR *string
#endif
);
char *msg;
LOGICAL *errflg;
#endif
{
char mb_textchar[32]; /* arbitrarily large */
unsigned char index;
@ -427,27 +375,12 @@ else
}
#if defined(M_PROTO)
void mb_shchar(char textchar,
int *len,
int max,
M_WCHAR *string,
void (*proc)(M_WCHAR *string),
char *msg, LOGICAL *errflg)
#else
void mb_shchar(textchar, len, max, string, proc, msg, errflg)
char textchar;
int *len;
int max;
M_WCHAR *string;
void (*proc)(
#if defined(M_PROTO)
M_WCHAR *string
#endif
);
char *msg;
LOGICAL *errflg;
#endif
{
M_WCHAR wc_textchar;
@ -611,12 +544,7 @@ svtclen += length;
}
/* Process a character in a term */
#if defined(M_PROTO)
void termchar(M_WCHAR textchar)
#else
void termchar(textchar)
M_WCHAR textchar;
#endif
{
int length;
char mb_textchar[32]; /* arbitrarily large */

12
cde/programs/dthelp/parser/canon1/helptag/xref.c
View file

@ -334,20 +334,8 @@ while (TRUE)
/* Save a cross-reference ID and associated expansion */
#if defined(M_PROTO)
void setid(M_WCHAR *id, LOGICAL where, LOGICAL csensitive, LOGICAL inchapter,
char *chapter, M_WCHAR *xrffile, int xrfline, LOGICAL xrefable)
#else
void setid(id, where, csensitive, inchapter, chapter, xrffile, xrfline, xrefable)
M_WCHAR *id;
LOGICAL where;
LOGICAL csensitive;
LOGICAL inchapter;
char *chapter;
M_WCHAR *xrffile;
int xrfline;
LOGICAL xrefable;
#endif
{
struct xref *old;
struct xref *xref;

17
cde/programs/dthelp/parser/canon1/parser/actutil.c
View file

@ -107,17 +107,7 @@ int m_findact(elt, array)
}
/* Recursive procedure called by findact() to search m_action */
#if defined(M_PROTO)
void m_findchain(M_PARSE *stackptr, int start, int chainin, int *chainout, int *index, LOGICAL wild)
#else
void m_findchain(stackptr, start, chainin, chainout, index, wild)
M_PARSE *stackptr;
int start;
int chainin;
int *chainout;
int *index;
LOGICAL wild;
#endif
{
int node;
M_PARSE *stackp;
@ -241,14 +231,7 @@ void m_strtaction(m_elt)
}
/* Output a start-string or end-string */
#if defined(M_PROTO)
void m_textout(char *format, LOGICAL start, LOGICAL end)
#else
void m_textout(format, start, end)
char *format;
LOGICAL start;
LOGICAL end;
#endif
{
M_WCHAR name[M_NAMELEN + 1];
int i, par;

8
cde/programs/dthelp/parser/canon1/parser/cyclent.c
View file

@ -36,15 +36,7 @@
#include "parser.h"
#include "entext.h"
#if defined(M_PROTO)
M_WCHAR *m_cyclent(LOGICAL init, unsigned char *type, M_WCHAR **content, unsigned char *wheredef)
#else
M_WCHAR *m_cyclent(init, type, content, wheredef)
LOGICAL init ;
unsigned char *type ;
M_WCHAR **content ;
unsigned char *wheredef ;
#endif
{
static M_TRIE *current ;
static M_TRIE *ancestor[M_NAMELEN + 1] ;

6
cde/programs/dthelp/parser/canon1/parser/entity.c
View file

@ -43,13 +43,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
#include "entext.h"
/* Process the name in a usemap delaration */
#if defined(M_PROTO)
void m_ckmap(M_WCHAR *name, LOGICAL useoradd)
#else
void m_ckmap(name, useoradd)
M_WCHAR *name ;
LOGICAL useoradd ;
#endif
{
int mapid ;

73
cde/programs/dthelp/parser/canon1/parser/error.c
View file

@ -52,15 +52,7 @@ void m_error(text)
}
/* Issue error message (one argument) */
#if defined(M_PROTO)
void m_err1(
const char *text,
const M_WCHAR *arg)
#else
void m_err1(text, arg)
char *text;
M_WCHAR *arg;
#endif
void m_err1(const char *text, const M_WCHAR *arg)
{
char *buffer, *mb_arg;
@ -77,15 +69,9 @@ m_esuffix();
}
#if defined(M_PROTO)
void m_mberr1(
const char *text,
const char *arg)
#else
void m_err1(text, arg)
char *text;
char *arg;
#endif
{
M_WCHAR *wc_arg;
@ -95,17 +81,10 @@ void m_err1(text, arg)
}
/* Issue error message (two arguments) */
#if defined(M_PROTO)
void m_err2(
const char *text,
const M_WCHAR *arg1,
const M_WCHAR *arg2)
#else
void m_err2(text, arg1, arg2)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
#endif
{
char *buffer;
char *mb_arg1,*mb_arg2;
@ -126,19 +105,11 @@ void m_err2(text, arg1, arg2)
}
/* Issue error message (three arguments) */
#if defined(M_PROTO)
void m_err3(
char *text,
M_WCHAR *arg1,
M_WCHAR *arg2,
M_WCHAR *arg3)
#else
void m_err3(text, arg1, arg2, arg3)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2, *mb_arg3;
@ -164,21 +135,12 @@ void m_err3(text, arg1, arg2, arg3)
}
/* Issue error message (four arguments) */
#if defined(M_PROTO)
void m_err4(
char *text,
M_WCHAR *arg1,
M_WCHAR *arg2,
M_WCHAR *arg3,
M_WCHAR *arg4)
#else
void m_err4(text, arg1, arg2, arg3, arg4)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
M_WCHAR *arg4;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2,*mb_arg3,*mb_arg4;
@ -207,7 +169,6 @@ void m_err4(text, arg1, arg2, arg3, arg4)
}
/* Issue error message (five arguments) */
#if defined(M_PROTO)
void m_err5(
char *text,
M_WCHAR *arg1,
@ -215,15 +176,6 @@ void m_err5(
M_WCHAR *arg3,
M_WCHAR *arg4,
M_WCHAR *arg5)
#else
void m_err5(text, arg1, arg2, arg3, arg4, arg5)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
M_WCHAR *arg4;
M_WCHAR *arg5;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5;
@ -261,7 +213,6 @@ void m_err5(text, arg1, arg2, arg3, arg4, arg5)
}
/* Issue error message (six arguments) */
#if defined(M_PROTO)
void m_err6(
char *text,
M_WCHAR *arg1,
@ -270,16 +221,6 @@ void m_err6(
M_WCHAR *arg4,
M_WCHAR *arg5,
M_WCHAR *arg6)
#else
void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
M_WCHAR *arg4;
M_WCHAR *arg5;
M_WCHAR *arg6;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6;
@ -321,7 +262,6 @@ void m_err6(text, arg1, arg2, arg3, arg4, arg5, arg6)
}
/* Issue error message (seven arguments) */
#if defined(M_PROTO)
void m_err7(
char *text,
M_WCHAR *arg1,
@ -331,17 +271,6 @@ void m_err7(
M_WCHAR *arg5,
M_WCHAR *arg6,
M_WCHAR *arg7)
#else
void m_err7(text, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
char *text;
M_WCHAR *arg1;
M_WCHAR *arg2;
M_WCHAR *arg3;
M_WCHAR *arg4;
M_WCHAR *arg5;
M_WCHAR *arg6;
M_WCHAR *arg7;
#endif
{
char *buffer;
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5, *mb_arg6, *mb_arg7;

7
cde/programs/dthelp/parser/canon1/parser/findpar.c
View file

@ -41,14 +41,7 @@
Returns 0 if elt is not a valid element name, if param is specified
but is not a valid parameter name, or if param is NULL and value is
not a valid value of any of elt's parameters. */
#if defined(M_PROTO)
int m_findpar( const char *elt , const char *param , const M_WCHAR *value )
#else
int m_findpar(elt, param, value)
char *elt ;
char *param ;
M_WCHAR *value ;
#endif /* M_PROTO */
{
M_ELEMENT eltid ;
int par ;

6
cde/programs/dthelp/parser/canon1/parser/param.c
View file

@ -290,13 +290,7 @@ void m_stkparams(M_NOPAR)
}
/* Update the default of a parameter whose default is #CURRENT */
#if defined(M_PROTO)
void m_updatedefault(const int par , const M_WCHAR *string )
#else
void m_updatedefault(par, string)
int par ;
M_WCHAR *string ;
#endif /* M_PROTO */
{
if (m_parameter[par - 1].deftype != M_CURRENT &&
m_parameter[par - 1].deftype != M_CHANGEDCUR) return ;

2
cde/programs/dthelp/parser/canon1/parser/parser.h
View file

@ -347,8 +347,6 @@ M_PAREXTERN int m_wsused ;
/* Temporary pointers to parameter values. Used while scanning start tag
before element is placed on parse stack.*/
M_PAREXTERN
#if defined M_PROTO
#endif
M_WCHAR *m_poccur[
#if defined(M_PARDEF)
M_MAXPAR ? M_MAXPAR : 1

7
cde/programs/dthelp/parser/canon1/parser/parvalok.c
View file

@ -34,14 +34,7 @@
/* Function callable by interface designers. Returns TRUE if specified value
is a legal value for the indicated parameter of the given element,
FALSE otherwise. */
#if defined(M_PROTO)
LOGICAL m_parvalok( M_WCHAR *elt , M_WCHAR *param , const M_WCHAR *value )
#else
LOGICAL m_parvalok(elt, param, value)
M_WCHAR *elt ;
M_WCHAR *param ;
M_WCHAR *value ;
#endif /* M_PROTO */
{
M_ELEMENT eltid ;
int par ;

1102
cde/programs/dthelp/parser/canon1/parser/proto.h
View file

File diff suppressed because it is too large Load diff

46
cde/programs/dthelp/parser/canon1/parser/scan.c
View file

@ -399,12 +399,7 @@ int m_getachar(dchar)
}
/* Reads a name token */
#if defined(M_PROTO)
void m_getname(M_WCHAR first)
#else
void m_getname(first)
M_WCHAR first ;
#endif
{
M_WCHAR *p ;
M_HOLDTYPE dchar ;
@ -646,14 +641,7 @@ void m_litproc(delim)
}
/* Called when a missing tagc delimiter is detected */
#if defined(M_PROTO)
void m_missingtagc(int c, M_HOLDTYPE dchar, LOGICAL start)
#else
void m_missingtagc(c, dchar, start)
int c ;
M_HOLDTYPE dchar ;
LOGICAL start ;
#endif
{
if (! m_wholetag) {
if (start) m_mberr1("Invalid parameter or missing %s", m_tagc);
@ -666,18 +654,8 @@ void m_missingtagc(c, dchar, start)
/* Have found one character in a possible short reference delimiter.
Prepare to look for the next one */
#if defined(M_PROTO)
void m_nextdelimchar(int *n, int i, LOGICAL *linestart, LOGICAL newlinestart,
LOGICAL skipblank, unsigned char type)
#else
void m_nextdelimchar(n, i, linestart, newlinestart, skipblank, type)
int *n ;
int i ;
LOGICAL *linestart ;
LOGICAL newlinestart ;
LOGICAL skipblank ;
unsigned char type ;
#endif
{
int k ;
char mb_re,mb_seqchar, mb_rschar;
@ -725,12 +703,7 @@ void m_readcomments(M_NOPAR)
}
/* Scanner */
#if defined(M_PROTO)
int m_scan(LOGICAL prolog)
#else
int m_scan(prolog)
LOGICAL prolog ;
#endif
{
int c ;
M_HOLDTYPE dchar ;
@ -878,13 +851,7 @@ while (TRUE)
/* Process explicit or implied USEMAP or ADDMAP */
#if defined(M_PROTO)
void m_setmap(int map, LOGICAL useoradd)
#else
void m_setmap(map, useoradd)
int map ;
LOGICAL useoradd ;
#endif
{
int i ;
int sref ;
@ -1102,13 +1069,7 @@ void m_sigre(M_NOPAR)
/* Returns a context-dependent delimiter string to input stream so
characters can be reread one at a time in another context */
#if defined(M_PROTO)
void m_undodelim(M_WCHAR *delim, LOGICAL flag)
#else
void m_undodelim(delim, flag)
M_WCHAR *delim ;
LOGICAL flag ;
#endif
{
M_WCHAR *p ;
@ -1125,14 +1086,7 @@ void m_undodelim(delim, flag)
/* Place a character on the current input stream. The character may have
been scanned and determined not to be part of the current token or it
may be in the expansion of an entity*/
#if defined(M_PROTO)
void m_ungetachar(int c, M_HOLDTYPE dchar, LOGICAL preread)
#else
void m_ungetachar(c, dchar, preread)
int c ;
M_HOLDTYPE dchar ;
LOGICAL preread ;
#endif
{
char buffer[10] ;
int length;

7
cde/programs/dthelp/parser/canon1/parser/string.c
View file

@ -31,14 +31,7 @@
/* Include generated code */
#include "stfile.c"
#if defined(M_PROTO)
void m_stcaction(M_WCHAR *m_string, LOGICAL M_START, LOGICAL M_END)
#else
void m_stcaction(m_string, M_START, M_END)
M_WCHAR *m_string ;
LOGICAL M_START ;
LOGICAL M_END ;
#endif
{
m_stackpar = m_stacktop->stparam ;
(*m_sttable[m_stacktop->stccase])(m_string, M_START, M_END) ;

25
cde/programs/dthelp/parser/canon1/parser/struct.c
View file

@ -88,13 +88,7 @@ int m_checkstart(val)
If VAL is not the element at the top of the parse stack, m_ckend
checks to see if the end of VAL can validly end nested
elements as well. */
#if defined(M_PROTO)
LOGICAL m_ckend(M_ELEMENT val, LOGICAL neednet)
#else
LOGICAL m_ckend(val, neednet)
M_ELEMENT val ;
LOGICAL neednet ;
#endif
{
M_PARSE *stackptr ;
M_OPENFSA *fsastack ;
@ -426,14 +420,7 @@ void m_pop(M_NOPAR)
/* Pushes a new item onto the parse stack, setting its element, current,
and neednet fields as indicated by the parameters*/
#if defined(M_PROTO)
void m_push(M_ELEMENT elt, M_STATE current, LOGICAL need)
#else
void m_push(elt, current, need)
M_ELEMENT elt ;
M_STATE current ;
LOGICAL need ;
#endif
{
M_PARSE *newstack ;
@ -654,13 +641,7 @@ LOGICAL m_strtproc(scanval)
}
/* Processes explicit or implied start tag*/
#if defined(M_PROTO)
void m_strttag(M_ELEMENT val, LOGICAL net)
#else
void m_strttag(val, net)
M_ELEMENT val ;
LOGICAL net ;
#endif
{
m_transition(val, TRUE) ;
if (val) {
@ -726,13 +707,7 @@ LOGICAL m_textpermitted(M_NOPAR)
/* Returns TRUE iff LABEL allowed in the current state of the current
element (without expanding any minimization). May result in changes
to the stack of FSA's for this element if and-groups open or close. */
#if defined(M_PROTO)
LOGICAL m_transition(M_ELEMENT label, LOGICAL recur)
#else
LOGICAL m_transition(label, recur)
M_ELEMENT label ;
LOGICAL recur ;
#endif
{
M_ARC parc ;
M_OPENFSA *newfsa ;

5
cde/programs/dthelp/parser/canon1/parser/text.c
View file

@ -36,12 +36,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
#include "tfile.c"
/* When a text character occurs */
#if defined(M_PROTO)
void m_textaction(M_WCHAR m_textchar)
#else
void m_textaction(m_textchar)
M_WCHAR m_textchar ;
#endif
{
char buffer[10] ;
char mb_re;

17
cde/programs/dthelp/parser/canon1/util/allwhite.c
View file

@ -26,25 +26,12 @@
*/
#include "basic.h"
LOGICAL m_allwhite(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
) ;
LOGICAL m_allwhite(const M_WCHAR *string);
LOGICAL m_whitespace(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
LOGICAL m_whitespace(M_WCHAR c);
/* Test if a string contains only white space characters */
#if defined(M_PROTO)
LOGICAL m_allwhite(const M_WCHAR *string )
#else
LOGICAL m_allwhite(string)
M_WCHAR *string ;
#endif /* M_PROTO */
{
const M_WCHAR *p ;

84
cde/programs/dthelp/parser/canon1/util/basic.h
View file

@ -46,87 +46,29 @@ typedef wchar_t M_WCHAR;
/* For function prototypes */
typedef char * M_POINTER;
#if defined(hpux) || defined(__aix) || defined(sun)
/* Old unix stuff
*#define void int
*#define M_NOPAR
*/
/* New Ansi style */
#define M_PROTO
#define M_NOPAR void
#else
#define M_PROTO
#define M_NOPAR void
#endif
char *MakeMByteString(
#if defined(M_PROTO)
const M_WCHAR *from
#endif
);
char *MakeMByteString(const M_WCHAR *from);
M_WCHAR *MakeWideCharString(
#if defined(M_PROTO)
const char *from
#endif
);
M_WCHAR *MakeWideCharString(const char *from);
int w_strcmp(
#if defined(M_PROTO)
const M_WCHAR *string1, const M_WCHAR *string2
#endif
);
int w_strcmp(const M_WCHAR *string1, const M_WCHAR *string2);
M_WCHAR *w_strcpy(
#if defined(M_PROTO)
M_WCHAR *string1, const M_WCHAR *string2
#endif
);
M_WCHAR *w_strcpy(M_WCHAR *string1, const M_WCHAR *string2);
M_WCHAR *w_strncpy(
#if defined(M_PROTO)
M_WCHAR *string1, const M_WCHAR *string2, int max
#endif
);
M_WCHAR *w_strncpy(M_WCHAR *string1, const M_WCHAR *string2, int max);
int w_strlen(
#if defined(M_PROTO)
const M_WCHAR *string
#endif
);
int w_strlen(const M_WCHAR *string);
M_WCHAR *w_strchr(
#if defined(M_PROTO)
M_WCHAR *string, const M_WCHAR chr
#endif
);
M_WCHAR *w_strchr(M_WCHAR *string, const M_WCHAR chr);
M_WCHAR *w_strstr(
#if defined(M_PROTO)
M_WCHAR *string1, M_WCHAR *string2
#endif
);
M_WCHAR *w_strstr(M_WCHAR *string1, M_WCHAR *string2);
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void *m_malloc(int size, char *msg);
void m_free(
#if defined(M_PROTO)
void *block, char *msg
#endif
) ;
void m_free(void *block, char *msg);
void m_err2(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2
#endif
) ;
void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
int mb_getwc(
#if defined(M_PROTO)
void *m_ptr
#endif
) ;
int mb_getwc(void *m_ptr);

174
cde/programs/dthelp/parser/canon1/util/cont.h
View file

@ -37,179 +37,63 @@ This product and information is proprietary of Tandem Computers Incorporated.
#define CONTINIT(a)
#endif
void countdown(
#if defined(M_PROTO)
M_TRIE *parent, int *count
#endif
) ;
void countdown(M_TRIE *parent, int *count);
void dumpdlmptr(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void dumpdlmptr(M_NOPAR);
void dumpnode(
#if defined(M_PROTO)
LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc)
#endif
) ;
void dumpnode(LOGICAL *first, FILE *file, M_TRIE *trieptr, int *count, void (*proc));
void dumptree(
#if defined(M_PROTO)
LOGICAL sparse
#endif
) ;
void dumptree(LOGICAL sparse);
void enterdelim(
#if defined(M_PROTO)
int n
#endif
) ;
void enterdelim(int n);
void m_error(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_error(char *text);
void m_err1(
#if defined(M_PROTO)
char *text, char *arg
#endif
) ;
void m_err1(char *text, char *arg);
void getcode(
#if defined(M_PROTO)
int n
#endif
) ;
void getcode(int n);
void getcolon(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void getcolon(M_NOPAR);
int getContext(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
int getContext(M_NOPAR);
LOGICAL getdname(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
LOGICAL getdname(M_NOPAR);
void inccon(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void inccon(M_NOPAR);
void incdelim(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void incdelim(M_NOPAR);
void loaddelim(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void loaddelim(M_NOPAR);
int m_lower(
#if defined(M_PROTO)
int c
#endif
) ;
int m_lower(int c);
int main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
int main(int argc, char **argv);
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void *m_malloc(int size, char *msg);
void nextcon(
#if defined(M_PROTO)
LOGICAL sparse
#endif
) ;
void nextcon(LOGICAL sparse);
void m_openchk(
#if defined(M_PROTO)
FILE **ptr, char *name, char *mode
#endif
) ;
void m_openchk(FILE **ptr, char *name, char *mode);
void printval(
#if defined(M_PROTO)
FILE *file, M_TRIE *value
#endif
) ;
void printval(FILE *file, M_TRIE *value);
void prtctxt(
#if defined(M_PROTO)
int column, int value
#endif
) ;
void prtctxt(int column, int value);
int readchar(
#if defined(M_PROTO)
LOGICAL cap
#endif
) ;
int readchar(LOGICAL cap);
void skiptoend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void skiptoend(M_NOPAR);
void unread(
#if defined(M_PROTO)
int c
#endif
) ;
void unread(int c);
int m_upper(
#if defined(M_PROTO)
int c
#endif
) ;
int m_upper(int c);
void warning(
#if defined(M_PROTO)
char *text
#endif
) ;
void warning(char *text);
void warning1(
#if defined(M_PROTO)
char *text, char *arg
#endif
) ;
void warning1(char *text, char *arg);
void warning2(
#if defined(M_PROTO)
char *text, char *arg1, char *arg2
#endif
) ;
void warning2(char *text, char *arg1, char *arg2);
LOGICAL m_whitespace(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
LOGICAL m_whitespace(M_WCHAR c);
#define NOMORE -1

15
cde/programs/dthelp/parser/canon1/util/conutil.c
View file

@ -55,12 +55,7 @@ void dumpdlmptr(M_NOPAR)
}
/* Output the generated data structures */
#if defined(M_PROTO)
void dumptree(LOGICAL sparse)
#else
void dumptree(sparse)
LOGICAL sparse;
#endif
{
int i, count = 0;
@ -574,12 +569,7 @@ loading = FALSE;
}
/* Output transition matrix */
#if defined(M_PROTO)
void nextcon(LOGICAL sparse)
#else
void nextcon(sparse)
LOGICAL sparse;
#endif
{
int i, j;
int firstinrow;
@ -646,12 +636,7 @@ void prtctxt(column, value)
/* Read the next input character */
#if defined(M_PROTO)
int readchar(LOGICAL cap)
#else
int readchar(cap)
LOGICAL cap;
#endif
{
int c;
M_WCHAR wnl;

6
cde/programs/dthelp/parser/canon1/util/emptyfil.c
View file

@ -29,11 +29,7 @@
#endif
#include "basic.h"
void main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
void main(int argc, char **argv);
void main(argc, argv)
int argc ;

23
cde/programs/dthelp/parser/canon1/util/entout.c
View file

@ -25,23 +25,11 @@
/* Entout has procedures to write generated entity TRIE */
void entptr(
#if defined(M_PROTO)
M_ENTITY *data
#endif
) ;
void entptr(M_ENTITY *data);
char *typetype(
#if defined(M_PROTO)
int n
#endif
) ;
char *typetype(int n);
char *typewhere(
#if defined(M_PROTO)
unsigned char n
#endif
) ;
char *typewhere(unsigned char n);
/* Macro names written to output file */
char xdbuild[] = "M_DBUILD" ;
@ -212,12 +200,7 @@ char *typetype(n)
}
/* Typewhere returns a string indicating where the nth entity was defined.*/
#if defined(M_PROTO)
char *typewhere(unsigned char n)
#else
char *typewhere(n)
unsigned char n ;
#endif
{
switch(n) {
case M_DBUILD: return(xdbuild) ;

175
cde/programs/dthelp/parser/canon1/util/error.c
View file

@ -33,128 +33,47 @@ extern FILE *m_errfile ;
extern int m_line ;
extern LOGICAL errexit ;
void eprefix(
#if defined(M_PROTO)
LOGICAL flag
#endif
) ;
void eprefix(LOGICAL flag);
void m_errline(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_errline(char *text);
void m_error(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_error(char *text);
void m_err1(
#if defined(M_PROTO)
char *text, const M_WCHAR *arg
#endif
) ;
void m_err1(char *text, const M_WCHAR *arg);
void m_mberr1(
#if defined(M_PROTO)
char *text, const char *arg
#endif
) ;
void m_mberr1(char *text, const char *arg);
void m_err2(
#if defined(M_PROTO)
const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2
#endif
) ;
void m_err2(const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2);
void m_err3(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
#endif
) ;
void m_err3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);
void m_err5(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4,
M_WCHAR *arg5
#endif
) ;
void m_err5(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4,
M_WCHAR *arg5);
void esuffix(
#if defined(M_PROTO)
void
#endif
) ;
void esuffix(void);
void msgline(
#if defined(M_PROTO)
char *text
#endif
) ;
void msgline(char *text);
void msg1line(
#if defined(M_PROTO)
char *text, char *arg1
#endif
) ;
void msg1line(char *text, char *arg1);
void skiptoend(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void skiptoend(M_NOPAR);
void m_wctrace(
#if defined(M_PROTO)
M_WCHAR *text
#endif
) ;
void m_wctrace(M_WCHAR *text);
void m_trace(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_trace(char *text);
void warning(
#if defined(M_PROTO)
char *text
#endif
) ;
void warning(char *text);
void warning1(
#if defined(M_PROTO)
char *text, M_WCHAR *arg
#endif
) ;
void warning1(char *text, M_WCHAR *arg);
void warning2(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2
#endif
) ;
void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2);
void warning3(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3
#endif
) ;
void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3);
void warning4(
#if defined(M_PROTO)
char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4
#endif
) ;
void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3, M_WCHAR *arg4);
/* Write error message prefix */
#if defined(M_PROTO)
void eprefix(LOGICAL flag)
#else
void eprefix(flag)
LOGICAL flag ;
#endif
{
if (flag) errexit = TRUE ;
fprintf(stderr, "\n**** ") ;
@ -184,13 +103,7 @@ void m_error(text)
/* Writes an error message with one argument to standard error and file
"error" */
#if defined(M_PROTO)
void m_err1(char *text, const M_WCHAR *arg)
#else
void m_err1(text, arg)
char *text;
M_WCHAR *arg ;
#endif
{
char *mb_arg;
@ -203,13 +116,7 @@ skiptoend() ;
m_free(mb_arg,"multi-byte string");
}
#if defined(M_PROTO)
void m_mberr1(char *text, const char *arg)
#else
void m_err1(text, arg)
char *text;
char *arg ;
#endif
{
eprefix(TRUE) ;
fprintf(stderr, text, arg) ;
@ -220,13 +127,7 @@ skiptoend() ;
/* Writes an error message with two arguments to standard error and file
"error" */
#if defined(M_PROTO)
void m_err2( const char *text, const M_WCHAR *arg1, const M_WCHAR *arg2)
#else
void m_err2(text, arg1, arg2)
char *text;
M_WCHAR *arg1, *arg2 ;
#endif
{
char *mb_arg1, *mb_arg2;
@ -243,13 +144,7 @@ m_free(mb_arg2,"multi-byte string");
/* Writes an error message with three arguments to standard error and file
"error" */
#if defined(M_PROTO)
void m_err3( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3)
#else
void m_err3(text, arg1, arg2, arg3)
char *text;
M_WCHAR *arg1, *arg2, *arg3 ;
#endif
{
char *mb_arg1, *mb_arg2, *mb_arg3;
@ -268,14 +163,8 @@ m_free(mb_arg3,"multi-byte string");
/* Writes an error message with five arguments to standard error and file
"error" */
#if defined(M_PROTO)
void m_err5( char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3,
M_WCHAR *arg4, M_WCHAR *arg5)
#else
void m_err5(text, arg1, arg2, arg3, arg4, arg5)
char *text;
M_WCHAR *arg1, *arg2, *arg3, *arg4, *arg5 ;
#endif
{
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4, *mb_arg5;
@ -347,13 +236,7 @@ void warning(text)
/* Writes a nonfatal error message with one argument to standard error
and file "error" */
#if defined(M_PROTO)
void warning1( char *text, M_WCHAR *arg)
#else
void warning1(text, arg)
char *text;
M_WCHAR *arg ;
#endif
{
char *mb_arg;
@ -367,13 +250,7 @@ m_free(mb_arg,"multi-byte string");
/* Writes a nonfatal error message with two arguments to standard error
and file "error" */
#if defined(M_PROTO)
void warning2(char *text, M_WCHAR *arg1, M_WCHAR *arg2)
#else
void warning2(text, arg1, arg2)
char *text;
M_WCHAR *arg1, *arg2 ;
#endif
{
char *mb_arg1, *mb_arg2;
@ -389,13 +266,7 @@ m_free(mb_arg2,"multi-byte string");
/* Writes a nonfatal error message with three arguments to standard error
and file "error" */
#if defined(M_PROTO)
void warning3(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3)
#else
void warning3(text, arg1, arg2, arg3)
char *text;
M_WCHAR *arg1, *arg2, *arg3 ;
#endif
{
char *mb_arg1, *mb_arg2, *mb_arg3;
@ -413,14 +284,8 @@ m_free(mb_arg3,"multi-byte string");
/* Writes a nonfatal error message with four arguments to standard error
and file "error" */
#if defined(M_PROTO)
void warning4(char *text, M_WCHAR *arg1, M_WCHAR *arg2, M_WCHAR *arg3,
M_WCHAR *arg4)
#else
void warning4(text, arg1, arg2, arg3, arg4)
char *text;
M_WCHAR *arg1, *arg2, *arg3, *arg4 ;
#endif
{
char *mb_arg1, *mb_arg2, *mb_arg3, *mb_arg4;

6
cde/programs/dthelp/parser/canon1/util/exit.c
View file

@ -30,11 +30,7 @@ Copyright 1988, 1989 Hewlett-Packard Co.
#endif
#include "basic.h"
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_exit(int status);
/* Exit function called by utilities used in PARSER and other programs in
the MARKUP system */

18
cde/programs/dthelp/parser/canon1/util/fclndir.c
View file

@ -58,23 +58,11 @@ struct data {
char linedir[] = "#line" ;
char *p = linedir, *q = linedir + 1 ;
void main(
#if defined(M_PROTO)
int argc, char **argv
#endif
) ;
void main(int argc, char **argv);
void copyfile(
#if defined(m_proto)
char *pfile1, char *pfile2
#endif
) ;
void copyfile(char *pfile1, char *pfile2);
int nextchar(
#if defined (M_PROTO)
FILE *file, struct data *data
#endif
) ;
int nextchar(FILE *file, struct data *data);
void main(argc, argv)
int argc ;

18
cde/programs/dthelp/parser/canon1/util/inctest.c
View file

@ -30,23 +30,11 @@
#endif
#include "basic.h"
void m_err1(
#if defined(M_PROTO)
const char *text, const char *arg
#endif
) ;
void m_err1(const char *text, const char *arg);
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_exit(int status);
void m_inctest(
#if defined(M_PROTO)
int *count, int limit, char *message
#endif
) ;
void m_inctest(int *count, int limit, char *message);
/* Increment a count and test against a limit */
void m_inctest(count, limit, message)

6
cde/programs/dthelp/parser/canon1/util/initct.c
View file

@ -29,12 +29,6 @@
#include "common.h"
extern char m_chartype[M_CHARSETLEN] ;
void m_initctype(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_initctype(M_NOPAR)
{
int i ;

12
cde/programs/dthelp/parser/canon1/util/itoa.c
View file

@ -27,17 +27,9 @@
#include <string.h>
#include "basic.h"
char *m_itoa(
#if defined(M_PROTO)
int n, char *s
#endif
) ;
char *m_itoa(int n, char *s);
void reverse(
#if defined(M_PROTO)
char *s
#endif
) ;
void reverse(char *s);
char *m_itoa(n, s) /* convert n to characters in s */
char s[];

11
cde/programs/dthelp/parser/canon1/util/letter.c
View file

@ -27,18 +27,7 @@
#include "basic.h"
LOGICAL m_letter(
#if defined(M_PROTO)
M_WCHAR c
#endif
) ;
#if defined(M_PROTO)
LOGICAL m_letter(M_WCHAR c)
#else
LOGICAL m_letter(c)
M_WCHAR c ;
#endif
{
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) return(TRUE) ;
return(FALSE) ;

6
cde/programs/dthelp/parser/canon1/util/lower.c
View file

@ -27,11 +27,7 @@
#include "basic.h"
int m_lower(
#if defined(M_PROTO)
int c
#endif
) ;
int m_lower(int c);

48
cde/programs/dthelp/parser/canon1/util/malloc.c
View file

@ -36,53 +36,21 @@
extern LOGICAL m_heapchk ;
extern LOGICAL m_malftrace ;
void m_errline(
#if defined(M_PROTO)
char *text
#endif
) ;
void m_errline(char *text);
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_exit(int status);
void m_free(
#if defined(M_PROTO)
void *block, char *msg
#endif
) ;
void m_free(void *block, char *msg);
void m_heapdump(
#if defined(M_PROTO)
M_NOPAR
#endif
) ;
void m_heapdump(M_NOPAR);
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void *m_malloc(int size, char *msg);
void *m_realloc(
#if defined(M_PROTO)
void *ptr, int size, char *msg
#endif
) ;
void *m_realloc(void *ptr, int size, char *msg);
void *m_trace(
#if defined(M_PROTO)
char *text
#endif
) ;
void *m_trace(char *text);
void *m_wctrace(
#if defined(M_PROTO)
M_WCHAR *text
#endif
) ;
void *m_wctrace(M_WCHAR *text);
void m_free(block, msg)
void *block ;

12
cde/programs/dthelp/parser/canon1/util/openchk.c
View file

@ -33,17 +33,9 @@
extern FILE *m_errfile ;
void m_exit(
#if defined(M_PROTO)
int status
#endif
) ;
void m_exit(int status);
void m_openchk(
#if defined(M_PROTO)
FILE **ptr, char *name, char *mode
#endif
) ;
void m_openchk(FILE **ptr, char *name, char *mode);
/* Open a file and check that the open succeeded */
void m_openchk(ptr, name, mode)

6
cde/programs/dthelp/parser/canon1/util/paramu.c
View file

@ -33,13 +33,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
/* Check to see if string is a valid value for parameter par. If so
return a pointer to the keyword if it's a keyword parameter and otherwise
a pointer to string. If not valid, return FALSE. */
#if defined(M_PROTO)
const M_WCHAR *m_partype(const int par , const M_WCHAR *string )
#else
M_WCHAR *m_partype(par, string)
int par ;
M_WCHAR *string ;
#endif /* M_PROTO */
{
LOGICAL first = TRUE ;
int kw ;

6
cde/programs/dthelp/parser/canon1/util/sparse.h
View file

@ -29,11 +29,7 @@
#if defined(sparse)
#define m_newcon(i, j) m_sprscon(i, j)
int m_sprscon(
#if defined(M_PROTO)
int i, int j
#endif
) ;
int m_sprscon(int i, int j);
#else
#define m_newcon(i, j) m_nextcon[i][j]

24
cde/programs/dthelp/parser/canon1/util/trie.c
View file

@ -45,26 +45,12 @@ extern FILE *m_errfile ;
extern M_CHARTYPE m_ctarray[M_CHARSETLEN] ;
void *m_malloc(
#if defined(M_PROTO)
int size, char *msg
#endif
) ;
void *m_malloc(int size, char *msg);
void m_entercharintrie(
#if defined(M_PROTO)
M_TRIE **currentnode, M_WCHAR c
#endif
) ;
void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c);
/* Enters the next character of a string into a trie */
#if defined(M_PROTO)
void m_entercharintrie(M_TRIE **currentnode, M_WCHAR c)
#else
void m_entercharintrie(currentnode, c)
M_TRIE **currentnode ;
M_WCHAR c ;
#endif
{
M_TRIE *newnode ;
@ -112,13 +98,7 @@ M_TRIE *m_gettrienode(M_NOPAR)
/* M_lookfortrie(p, xtrie) looks for string p in the specified trie,
returning its data value if found and otherwise FALSE */
#if defined(M_PROTO)
void *m_lookfortrie( const M_WCHAR *p , const M_TRIE *xtrie )
#else
void *m_lookfortrie(p, xtrie)
M_WCHAR *p ;
M_TRIE *xtrie ;
#endif /* M_PROTO */
{
M_TRIE *currentnode ;

Some files were not shown because too many files have changed in this diff Show more