Rename connector to com-core

Change-Id: I184df9a0bff4c579cc3abef8d436bc658e6b0ed8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea87f01..1f2d967 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(connector C)
+PROJECT(com-core C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
@@ -32,10 +32,10 @@ ADD_DEFINITIONS("-DNDEBUG")
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED
        src/dlist.c
-       src/connector.c
+       src/com-core.c
        src/util.c
        src/packet.c
-       src/connector_packet.c
+       src/com-core_packet.c
        src/secure_socket.c
 )
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
@@ -48,6 +48,6 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/secure_socket.h DESTINATION include/${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/connector.h DESTINATION include/${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/connector_packet.h DESTINATION include/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/com-core.h DESTINATION include/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/com-core_packet.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/packet.h DESTINATION include/${PROJECT_NAME})

diff --git a/connector.pc.in b/com-core.pc.in
similarity index 81%
rename from connector.pc.in
rename to com-core.pc.in
index 6f15501..e1f99da 100644 (file)
--- a/connector.pc.in
+++ b/com-core.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@EXEC_PREFIX@
 libdir=@LIBDIR@
 includedir=@INCLUDEDIR@
 
-Name: connector
+Name: com-core
 Description: Light-weight IPC supporting library
 Version: @VERSION@
-Libs: -L${libdir} -lconnector
+Libs: -L${libdir} -lcom-core
 Cflags: -I${includedir}
 cppflags: -I${includedir}

diff --git a/debian/changelog b/debian/changelog
index a16d2ce..c497565 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-connector (0.0.1) unstable; urgency=low
+com-core (0.0.1) unstable; urgency=low
 
   * Initial Release.
 
-  * Git: slp/pkgs/c/connector
-  * Tag: connector_0.0.1
+  * Git: slp/pkgs/c/com-core
+  * Tag: com-core_0.0.1
 
  -- Sung-jae Park <nicesj.park@samsung.com>  Mon, 27 Feb 2012 14:14:00 +0900
 

diff --git a/debian/control b/debian/control
index 0a3cbc2..46571ac 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,25 @@
-Source: connector
+Source: com-core
 Section: libs
 Priority: optional
 Maintainer: Sung-jae Park <nicesj.park@samsung.com>, Young-joo Park <yjoo93.park@samsung.com>
 Build-Depends: debhelper (>= 5), dlog-dev
 Standards-Version: 0.1.0
 
-Package: libconnector
+Package: libcom-core
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Light-weight IPC helper library (shared object)
 
-Package: libconnector-dev
+Package: libcom-core-dev
 Section: libs
 Architecture: any
-Depends: libconnector (= ${Source-Version})
+Depends: libcom-core (= ${Source-Version})
 Description: Light-weight IPC helper library (development)
 
-Package: libconnector-dbg
+Package: libcom-core-dbg
 Section: debug
 Architecture: any
-Depends: ${misc:Depends}, libconnector (= ${Source-Version})
+Depends: ${misc:Depends}, libcom-core (= ${Source-Version})
 Description: Light-weight IPC helper library (unstripped)
 

diff --git a/debian/libconnector-dev.install.in b/debian/libcom-core-dev.install.in
similarity index 55%
rename from debian/libconnector-dev.install.in
rename to debian/libcom-core-dev.install.in
index 8246b57..0d00193 100644 (file)
--- a/debian/libconnector-dev.install.in
+++ b/debian/libcom-core-dev.install.in
@@ -1,5 +1,5 @@
-@PREFIX@/include/@PROJECT_NAME@/connector.h
+@PREFIX@/include/@PROJECT_NAME@/com-core.h
 @PREFIX@/include/@PROJECT_NAME@/packet.h
-@PREFIX@/include/@PROJECT_NAME@/connector_packet.h
+@PREFIX@/include/@PROJECT_NAME@/com-core_packet.h
 @PREFIX@/include/@PROJECT_NAME@/secure_socket.h
 @PREFIX@/lib/pkgconfig/*.pc

diff --git a/debian/libconnector.install.in b/debian/libcom-core.install.in
similarity index 100%
rename from debian/libconnector.install.in
rename to debian/libcom-core.install.in

diff --git a/debian/rules b/debian/rules
index 0307d1c..82abff6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ CFLAGS += -Wall -Werror -Winline
 LDFLAGS +=
 PREFIX ?= /usr
 DATADIR ?= /opt
-PROJECT_NAME ?= connector
+PROJECT_NAME ?= com-core
 
 BUILDDIR ?= $(CURDIR)/cmake-tmp
 
@@ -101,7 +101,7 @@ binary-arch: build install
 #      dh_installinfo
        dh_installman
        dh_link
-       dh_strip --dbg-package=libconnector-dbg
+       dh_strip --dbg-package=libcom-core-dbg
        dh_compress
        dh_fixperms
 #      dh_perl

diff --git a/include/com-core.h b/include/com-core.h
new file mode 100644 (file)
index 0000000..d87c55b
--- /dev/null
+++ b/include/com-core.h
@@ -0,0 +1,22 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum com_core_event_type {
+       CONNECTOR_CONNECTED,
+       CONNECTOR_DISCONNECTED,
+};
+
+extern int com_core_server_create(const char *addr, int is_sync, int (*service_cb)(int fd, int readsize, void *data), void *data);
+extern int com_core_client_create(const char *addr, int is_sync, int (*service_cb)(int fd, int readsize, void *data), void *data);
+extern int com_core_server_destroy(int handle);
+extern int com_core_client_destroy(int handle);
+
+extern int com_core_add_event_callback(enum com_core_event_type type, int (*service_cb)(int handle, void *data), void *data);
+extern void *com_core_del_event_callback(enum com_core_event_type type, int (*service_cb)(int handle, void *data), void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+/* End of a file */

diff --git a/include/com-core_packet.h b/include/com-core_packet.h
new file mode 100644 (file)
index 0000000..a6ef79b
--- /dev/null
+++ b/include/com-core_packet.h
@@ -0,0 +1,23 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct method {
+       const char *cmd;
+       struct packet *(*handler)(pid_t pid, int handle, struct packet *packet);
+};
+
+extern int com_core_packet_async_send(int handle, struct packet *packet, int (*recv_cb)(pid_t, int handle, const struct packet *packet, void *data), void *data);
+extern int com_core_packet_send_only(int handle, struct packet *packet);
+extern struct packet *com_core_packet_oneshot_send(const char *addr, struct packet *packet);
+
+extern int com_core_packet_client_init(const char *addr, int is_sync, struct method *table);
+extern int com_core_packet_client_fini(int handle);
+extern int com_core_packet_server_init(const char *addr, struct method *table);
+extern int com_core_packet_server_fini(int handle);
+
+#ifdef __cplusplus
+}
+#endif
+
+/* End of a file */

