summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/xlint/lint1/err.c6
-rw-r--r--usr.bin/xlint/lint1/tree.c12
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c
index 7b1740fbf03..ba64269c3eb 100644
--- a/usr.bin/xlint/lint1/err.c
+++ b/usr.bin/xlint/lint1/err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.c,v 1.14 2005/12/10 19:19:31 cloder Exp $ */
+/* $OpenBSD: err.c,v 1.15 2005/12/14 22:09:40 kjell Exp $ */
/* $NetBSD: err.c,v 1.8 1995/10/02 17:37:00 jpo Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: err.c,v 1.14 2005/12/10 19:19:31 cloder Exp $";
+static char rcsid[] = "$OpenBSD: err.c,v 1.15 2005/12/14 22:09:40 kjell Exp $";
#endif
/* number of errors found */
@@ -312,7 +312,7 @@ const char *msgs[] = {
"unterminated comment", /* 256 */
"extra characters in lint comment", /* 257 */
"unterminated string constant", /* 258 */
- "conversion to '%s' due to prototype, arg #%d", /* 259 */
+ "arg #%d converted to '%s' by prototype", /* 259 */
"previous declaration of %s", /* 260 */
"previous definition of %s", /* 261 */
"\\\" inside character constants undefined in traditional C", /* 262 */
diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c
index f36ebdfe0ca..dc8e5aa6313 100644
--- a/usr.bin/xlint/lint1/tree.c
+++ b/usr.bin/xlint/lint1/tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.c,v 1.24 2005/12/12 23:40:37 cloder Exp $ */
+/* $OpenBSD: tree.c,v 1.25 2005/12/14 22:09:40 kjell Exp $ */
/* $NetBSD: tree.c,v 1.12 1995/10/02 17:37:57 jpo Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: tree.c,v 1.24 2005/12/12 23:40:37 cloder Exp $";
+static char rcsid[] = "$OpenBSD: tree.c,v 1.25 2005/12/14 22:09:40 kjell Exp $";
#endif
#include <stdlib.h>
@@ -1690,8 +1690,8 @@ ptconv(int arg, tspec_t nt, tspec_t ot, type_t *tp, tnode_t *tn)
if (ptn->tn_op == CON) {
/* ok. promote() warns if constant out of range */
} else {
- /* conversion to '%s' due to prototype, arg #%d */
- warning(259, tyname(tp), arg);
+ /* arg #%d converted to '%s' by prototype */
+ warning(259, arg, tyname(tp));
}
}
} else if (hflag) {
@@ -1706,8 +1706,8 @@ ptconv(int arg, tspec_t nt, tspec_t ot, type_t *tp, tnode_t *tn)
msb(ptn->tn_val->v_quad, ot, -1) == 0) {
/* ok */
} else {
- /* conversion to '%s' due to prototype, arg #%d */
- warning(259, tyname(tp), arg);
+ /* arg #%d converted to '%s' by prototype */
+ warning(259, arg, tyname(tp));
}
}
}