summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2000-07-03 23:01:01 +0000
committermatt <matt@NetBSD.org>2000-07-03 23:01:01 +0000
commitd71ca2d66e24a37f00a1b76e87b56c3d45ba1825 (patch)
tree521d582e9f224de15c78ee4f5e83d82f7d5ad17d
parenta00a01e5147c11a56149ad334e997e0bcca36743 (diff)
__syscall takes a quad_t as its first argument, not an int.
_strrchr takes an int (due to promotion) as its third arg. don't print the null byte at the end of string. error messages should end with a linefeed.
-rw-r--r--lib/csu/common_elf/common.c6
-rw-r--r--lib/csu/common_elf/common.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/csu/common_elf/common.c b/lib/csu/common_elf/common.c
index 6b445b32c11..254bc1f6f92 100644
--- a/lib/csu/common_elf/common.c
+++ b/lib/csu/common_elf/common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.10 2000/06/16 20:52:49 christos Exp $ */
+/* $NetBSD: common.c,v 1.11 2000/07/03 23:01:01 matt Exp $ */
/*
* Copyright (c) 1995 Christopher G. Demetriou
@@ -67,9 +67,9 @@ _rtld_setup(cleanup, obj)
{
if ((obj == NULL) || (obj->magic != RTLD_MAGIC))
- _FATAL("Corrupt Obj_Entry pointer in GOT");
+ _FATAL("Corrupt Obj_Entry pointer in GOT\n");
if (obj->version != RTLD_VERSION)
- _FATAL("Dynamic linker version mismatch");
+ _FATAL("Dynamic linker version mismatch\n");
atexit(cleanup);
}
diff --git a/lib/csu/common_elf/common.h b/lib/csu/common_elf/common.h
index 7b1be35fa3b..3b2edff8ea5 100644
--- a/lib/csu/common_elf/common.h
+++ b/lib/csu/common_elf/common.h
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.6 2000/06/14 17:24:55 cgd Exp $ */
+/* $NetBSD: common.h,v 1.7 2000/07/03 23:01:01 matt Exp $ */
/*
* Copyright (c) 1995 Christopher G. Demetriou
@@ -53,17 +53,17 @@
typedef void Obj_Entry;
#endif
-extern int __syscall __P((int, ...));
+extern int __syscall __P((quad_t, ...));
#define _exit(v) __syscall(SYS_exit, (v))
#define write(fd, s, n) __syscall(SYS_write, (fd), (s), (n))
#define _FATAL(str) \
do { \
- write(2, str, sizeof(str)); \
+ write(2, str, sizeof(str)-1); \
_exit(1); \
} while (0)
-static char *_strrchr __P((char *, char));
+static char *_strrchr __P((char *, int));
char **environ;
char *__progname = "";