Follow coding style and use __connmanctl prefix for the commands() function.
---
client/commands.c | 2 +-
client/commands.h | 2 +-
client/input.c | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/client/commands.c b/client/commands.c
index 1a5f638..5937c54 100644
--- a/client/commands.c
+++ b/client/commands.c
@@ -1081,7 +1081,7 @@ static int cmd_help(char *args[], int num, struct option
*options)
return 0;
}
-int commands(DBusConnection *dbus_conn, char *argv[], int argc)
+int __connmanctl_commands(DBusConnection *dbus_conn, char *argv[], int argc)
{
int i, result;
diff --git a/client/commands.h b/client/commands.h
index b3536a6..ce9ceca 100644
--- a/client/commands.h
+++ b/client/commands.h
@@ -22,4 +22,4 @@
#include <dbus/dbus.h>
-int commands(DBusConnection *connection, char *argv[], int argc);
+int __connmanctl_commands(DBusConnection *connection, char *argv[], int argc);
diff --git a/client/input.c b/client/input.c
index 289faea..f1aa0d3 100644
--- a/client/input.c
+++ b/client/input.c
@@ -102,7 +102,7 @@ static void rl_handler(char *input)
args = g_strsplit(input, " ", 0);
num = g_strv_length(args);
- err = commands(connection, args, num);
+ err = __connmanctl_commands(connection, args, num);
g_strfreev(args);
@@ -160,9 +160,10 @@ int __connmanctl_input_init(int argc, char *argv[])
if (strcmp(argv[1], "--help") == 0 ||
strcmp(argv[1], "-h") == 0)
- err = commands(connection, help, 1);
+ err = __connmanctl_commands(connection, help, 1);
else
- err = commands(connection, argv + 1, argc -1);
+ err = __connmanctl_commands(connection, argv + 1,
+ argc -1);
}
if (err == -EINPROGRESS) {
--
1.7.10.4
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
