diff options
| author | mycroft <mycroft@NetBSD.org> | 1993-12-07 01:44:23 +0000 |
|---|---|---|
| committer | mycroft <mycroft@NetBSD.org> | 1993-12-07 01:44:23 +0000 |
| commit | e977e5242bccd16b22f333b76c1dea69d0fb9dfd (patch) | |
| tree | 0c4c494dc7376cd8f9767741ef69691624bc39a6 /gnu | |
| parent | da5de96b8ad35eb2c1cc4b4b2443eca7627200fd (diff) | |
Prototype concat() more strongly, and remove bogus definitions of variables
in system .h files.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/ld/common/etc.c | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/common/ld.h | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/etc.c | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/ld.h | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/ld/warnings.c | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/warnings.c | 9 |
6 files changed, 14 insertions, 20 deletions
diff --git a/gnu/usr.bin/ld/common/etc.c b/gnu/usr.bin/ld/common/etc.c index 33c6bf26604..1f4cc89a32f 100644 --- a/gnu/usr.bin/ld/common/etc.c +++ b/gnu/usr.bin/ld/common/etc.c @@ -1,5 +1,5 @@ /* - * $Id: etc.c,v 1.2 1993/10/21 00:52:52 pk Exp $ + * $Id: etc.c,v 1.3 1993/12/07 01:44:23 mycroft Exp $ */ #include <sys/param.h> @@ -85,7 +85,7 @@ fatal(fmt, va_alist) char * concat(s1, s2, s3) - char *s1, *s2, *s3; + const char *s1, *s2, *s3; { register int len1 = strlen (s1), len2 = strlen (s2), diff --git a/gnu/usr.bin/ld/common/ld.h b/gnu/usr.bin/ld/common/ld.h index 617c5213a3b..a4148d190fc 100644 --- a/gnu/usr.bin/ld/common/ld.h +++ b/gnu/usr.bin/ld/common/ld.h @@ -1,4 +1,4 @@ -/* $Id: ld.h,v 1.5 1993/11/10 21:53:42 pk Exp $ */ +/* $Id: ld.h,v 1.6 1993/12/07 01:44:25 mycroft Exp $ */ /*- * This code is derived from software copyrighted by the Free Software * Foundation. @@ -844,7 +844,7 @@ void *xrealloc __P((void *, int)); void fatal __P((char *, ...)); void error __P((char *, ...)); void padfile __P((int,int)); -char *concat __P((char *, char *, char *)); +char *concat __P((const char *, const char *, const char *)); int parse __P((char *, char *, char *)); /* In symbol.c: */ diff --git a/gnu/usr.bin/ld/etc.c b/gnu/usr.bin/ld/etc.c index 33c6bf26604..1f4cc89a32f 100644 --- a/gnu/usr.bin/ld/etc.c +++ b/gnu/usr.bin/ld/etc.c @@ -1,5 +1,5 @@ /* - * $Id: etc.c,v 1.2 1993/10/21 00:52:52 pk Exp $ + * $Id: etc.c,v 1.3 1993/12/07 01:44:23 mycroft Exp $ */ #include <sys/param.h> @@ -85,7 +85,7 @@ fatal(fmt, va_alist) char * concat(s1, s2, s3) - char *s1, *s2, *s3; + const char *s1, *s2, *s3; { register int len1 = strlen (s1), len2 = strlen (s2), diff --git a/gnu/usr.bin/ld/ld.h b/gnu/usr.bin/ld/ld.h index 617c5213a3b..a4148d190fc 100644 --- a/gnu/usr.bin/ld/ld.h +++ b/gnu/usr.bin/ld/ld.h @@ -1,4 +1,4 @@ -/* $Id: ld.h,v 1.5 1993/11/10 21:53:42 pk Exp $ */ +/* $Id: ld.h,v 1.6 1993/12/07 01:44:25 mycroft Exp $ */ /*- * This code is derived from software copyrighted by the Free Software * Foundation. @@ -844,7 +844,7 @@ void *xrealloc __P((void *, int)); void fatal __P((char *, ...)); void error __P((char *, ...)); void padfile __P((int,int)); -char *concat __P((char *, char *, char *)); +char *concat __P((const char *, const char *, const char *)); int parse __P((char *, char *, char *)); /* In symbol.c: */ diff --git a/gnu/usr.bin/ld/ld/warnings.c b/gnu/usr.bin/ld/ld/warnings.c index e1910741a08..7c9a451ee6c 100644 --- a/gnu/usr.bin/ld/ld/warnings.c +++ b/gnu/usr.bin/ld/ld/warnings.c @@ -1,5 +1,5 @@ /* - * $Id: warnings.c,v 1.4 1993/11/05 12:45:25 pk Exp $ + * $Id: warnings.c,v 1.5 1993/12/07 01:44:26 mycroft Exp $ */ #include <sys/param.h> @@ -9,6 +9,7 @@ #include <sys/stat.h> #include <sys/file.h> #include <sys/time.h> +#include <sys/errno.h> #include <fcntl.h> #include <ar.h> #include <ranlib.h> @@ -112,10 +113,8 @@ fatal_with_file (fmt, entry, va_alist) */ void perror_name (name) - char *name; + char *name; { - extern int errno, sys_nerr; - extern char *sys_errlist[]; char *s; if (errno < sys_nerr) @@ -133,8 +132,6 @@ void perror_file (entry) struct file_entry *entry; { - extern int errno, sys_nerr; - extern char *sys_errlist[]; char *s; if (errno < sys_nerr) diff --git a/gnu/usr.bin/ld/warnings.c b/gnu/usr.bin/ld/warnings.c index e1910741a08..7c9a451ee6c 100644 --- a/gnu/usr.bin/ld/warnings.c +++ b/gnu/usr.bin/ld/warnings.c @@ -1,5 +1,5 @@ /* - * $Id: warnings.c,v 1.4 1993/11/05 12:45:25 pk Exp $ + * $Id: warnings.c,v 1.5 1993/12/07 01:44:26 mycroft Exp $ */ #include <sys/param.h> @@ -9,6 +9,7 @@ #include <sys/stat.h> #include <sys/file.h> #include <sys/time.h> +#include <sys/errno.h> #include <fcntl.h> #include <ar.h> #include <ranlib.h> @@ -112,10 +113,8 @@ fatal_with_file (fmt, entry, va_alist) */ void perror_name (name) - char *name; + char *name; { - extern int errno, sys_nerr; - extern char *sys_errlist[]; char *s; if (errno < sys_nerr) @@ -133,8 +132,6 @@ void perror_file (entry) struct file_entry *entry; { - extern int errno, sys_nerr; - extern char *sys_errlist[]; char *s; if (errno < sys_nerr) |
