-only generate warnings when there are conflict resolvers but no conflicts,

-handle "onerror" differently
This commit is contained in:
ceriel
1987-04-13 16:11:50 +00:00
parent 218c1c46c4
commit 4805d67ca1
3 changed files with 36 additions and 6 deletions

View File

@@ -206,6 +206,18 @@ error(lineno,s,t,u) string s,t,u; {
fputs("\n",stderr);
}
/* VARARGS1 */
warning(lineno,s,t,u) string s,t,u; {
/*
* Just a warning
*/
if (!lineno) lineno = 1;
fprintf(stderr,"\"%s\", line %d : (Warning) ",f_input, lineno);
fprintf(stderr,s,t,u);
fputs("\n",stderr);
}
/* VARARGS1 */
fatal(lineno,s,t,u) string s,t,u; {
/*