korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-26 22:33:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

android/client: Fix various coding style issues

Browse Source
This commit is contained in:
Johan Hedberg 2013-10-23 13:04:40 +03:00
parent 674d6fe8a5
commit 5526825ed9
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/client/if-pan.c
View File

@ -47,7 +47,7 @@ static void control_state_cb(btpan_control_state_t state, bt_status_t error,
haltest_info("%s: state=%s error=%s local_role=%s ifname=%s\n",
__func__, btpan_control_state_t2str(state),
bt_status_t2str(error), btpan_role_t2str(local_role),
ifname);
ifname);
}
static char last_used_addr[18];
@ -79,8 +79,8 @@ static void init_p(int argc, const char **argv)
/* enable */
static void enable_c(int argc, const const char **argv,
enum_func *penum_func, void **puser)
static void enable_c(int argc, const const char **argv, enum_func *penum_func,
void **puser)
{
if (argc == 3) {
*puser = TYPE_ENUM(btpan_role_t);
@ -120,8 +120,8 @@ static void get_local_role_p(int argc, const char **argv)
/* connect */
static void connect_c(int argc, const const char **argv,
enum_func *penum_func, void **puser)
static void connect_c(int argc, const const char **argv, enum_func *penum_func,
void **puser)
{
if (argc == 3) {
*puser = NULL;

16
android/client/if-sock.c
View File

@ -106,7 +106,7 @@ static void receive_sock_connect_signal(struct pollfd *pollfd)
if (pollfd->revents & POLLHUP) {
haltest_error("Disconnected fd=%d revents=0x%X\n", pollfd->fd,
pollfd->revents);
pollfd->revents);
poll_unregister_fd(pollfd->fd, receive_sock_connect_signal);
}
}
@ -166,8 +166,8 @@ static void read_accepted(int fd)
break;
}
haltest_info("Incoming connection from %s channel %d status=%d fd=%d\n",
bt_bdaddr_t2str(&cs.bd_addr, addr_str), cs.channel,
cs.status, accepted_fd);
bt_bdaddr_t2str(&cs.bd_addr, addr_str),
cs.channel, cs.status, accepted_fd);
poll_register_fd(accepted_fd, POLLIN, receive_from_client);
}
@ -184,8 +184,8 @@ static void client_connected(struct pollfd *pollfd)
/** listen */
static void listen_c(int argc, const char **argv,
enum_func *penum_func, void **puser)
static void listen_c(int argc, const char **argv, enum_func *penum_func,
void **puser)
{
if (argc == 3) {
*puser = TYPE_ENUM(btsock_type_t);
@ -323,8 +323,10 @@ static void connect_p(int argc, const char **argv)
/* Methods available in btsock_interface_t */
static struct method methods[] = {
STD_METHODCH(listen, "<sock_type> <srvc_name> <uuid> [<channle>] [<flags>]"),
STD_METHODCH(connect, "<addr> <sock_type> <uuid> <channle> [<flags>]"),
STD_METHODCH(listen,
"<sock_type> <srvc_name> <uuid> [<channle>] [<flags>]"),
STD_METHODCH(connect,
"<addr> <sock_type> <uuid> <channle> [<flags>]"),
END_METHOD
};