r20261: merge 20260 from samba_3_0_24

clean up a bunch of no previous prototype warnings
(This used to be commit c60687db112405262adf26dbf267804b04074e67)

3 files changed, 6 insertions, 6 deletions

diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 31fd0225f8..d248a9459d 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -54,14 +54,14 @@ extern int optind;
 
 enum lock_op {OP_LOCK, OP_UNLOCK, OP_REOPEN};
 
-const char *lock_op_type(int op)
+static const char *lock_op_type(int op)
 {
 	if (op == WRITE_LOCK) return "write";
 	else if (op == READ_LOCK) return "read";
 	else return "other";
 }
 
-const char *lock_op_name(enum lock_op op)
+static const char *lock_op_name(enum lock_op op)
 {
 	if (op == OP_LOCK) return "lock";
 	else if (op == OP_UNLOCK) return "unlock";
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index f97fb97542..0d6c0b16f2 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -38,7 +38,7 @@ extern int optind;
 extern BOOL AllowDebugChange;
 
 /* a test fn for LANMAN mask support */
-int ms_fnmatch_lanman_core(const char *pattern, const char *string)
+static int ms_fnmatch_lanman_core(const char *pattern, const char *string)
 {
 	const char *p = pattern, *n = string;
 	char c;
@@ -112,7 +112,7 @@ next:
 	return 0;
 }
 
-int ms_fnmatch_lanman(const char *pattern, const char *string)
+static int ms_fnmatch_lanman(const char *pattern, const char *string)
 {
 	if (!strpbrk(pattern, "?*<>\"")) {
 		if (strcmp(string,"..") == 0) 
@@ -163,7 +163,7 @@ static char *reg_test(struct cli_state *cli, char *pattern, char *long_name, cha
 /***************************************************** 
 return a connection to a server
 *******************************************************/
-struct cli_state *connect_one(char *share)
+static struct cli_state *connect_one(char *share)
 {
 	struct cli_state *c;
 	struct nmb_name called, calling;
diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c
index e8db20f4a8..d913c4903f 100644
--- a/source3/torture/msgtest.c
+++ b/source3/torture/msgtest.c
@@ -29,7 +29,7 @@ static int pong_count;
 /****************************************************************************
 a useful function for testing the message system
 ****************************************************************************/
-void pong_message(int msg_type, struct process_id src, void *buf, size_t len)
+static void pong_message(int msg_type, struct process_id src, void *buf, size_t len)
 {
 	pong_count++;
 }