From 403066f6cd6f4df68f68178acc2db0926370e95c Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 28 Apr 2006 14:30:59 +0000
Subject: Cleanup main function declarations

---
 dund/main.c          | 2 +-
 hcid/passkey-agent.c | 2 +-
 pand/main.c          | 2 +-
 sdpd/main.c          | 2 +-
 test/hciemu.c        | 2 +-
 tools/hciconfig.c    | 8 ++++----
 tools/hcitool.c      | 2 +-
 tools/sdptool.c      | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dund/main.c b/dund/main.c
index 06055fde..8c311763 100644
--- a/dund/main.c
+++ b/dund/main.c
@@ -431,7 +431,7 @@ static char main_help[] =
 	"\t--activesync -a           Enable Microsoft ActiveSync networking\n"
 	"\t--cache -C[valid]         Enable address cache\n";
 
-int main(int argc, char **argv)
+int main(int argc, char *argv[])
 {
 	char *dst = NULL, *src = NULL;
 	struct sigaction sa;
diff --git a/hcid/passkey-agent.c b/hcid/passkey-agent.c
index 8a5442ef..e47afe6b 100644
--- a/hcid/passkey-agent.c
+++ b/hcid/passkey-agent.c
@@ -277,7 +277,7 @@ static struct option main_options[] = {
 	{ 0, 0, 0, 0 }
 };
 
-int main(int argc, char **argv)
+int main(int argc, char *argv[])
 {
 	struct sigaction sa;
 	DBusConnection *conn;
diff --git a/pand/main.c b/pand/main.c
index 2f258aa3..50b355b6 100644
--- a/pand/main.c
+++ b/pand/main.c
@@ -556,7 +556,7 @@ static char main_help[] =
 	"\t--pidfile -P <pidfile>    Create PID file\n"
 	"\t--devup -u <script>       Script to run when interface comes up\n";
 
-int main(int argc, char **argv)
+int main(int argc, char *argv[])
 {
 	char *dst = NULL, *src = NULL;
 	struct sigaction sa;
diff --git a/sdpd/main.c b/sdpd/main.c
index d5aac4da..269d5af8 100644
--- a/sdpd/main.c
+++ b/sdpd/main.c
@@ -407,7 +407,7 @@ static struct option main_options[] = {
 	{ 0, 0, 0, 0}
 };
 
-int main(int argc, char **argv)
+int main(int argc, char *argv[])
 {
 	uint16_t mtu = 0;
 	int daemonize = 1, public = 0, master = 0;
diff --git a/test/hciemu.c b/test/hciemu.c
index f6a35044..d6996a3e 100644
--- a/test/hciemu.c
+++ b/test/hciemu.c
@@ -1179,7 +1179,7 @@ static struct option main_options[] = {
 	{ 0 }
 };
 
-int main(int argc, char *argv[], char *env[])
+int main(int argc, char *argv[])
 {
 	struct sigaction sa;
 	GIOChannel *dev_io;
diff --git a/tools/hciconfig.c b/tools/hciconfig.c
index e6868f0c..3ebfc1c8 100644
--- a/tools/hciconfig.c
+++ b/tools/hciconfig.c
@@ -1532,12 +1532,12 @@ static void usage(void)
 }
 
 static struct option main_options[] = {
-	{"help", 0,0, 'h'},
-	{"all",  0,0, 'a'},
-	{0, 0, 0, 0}
+	{ "help",	0, 0, 'h' },
+	{ "all",	0, 0, 'a' },
+	{ 0, 0, 0, 0 }
 };
 
-int main(int argc, char **argv, char **env)
+int main(int argc, char *argv[])
 {
 	int opt, ctl, i, cmd=0;
 
diff --git a/tools/hcitool.c b/tools/hcitool.c
index 2ad26bfe..594c2601 100644
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -2081,7 +2081,7 @@ static struct option main_options[] = {
 	{ 0, 0, 0, 0 }
 };
 
-int main(int argc, char **argv)
+int main(int argc, char *argv[])
 {
 	int opt, i, dev_id = -1;
 	bdaddr_t ba;
diff --git a/tools/sdptool.c b/tools/sdptool.c
index 8bee7985..8beff568 100644
--- a/tools/sdptool.c
+++ b/tools/sdptool.c
@@ -3786,7 +3786,7 @@ static struct option main_options[] = {
 	{ 0, 0, 0, 0 }
 };
 
-int main(int argc, char **argv)
+int main(int argc, char *argv[])
 {
 	int i, opt;
 
-- 
cgit