From e39eb873bc14f9d462578e9c91aae6125da928f3 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Thu, 1 Aug 2013 14:35:25 +0900 Subject: [PATCH] Code Synchronization with private git Change-Id: Id12b2b06971a43406061b3d117ac957efe421da5 --- packaging/capi-network-serial.spec | 2 +- src/serial.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packaging/capi-network-serial.spec b/packaging/capi-network-serial.spec index f054fea..80826b6 100644 --- a/packaging/capi-network-serial.spec +++ b/packaging/capi-network-serial.spec @@ -1,6 +1,6 @@ Name: capi-network-serial Summary: Network Serial Framework -Version: 0.0.7 +Version: 0.0.8 Release: 0 Group: API License: Apache License, Version 2.0 diff --git a/src/serial.c b/src/serial.c index 238757f..c3c1ebb 100644 --- a/src/serial.c +++ b/src/serial.c @@ -99,8 +99,10 @@ static int __connect_to_serial_server(void *data) int client_socket = -1; struct sockaddr_un server_addr; serial_s *pHandle = (serial_s *)data; - if (pHandle == NULL) + if (pHandle == NULL) { + ERR("Invalid parameter\n"); return -1; + } client_socket = socket(AF_UNIX, SOCK_STREAM, 0); if (client_socket < 0) { @@ -142,6 +144,7 @@ static DBusHandlerResult __dbus_event_filter(DBusConnection *sys_conn, dbus_message_get_args(msg, NULL, DBUS_TYPE_INT32, &res, DBUS_TYPE_INVALID); + DBG("serial_status : %d\n", res); serial_s *pHandle = (serial_s *)data; if (res == SERIAL_OPENED) { @@ -320,7 +323,7 @@ int serial_close(serial_h serial) serial_s *pHandle = (serial_s *)serial; - if (pHandle->client_socket > 0) { + if (pHandle->client_socket >= 0) { if (close(pHandle->client_socket) < 0) return SERIAL_ERROR_OPERATION_FAILED; @@ -355,10 +358,10 @@ int serial_destroy(serial_h serial) if (pHandle->g_watch_id > 0) { g_source_remove(pHandle->g_watch_id); - pHandle->g_watch_id = -1; + pHandle->g_watch_id = 0; } - if (pHandle->client_socket > 0) { + if (pHandle->client_socket >= 0) { close(pHandle->client_socket); pHandle->client_socket = -1; } @@ -380,8 +383,8 @@ int serial_write(serial_h serial, const char *data, int data_length) ret = send(pHandle->client_socket, data, data_length, MSG_EOR); if (ret == -1) { - ERR("Send failed. "); - return SERIAL_ERROR_OPERATION_FAILED; + ERR("Send failed. "); + return SERIAL_ERROR_OPERATION_FAILED; } return ret; -- 2.7.4