summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2007-11-23 14:51:52 +0000
committerClaudio Takahasi <claudio.takahasi@openbossa.org>2007-11-23 14:51:52 +0000
commit6e49d2d6ab859761671b51b10a40b5750551e152 (patch)
tree2c05dc2357692e43006736f73fd134f69d1b80f9
parente347206fff8ff056189f574651f07015ea9b51ce (diff)
serial: minor cleanup
-rw-r--r--serial/manager.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/serial/manager.c b/serial/manager.c
index 8a6466e9..ed46a1d6 100644
--- a/serial/manager.c
+++ b/serial/manager.c
@@ -29,7 +29,6 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
-#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -767,12 +766,12 @@ static int pattern2long(const char *pattern, long *pval)
static DBusHandlerResult create_port(DBusConnection *conn,
DBusMessage *msg, void *data)
{
+ char path[MAX_PATH_LENGTH], port_name[16], uuid[MAX_LEN_UUID_STR];
+ const char *bda, *pattern, *ppath = path;
struct pending_connect *pending, *pc;
DBusMessage *reply;
DBusError derr;
bdaddr_t src, dst;
- char path[MAX_PATH_LENGTH], port_name[16], uuid[MAX_LEN_UUID_STR];
- const char *bda, *pattern, *ppath = path;
long val;
int dev_id, err;
@@ -1793,7 +1792,6 @@ static DBusHandlerResult create_proxy(DBusConnection *conn,
const char *uuid128, *address, *ppath = path;
DBusMessage *reply;
proxy_type_t type;
- GSList *l;
DBusError derr;
bdaddr_t src;
uuid_t uuid;
@@ -1817,8 +1815,8 @@ static DBusHandlerResult create_proxy(DBusConnection *conn,
return err_invalid_args(conn, msg, "Invalid address");
/* Only one proxy per address(TTY or unix socket) is allowed */
- l = g_slist_find_custom(proxies_paths, address, (GCompareFunc) proxycmp);
- if (l)
+ if (g_slist_find_custom(proxies_paths,
+ address, (GCompareFunc) proxycmp))
return err_already_exists(conn, msg, "Proxy already exists");
dev_id = hci_get_route(NULL);