diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2010-03-30 12:15:11 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-03-30 12:15:11 -0500 |
| commit | d171a91ab3d44f48992a6302f42844d7924b1340 (patch) | |
| tree | 9ab34da1f8559515c677e613ac3ffc1f4224f0a4 /gatchat/test-server.c | |
| parent | f60e6ce1345d697f17cffb1242178d70a2ee2529 (diff) | |
| download | ofono-d171a91ab3d44f48992a6302f42844d7924b1340.tar.bz2 | |
Refactor: tty creation
Diffstat (limited to 'gatchat/test-server.c')
| -rw-r--r-- | gatchat/test-server.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gatchat/test-server.c b/gatchat/test-server.c index 4f8fe8fd..2893bdcd 100644 --- a/gatchat/test-server.c +++ b/gatchat/test-server.c @@ -103,7 +103,7 @@ static void set_raw_mode(int fd) tcsetattr(fd, TCSANOW, &options); } -static GAtServer *create_tty(const char *modem_path) +static gboolean create_tty(const char *modem_path) { int master, slave; char pty_name[256]; @@ -111,10 +111,10 @@ static GAtServer *create_tty(const char *modem_path) GIOChannel *client_io; if (!modem_path) - return NULL; + return FALSE; if (openpty(&master, &slave, pty_name, NULL, NULL) < 0) - return NULL; + return FALSE; set_raw_mode(slave); @@ -133,9 +133,7 @@ static GAtServer *create_tty(const char *modem_path) return FALSE; } - add_handler(server); - - return server; + return TRUE; } static gboolean on_socket_connected(GIOChannel *chan, GIOCondition cond, @@ -300,16 +298,17 @@ static void test_server(int type) { switch (type) { case 0: - server = create_tty("/phonesim1"); + if (create_tty("/phonesim1") == FALSE) + exit(-1); add_handler(server); break; case 1: - if (!create_tcp("/phonesim1", DEFAULT_TCP_PORT)) + if (create_tcp("/phonesim1", DEFAULT_TCP_PORT) == FALSE) exit(-1); break; case 2: - if (!create_unix("/phonesim1", DEFAULT_SOCK_PATH)) + if (create_unix("/phonesim1", DEFAULT_SOCK_PATH) == FALSE) exit(-1); break; } |