Module Name: src
Committed By: christos
Date: Thu Apr 17 18:52:03 UTC 2014
Modified Files:
src/usr.bin/xlint/common: emit.c externs.h
Log Message:
make outname print where it came from in case of error
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/xlint/common/emit.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/xlint/common/externs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/common/emit.c
diff -u src/usr.bin/xlint/common/emit.c:1.5 src/usr.bin/xlint/common/emit.c:1.6
--- src/usr.bin/xlint/common/emit.c:1.5 Tue Apr 14 21:20:57 2009
+++ src/usr.bin/xlint/common/emit.c Thu Apr 17 14:52:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: emit.c,v 1.5 2009/04/15 01:20:57 christos Exp $ */
+/* $NetBSD: emit.c,v 1.6 2014/04/17 18:52:03 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: emit.c,v 1.5 2009/04/15 01:20:57 christos Exp $");
+__RCSID("$NetBSD: emit.c,v 1.6 2014/04/17 18:52:03 christos Exp $");
#endif
#include <ctype.h>
@@ -216,11 +216,11 @@ outint(int i)
* the name is preceded by its length
*/
void
-outname(const char *name)
+outname1(const char *file, size_t line, const char *name)
{
if (name == NULL)
- errx(1, "internal error: outname() 1");
+ errx(1, "%s, %zu: internal error: outname(NULL)", file, line);
outint((int)strlen(name));
outstrg(name);
}
Index: src/usr.bin/xlint/common/externs.h
diff -u src/usr.bin/xlint/common/externs.h:1.4 src/usr.bin/xlint/common/externs.h:1.5
--- src/usr.bin/xlint/common/externs.h:1.4 Thu Apr 7 12:28:40 2005
+++ src/usr.bin/xlint/common/externs.h Thu Apr 17 14:52:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: externs.h,v 1.4 2005/04/07 16:28:40 christos Exp $ */
+/* $NetBSD: externs.h,v 1.5 2014/04/17 18:52:03 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -69,5 +69,6 @@ extern void outchar(int);
extern void outqchar(int);
extern void outstrg(const char *);
extern void outint(int);
-extern void outname(const char *);
+#define outname(a) outname1(__FILE__, __LINE__, a);
+extern void outname1(const char *, size_t, const char *);
extern void outsrc(const char *);
