summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrik Flykt <patrik.flykt@linux.intel.com>2013-04-18 10:00:00 +0300
committerPatrik Flykt <patrik.flykt@linux.intel.com>2013-04-23 12:35:30 +0300
commitfc8c1be1cc13d756dde3b256a211bca85c6bae78 (patch)
treee3c6b2a0017c08da5675e2a2d00dfbdfcf54ca4b
parent711ae36e115e74d2f0c694718708ff3b84bc28c4 (diff)
downloadconnman-fc8c1be1cc13d756dde3b256a211bca85c6bae78.tar.gz
connman-fc8c1be1cc13d756dde3b256a211bca85c6bae78.tar.bz2
connman-fc8c1be1cc13d756dde3b256a211bca85c6bae78.zip
client: Follow coding style
Follow coding style and use __connmanctl prefix for the commands() function.
-rw-r--r--client/commands.c2
-rw-r--r--client/commands.h2
-rw-r--r--client/input.c7
3 files changed, 6 insertions, 5 deletions
diff --git a/client/commands.c b/client/commands.c
index a463e00f..8b4ca535 100644
--- a/client/commands.c
+++ b/client/commands.c
@@ -1256,7 +1256,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 b3536a6c..ce9ceca2 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 289faea9..f1aa0d34 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) {