Module Name: src
Committed By: joerg
Date: Tue Sep 6 18:16:01 UTC 2011
Modified Files:
src/usr.bin/m4: extern.h gnum4.c main.c misc.c
Log Message:
Move usage and onintr to make them static. Add __dead as needed.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/m4/extern.h
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/m4/gnum4.c
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/m4/main.c
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/m4/misc.c
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/m4/extern.h
diff -u src/usr.bin/m4/extern.h:1.14 src/usr.bin/m4/extern.h:1.15
--- src/usr.bin/m4/extern.h:1.14 Mon Oct 26 21:12:47 2009
+++ src/usr.bin/m4/extern.h Tue Sep 6 18:16:01 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: extern.h,v 1.49 2009/10/14 17:19:47 sthen Exp $ */
-/* $NetBSD: extern.h,v 1.14 2009/10/26 21:12:47 christos Exp $ */
+/* $NetBSD: extern.h,v 1.15 2011/09/06 18:16:01 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -96,7 +96,6 @@
extern ptrdiff_t indx(const char *, const char *);
extern void initspaces(void);
extern void killdiv(void);
-extern void onintr(int);
extern void pbnum(int);
extern void pbnumbase(int, int, int);
extern void pbunsigned(unsigned long);
@@ -105,7 +104,6 @@
extern void *xalloc(size_t, const char *fmt, ...);
extern void *xrealloc(void *, size_t, const char *fmt, ...);
extern char *xstrdup(const char *);
-extern void usage(void);
extern void resizedivs(int);
extern size_t buffer_mark(void);
extern void dump_buffer(FILE *, size_t);
Index: src/usr.bin/m4/gnum4.c
diff -u src/usr.bin/m4/gnum4.c:1.7 src/usr.bin/m4/gnum4.c:1.8
--- src/usr.bin/m4/gnum4.c:1.7 Mon Oct 26 21:16:49 2009
+++ src/usr.bin/m4/gnum4.c Tue Sep 6 18:16:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gnum4.c,v 1.7 2009/10/26 21:16:49 christos Exp $ */
+/* $NetBSD: gnum4.c,v 1.8 2011/09/06 18:16:01 joerg Exp $ */
/* $OpenBSD: gnum4.c,v 1.39 2008/08/21 21:01:04 espie Exp $ */
/*
@@ -33,7 +33,7 @@
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: gnum4.c,v 1.7 2009/10/26 21:16:49 christos Exp $");
+__RCSID("$NetBSD: gnum4.c,v 1.8 2011/09/06 18:16:01 joerg Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -203,7 +203,7 @@
static void addchar(int);
static char *twiddle(const char *);
static char *getstring(void);
-static void exit_regerror(int, regex_t *);
+static void exit_regerror(int, regex_t *) __dead;
static void do_subst(const char *, regex_t *, const char *, regmatch_t *);
static void do_regexpindex(const char *, regex_t *, regmatch_t *);
static void do_regexp(const char *, regex_t *, const char *, regmatch_t *);
Index: src/usr.bin/m4/main.c
diff -u src/usr.bin/m4/main.c:1.40 src/usr.bin/m4/main.c:1.41
--- src/usr.bin/m4/main.c:1.40 Sun Aug 14 12:59:25 2011
+++ src/usr.bin/m4/main.c Tue Sep 6 18:16:01 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: main.c,v 1.77 2009/10/14 17:19:47 sthen Exp $ */
-/* $NetBSD: main.c,v 1.40 2011/08/14 12:59:25 christos Exp $ */
+/* $NetBSD: main.c,v 1.41 2011/09/06 18:16:01 joerg Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.40 2011/08/14 12:59:25 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.41 2011/09/06 18:16:01 joerg Exp $");
#include <assert.h>
#include <signal.h>
#include <err.h>
@@ -167,7 +167,22 @@
static void enlarge_stack(void);
-int main(int, char *[]);
+__dead static void
+usage(void)
+{
+ fprintf(stderr, "usage: %s [-gPs] [-Dname[=value]] [-d flags] "
+ "[-I dirname] [-o filename]\n"
+ "\t[-t macro] [-Uname] [file ...]\n", getprogname());
+ exit(1);
+}
+
+__dead static void
+onintr(int signo)
+{
+ char intrmessage[] = "m4: interrupted.\n";
+ write(STDERR_FILENO, intrmessage, sizeof(intrmessage)-1);
+ _exit(1);
+}
int
main(int argc, char *argv[])
Index: src/usr.bin/m4/misc.c
diff -u src/usr.bin/m4/misc.c:1.21 src/usr.bin/m4/misc.c:1.22
--- src/usr.bin/m4/misc.c:1.21 Sat Mar 5 16:37:50 2011
+++ src/usr.bin/m4/misc.c Tue Sep 6 18:16:01 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: misc.c,v 1.41 2009/10/14 17:19:47 sthen Exp $ */
-/* $NetBSD: misc.c,v 1.21 2011/03/05 16:37:50 christos Exp $ */
+/* $NetBSD: misc.c,v 1.22 2011/09/06 18:16:01 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -36,7 +36,7 @@
#include "nbtool_config.h"
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: misc.c,v 1.21 2011/03/05 16:37:50 christos Exp $");
+__RCSID("$NetBSD: misc.c,v 1.22 2011/09/06 18:16:01 joerg Exp $");
#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
@@ -240,19 +240,11 @@
outfile[n] = NULL;
}
-void
-onintr(int signo)
-{
-#define intrmessage "m4: interrupted.\n"
- write(STDERR_FILENO, intrmessage, sizeof(intrmessage)-1);
- _exit(1);
-}
-
/*
* killdiv - get rid of the diversion files
*/
void
-killdiv()
+killdiv(void)
{
int n;
@@ -340,15 +332,6 @@
return p;
}
-void
-usage(void)
-{
- fprintf(stderr, "usage: %s [-gPs] [-Dname[=value]] [-d flags] "
- "[-I dirname] [-o filename]\n"
- "\t[-t macro] [-Uname] [file ...]\n", getprogname());
- exit(1);
-}
-
int
obtain_char(struct input_file *f)
{
