Module Name: src
Committed By: joerg
Date: Mon Aug 29 14:47:48 UTC 2011
Modified Files:
src/bin/pax: extern.h options.c pax.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/bin/pax/extern.h
cvs rdiff -u -r1.110 -r1.111 src/bin/pax/options.c
cvs rdiff -u -r1.46 -r1.47 src/bin/pax/pax.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/extern.h
diff -u src/bin/pax/extern.h:1.57 src/bin/pax/extern.h:1.58
--- src/bin/pax/extern.h:1.57 Sat Jun 18 23:07:04 2011
+++ src/bin/pax/extern.h Mon Aug 29 14:47:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.57 2011/06/18 23:07:04 christos Exp $ */
+/* $NetBSD: extern.h,v 1.58 2011/08/29 14:47:47 joerg Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -204,7 +204,6 @@
extern int havechd;
void options(int, char **);
OPLIST * opt_next(void);
-int opt_add(const char *);
int bad_opt(void);
int mkpath(char *);
char *chdname;
@@ -265,9 +264,6 @@
extern char *tempfile;
extern char *tempbase;
-int main(int, char **);
-void sig_cleanup(int);
-
/*
* sel_subs.c
*/
Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.110 src/bin/pax/options.c:1.111
--- src/bin/pax/options.c:1.110 Sat Jun 18 23:07:04 2011
+++ src/bin/pax/options.c Mon Aug 29 14:47:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.110 2011/06/18 23:07:04 christos Exp $ */
+/* $NetBSD: options.c,v 1.111 2011/08/29 14:47:47 joerg Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: options.c,v 1.110 2011/06/18 23:07:04 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.111 2011/08/29 14:47:47 joerg Exp $");
#endif
#endif /* not lint */
@@ -81,18 +81,19 @@
static OPLIST *ophead = NULL; /* head for format specific options -x */
static OPLIST *optail = NULL; /* option tail */
+static int opt_add(const char *);
static int no_op(void);
static void printflg(unsigned int);
static int c_frmt(const void *, const void *);
static off_t str_offt(char *);
static char *get_line(FILE *fp);
static void pax_options(int, char **);
-static void pax_usage(void);
+__dead static void pax_usage(void);
static void tar_options(int, char **);
-static void tar_usage(void);
+__dead static void tar_usage(void);
#ifndef NO_CPIO
static void cpio_options(int, char **);
-static void cpio_usage(void);
+__dead static void cpio_usage(void);
#endif
/* errors from get_line */
@@ -2054,7 +2055,7 @@
return num;
}
-char *
+static char *
get_line(FILE *f)
{
char *name, *temp;
@@ -2095,7 +2096,7 @@
* print the usage summary to the user
*/
-void
+static void
pax_usage(void)
{
fprintf(stderr,
@@ -2124,7 +2125,7 @@
* print the usage summary to the user
*/
-void
+static void
tar_usage(void)
{
(void)fputs("usage: tar [-]{crtux}[-befhjklmopqvwzHOPSXZ014578] [archive] "
@@ -2141,7 +2142,7 @@
* print the usage summary to the user
*/
-void
+static void
cpio_usage(void)
{
Index: src/bin/pax/pax.c
diff -u src/bin/pax/pax.c:1.46 src/bin/pax/pax.c:1.47
--- src/bin/pax/pax.c:1.46 Sat Jun 18 23:07:04 2011
+++ src/bin/pax/pax.c Mon Aug 29 14:47:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pax.c,v 1.46 2011/06/18 23:07:04 christos Exp $ */
+/* $NetBSD: pax.c,v 1.47 2011/08/29 14:47:48 joerg Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -44,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: pax.c,v 1.46 2011/06/18 23:07:04 christos Exp $");
+__RCSID("$NetBSD: pax.c,v 1.47 2011/08/29 14:47:48 joerg Exp $");
#endif
#endif /* not lint */
@@ -337,7 +337,7 @@
* never....
*/
-void
+__dead static void
sig_cleanup(int which_sig)
{
/*