diff --git a/include/connector.h b/include/connector.h
deleted file mode 100644 (file)
index 890986a..0000000
--- a/include/connector.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum connector_event_type {
-       CONNECTOR_CONNECTED,
-       CONNECTOR_DISCONNECTED,
-};
-
-extern int connector_server_create(const char *addr, int is_sync, int (*service_cb)(int fd, int readsize, void *data), void *data);
-extern int connector_client_create(const char *addr, int is_sync, int (*service_cb)(int fd, int readsize, void *data), void *data);
-extern int connector_server_destroy(int handle);
-extern int connector_client_destroy(int handle);
-
-extern int connector_add_event_callback(enum connector_event_type type, int (*service_cb)(int handle, void *data), void *data);
-extern void *connector_del_event_callback(enum connector_event_type type, int (*service_cb)(int handle, void *data), void *data);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* End of a file */

diff --git a/include/connector_packet.h b/include/connector_packet.h
deleted file mode 100644 (file)
index e9bdd20..0000000
--- a/include/connector_packet.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct method {
-       const char *cmd;
-       struct packet *(*handler)(pid_t pid, int handle, struct packet *packet);
-};
-
-extern int connector_packet_async_send(int handle, struct packet *packet, int (*recv_cb)(pid_t, int handle, const struct packet *packet, void *data), void *data);
-extern int connector_packet_send_only(int handle, struct packet *packet);
-extern struct packet *connector_packet_oneshot_send(const char *addr, struct packet *packet);
-
-extern int connector_packet_client_init(const char *addr, int is_sync, struct method *table);
-extern int connector_packet_client_fini(int handle);
-extern int connector_packet_server_init(const char *addr, struct method *table);
-extern int connector_packet_server_fini(int handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* End of a file */

diff --git a/packaging/libconnector.spec b/packaging/libcom-core.spec
similarity index 81%
rename from packaging/libconnector.spec
rename to packaging/libcom-core.spec
index f4bfffc..febc25f 100644 (file)
--- a/packaging/libconnector.spec
+++ b/packaging/libcom-core.spec
@@ -1,4 +1,4 @@
-Name: libconnector
+Name: libcom-core
 Summary: Library for the light-weight IPC 
 Version: 0.0.1
 Release: 1
@@ -39,8 +39,8 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-/usr/include/connector/connector.h
-/usr/include/connector/packet.h
-/usr/include/connector/connector_packet.h
-/usr/include/connector/secure_socket.h
+/usr/include/com-core/com-core.h
+/usr/include/com-core/packet.h
+/usr/include/com-core/com-core_packet.h
+/usr/include/com-core/secure_socket.h
 /usr/lib/pkgconfig/*.pc

diff --git a/src/connector.c b/src/com-core.c
similarity index 91%
rename from src/connector.c
rename to src/com-core.c
index 9aa3bfc..f711c9d 100644 (file)
--- a/src/connector.c
+++ b/src/com-core.c
@@ -14,7 +14,7 @@
 #include "secure_socket.h"
 #include "packet.h"
 #include "debug.h"
-#include "connector.h"
+#include "com-core.h"
 #include "util.h"
 
 static struct {
@@ -148,7 +148,7 @@ static gboolean accept_cb(GIOChannel *src, GIOCondition cond, gpointer data)
        return TRUE;
 }
 
-EAPI int connector_server_create(const char *addr, int is_sync, int (*service_cb)(int fd, int readsize, void *data), void *data)
+EAPI int com_core_server_create(const char *addr, int is_sync, int (*service_cb)(int fd, int readsize, void *data), void *data)
 {
        GIOChannel *gio;
        guint id;
@@ -199,7 +199,7 @@ EAPI int connector_server_create(const char *addr, int is_sync, int (*service_cb
        return fd;
 }
 
-EAPI int connector_client_create(const char *addr, int is_sync, int (*service_cb)(int fd, int readsize, void *data), void *data)
+EAPI int com_core_client_create(const char *addr, int is_sync, int (*service_cb)(int fd, int readsize, void *data), void *data)
 {
        GIOChannel *gio;
        guint id;
@@ -251,7 +251,7 @@ EAPI int connector_client_create(const char *addr, int is_sync, int (*service_cb
        return client_fd;
 }
 
-EAPI int connector_add_event_callback(enum connector_event_type type, int (*evt_cb)(int handle, void *data), void *data)
+EAPI int com_core_add_event_callback(enum com_core_event_type type, int (*evt_cb)(int handle, void *data), void *data)
 {
        struct evtdata *cbdata;
        cbdata = malloc(sizeof(*cbdata));
@@ -270,7 +270,7 @@ EAPI int connector_add_event_callback(enum connector_event_type type, int (*evt_
        return 0;
 }
 
-EAPI void *connector_del_event_callback(enum connector_event_type type, int (*cb)(int handle, void *data), void *data)
+EAPI void *com_core_del_event_callback(enum com_core_event_type type, int (*cb)(int handle, void *data), void *data)
 {
        struct dlist *l;
        struct dlist *n;
@@ -301,13 +301,13 @@ EAPI void *connector_del_event_callback(enum connector_event_type type, int (*cb
        return NULL;
 }
 
-EAPI int connector_server_destroy(int handle)
+EAPI int com_core_server_destroy(int handle)
 {
        close(handle);
        return 0;
 }
 
-EAPI int connector_client_destroy(int handle)
+EAPI int com_core_client_destroy(int handle)
 {
        close(handle);
        return 0;

diff --git a/src/connector_packet.c b/src/com-core_packet.c
similarity index 87%
rename from src/connector_packet.c
rename to src/com-core_packet.c
index 7205684..7fc7ce2 100644 (file)
--- a/src/connector_packet.c
+++ b/src/com-core_packet.c
@@ -8,11 +8,11 @@
 #include <dlog.h>
 
 #include "debug.h"
-#include "connector.h"
+#include "com-core.h"
 #include "packet.h"
 #include "secure_socket.h"
 #include "dlist.h"
-#include "connector_packet.h"
+#include "com-core_packet.h"
 #include "util.h"
 
 static struct info {
@@ -336,7 +336,7 @@ static int service_cb(int handle, int readsize, void *data)
        return 0;
 }
 
-EAPI int connector_packet_async_send(int handle, struct packet *packet, int (*recv_cb)(pid_t pid, int handle, const struct packet *packet, void *data), void *data)
+EAPI int com_core_packet_async_send(int handle, struct packet *packet, int (*recv_cb)(pid_t pid, int handle, const struct packet *packet, void *data), void *data)
 {
        int ret;
        struct request_ctx *ctx;
@@ -359,7 +359,7 @@ EAPI int connector_packet_async_send(int handle, struct packet *packet, int (*re
        return 0;
 }
 
-EAPI int connector_packet_send_only(int handle, struct packet *packet)
+EAPI int com_core_packet_send_only(int handle, struct packet *packet)
 {
        int ret;
 
@@ -370,7 +370,7 @@ EAPI int connector_packet_send_only(int handle, struct packet *packet)
        return 0;
 }
 
-EAPI struct packet *connector_packet_oneshot_send(const char *addr, struct packet *packet)
+EAPI struct packet *com_core_packet_oneshot_send(const char *addr, struct packet *packet)
 {
        int ret;
        int fd;
@@ -428,58 +428,58 @@ EAPI struct packet *connector_packet_oneshot_send(const char *addr, struct packe
        return result;
 }
 
-static inline int connector_packet_init(void)
+static inline int com_core_packet_init(void)
 {
-       return connector_add_event_callback(CONNECTOR_DISCONNECTED, client_disconnected_cb, NULL);
+       return com_core_add_event_callback(CONNECTOR_DISCONNECTED, client_disconnected_cb, NULL);
 }
 
-static inline int connector_packet_fini(void)
+static inline int com_core_packet_fini(void)
 {
-       connector_del_event_callback(CONNECTOR_DISCONNECTED, client_disconnected_cb, NULL);
+       com_core_del_event_callback(CONNECTOR_DISCONNECTED, client_disconnected_cb, NULL);
        return 0;
 }
 
-EAPI int connector_packet_client_init(const char *addr, int is_sync, struct method *table)
+EAPI int com_core_packet_client_init(const char *addr, int is_sync, struct method *table)
 {
        int ret;
 
-       ret = connector_packet_init();
+       ret = com_core_packet_init();
        if (ret < 0)
                return ret;
 
-       ret = connector_client_create(addr, 0, service_cb, table);
+       ret = com_core_client_create(addr, 0, service_cb, table);
        if (ret < 0)
-               connector_packet_fini();
+               com_core_packet_fini();
 
        return ret;
 }
 
-EAPI int connector_packet_client_fini(int handle)
+EAPI int com_core_packet_client_fini(int handle)
 {
-       connector_client_destroy(handle);
-       connector_packet_fini();
+       com_core_client_destroy(handle);
+       com_core_packet_fini();
        return 0;
 }
 
-EAPI int connector_packet_server_init(const char *addr, struct method *table)
+EAPI int com_core_packet_server_init(const char *addr, struct method *table)
 {
        int ret;
 
-       ret = connector_packet_init();
+       ret = com_core_packet_init();
        if (ret < 0)
                return ret;
 
-       ret = connector_server_create(addr, 0, service_cb, table);
+       ret = com_core_server_create(addr, 0, service_cb, table);
        if (ret < 0)
-               connector_packet_fini();
+               com_core_packet_fini();
 
        return ret;
 }
 
-EAPI int connector_packet_server_fini(int handle)
+EAPI int com_core_packet_server_fini(int handle)
 {
-       connector_server_destroy(handle);
-       connector_packet_fini();
+       com_core_server_destroy(handle);
+       com_core_packet_fini();
        return 0;
 }
 

diff --git a/src/util.c b/src/util.c
index 187b3cf..01414b3 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -16,7 +16,7 @@ const char *util_basename(const char *name)
 
        while (--length > 0 && name[length] != '/');
 
-       return length <= 0 ? name : name + length;
+       return length <= 0 ? name : name + length + (name[length] == '/');
 }
 
 /* End of a file */