svn commit: r228396 - head/usr.bin/truss

[Ed Schouten]

Author: ed
Date: Sat Dec 10 18:27:55 2011
New Revision: 228396
URL: http://svn.freebsd.org/changeset/base/228396

Log:
  Add more static keywords to truss(1) source code.
  
  There are some tables in the source code that are only used by the
  individual source files themselves. Therefore there is no need to export
  them.

Modified:
  head/usr.bin/truss/amd64-linux32.c
  head/usr.bin/truss/i386-linux.c
  head/usr.bin/truss/main.c
  head/usr.bin/truss/syscalls.c

Modified: head/usr.bin/truss/amd64-linux32.c
==============================================================================
--- head/usr.bin/truss/amd64-linux32.c	Sat Dec 10 18:21:03 2011	(r228395)
+++ head/usr.bin/truss/amd64-linux32.c	Sat Dec 10 18:27:55 2011	(r228396)
@@ -228,7 +228,7 @@ amd64_linux32_syscall_entry(struct truss
 /*
  * Linux syscalls return negative errno's, we do positive and map them
  */
-const int bsd_to_linux_errno[] = {
+static const int bsd_to_linux_errno[] = {
   	-0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,  -8,  -9,
  	-10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
  	-20, -21, -22, -23, -24, -25, -26, -27, -28, -29,

Modified: head/usr.bin/truss/i386-linux.c
==============================================================================
--- head/usr.bin/truss/i386-linux.c	Sat Dec 10 18:21:03 2011	(r228395)
+++ head/usr.bin/truss/i386-linux.c	Sat Dec 10 18:27:55 2011	(r228396)
@@ -228,7 +228,7 @@ i386_linux_syscall_entry(struct trussinf
 /*
  * Linux syscalls return negative errno's, we do positive and map them
  */
-const int bsd_to_linux_errno[] = {
+static const int bsd_to_linux_errno[] = {
   	-0,  -1,  -2,  -3,  -4,  -5,  -6,  -7,  -8,  -9,
  	-10, -35, -12, -13, -14, -15, -16, -17, -18, -19,
  	-20, -21, -22, -23, -24, -25, -26, -27, -28, -29,

Modified: head/usr.bin/truss/main.c
==============================================================================
--- head/usr.bin/truss/main.c	Sat Dec 10 18:21:03 2011	(r228395)
+++ head/usr.bin/truss/main.c	Sat Dec 10 18:27:55 2011	(r228396)
@@ -74,7 +74,7 @@ usage(void)
  * WARNING! "FreeBSD a.out" must be first, or set_etype will not
  * work correctly.
  */
-struct ex_types {
+static struct ex_types {
 	const char *type;
 	void (*enter_syscall)(struct trussinfo *, int);
 	long (*exit_syscall)(struct trussinfo *, int);

Modified: head/usr.bin/truss/syscalls.c
==============================================================================
--- head/usr.bin/truss/syscalls.c	Sat Dec 10 18:21:03 2011	(r228395)
+++ head/usr.bin/truss/syscalls.c	Sat Dec 10 18:27:55 2011	(r228396)
@@ -89,7 +89,7 @@ static const char rcsid[] =
 /*
  * This should probably be in its own file, sorted alphabetically.
  */
-struct syscall syscalls[] = {
+static struct syscall syscalls[] = {
 	{ .name = "fcntl", .ret_type = 1, .nargs = 3,
 	  .args = { { Int, 0 } , { Fcntl, 1 }, { Fcntlflag | OUT, 2 } } },
 	{ .name = "fork", .ret_type = 1, .nargs = 0 },
@@ -283,7 +283,7 @@ static struct xlat kevent_flags[] = {
 	X(EV_CLEAR) X(EV_FLAG1) X(EV_ERROR) X(EV_EOF) XEND
 };
 
-struct xlat poll_flags[] = {
+static struct xlat poll_flags[] = {
 	X(POLLSTANDARD) X(POLLIN) X(POLLPRI) X(POLLOUT) X(POLLERR)
 	X(POLLHUP) X(POLLNVAL) X(POLLRDNORM) X(POLLRDBAND)
 	X(POLLWRBAND) X(POLLINIGNEOF) XEND