From bad7bffd0f5bf0b002133994c360ed178fae9a10 Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Thu, 4 Jul 2013 08:38:58 +0900 Subject: [PATCH] Remove last trailing comma Change-Id: I6d761cae850308cfcc697dfc1698e7f5cb519a32 --- include/buffer_handler.h | 2 +- include/client_life.h | 4 ++-- include/event.h | 2 +- include/instance.h | 6 +++--- include/package.h | 6 +++--- include/pkgmgr.h | 4 ++-- include/service_common.h | 2 +- include/slave_life.h | 4 ++-- include/xmonitor.h | 2 +- packaging/data-provider-master.spec | 2 +- src/buffer_handler.c | 2 +- src/conf.c | 2 +- src/group.c | 2 +- src/io.c | 2 +- src/parser.c | 4 ++-- src/script_handler.c | 2 +- src/server.c | 2 +- src/service_common.c | 2 +- src/util.c | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/buffer_handler.h b/include/buffer_handler.h index 6a70270..c2084cd 100644 --- a/include/buffer_handler.h +++ b/include/buffer_handler.h @@ -21,7 +21,7 @@ enum buffer_type { /*!< Must have to be sync with libprovider, liblivebox-viewer BUFFER_TYPE_FILE, BUFFER_TYPE_SHM, BUFFER_TYPE_PIXMAP, - BUFFER_TYPE_ERROR, + BUFFER_TYPE_ERROR }; /*! diff --git a/include/client_life.h b/include/client_life.h index 66caf9a..83e1899 100644 --- a/include/client_life.h +++ b/include/client_life.h @@ -16,12 +16,12 @@ enum client_event { CLIENT_EVENT_ACTIVATE, - CLIENT_EVENT_DEACTIVATE, + CLIENT_EVENT_DEACTIVATE }; enum client_global_event { CLIENT_GLOBAL_EVENT_CREATE, - CLIENT_GLOBAL_EVENT_DESTROY, + CLIENT_GLOBAL_EVENT_DESTROY }; struct inst_info; diff --git a/include/event.h b/include/event.h index 2bae5a8..3d095b2 100644 --- a/include/event.h +++ b/include/event.h @@ -23,7 +23,7 @@ struct event_data { enum event_state { EVENT_STATE_ACTIVATE, EVENT_STATE_ACTIVATED, - EVENT_STATE_DEACTIVATE, + EVENT_STATE_DEACTIVATE }; extern int event_init(void); diff --git a/include/instance.h b/include/instance.h index 409aed8..77a6971 100644 --- a/include/instance.h +++ b/include/instance.h @@ -91,7 +91,7 @@ enum instance_event { INSTANCE_EVENT_DESTROY, - INSTNACE_EVENT_UNKNOWN, + INSTNACE_EVENT_UNKNOWN }; enum instance_state { @@ -106,7 +106,7 @@ enum instance_state { /*! */ INST_DESTROYED, /*!< Instance is unloaded and also it requires to be deleted from the master */ - INST_REQUEST_TO_DESTROY, /*!< Sent a request to a slave, when the master receives deleted event, the master will delete this */ + INST_REQUEST_TO_DESTROY /*!< Sent a request to a slave, when the master receives deleted event, the master will delete this */ }; enum livebox_visible_state { /*!< Must be sync'd with livebox-viewer */ @@ -115,7 +115,7 @@ enum livebox_visible_state { /*!< Must be sync'd with livebox-viewer */ LB_HIDE_WITH_PAUSE = 0x02, /*!< Livebix is hide, it needs to be paused (with freezed update timer) */ - LB_VISIBLE_ERROR = 0xFFFFFFFF, /* To enlarge the size of this enumeration type */ + LB_VISIBLE_ERROR = 0xFFFFFFFF /* To enlarge the size of this enumeration type */ }; #define IS_PD 1 diff --git a/include/package.h b/include/package.h index 330628f..71d911d 100644 --- a/include/package.h +++ b/include/package.h @@ -19,19 +19,19 @@ enum lb_type { LB_TYPE_SCRIPT, LB_TYPE_FILE, LB_TYPE_TEXT, - LB_TYPE_BUFFER, + LB_TYPE_BUFFER }; enum pd_type { PD_TYPE_NONE = 0x0, PD_TYPE_SCRIPT, PD_TYPE_TEXT, - PD_TYPE_BUFFER, + PD_TYPE_BUFFER }; enum alter_type { ALTER_CREATE, - ALTER_DESTROY, + ALTER_DESTROY }; struct pkg_info; diff --git a/include/pkgmgr.h b/include/pkgmgr.h index dfc8e33..e4fe4c2 100644 --- a/include/pkgmgr.h +++ b/include/pkgmgr.h @@ -19,7 +19,7 @@ enum pkgmgr_event_type { PKGMGR_EVENT_INSTALL, PKGMGR_EVENT_UPDATE, PKGMGR_EVENT_UNINSTALL, - PKGMGR_EVENT_RECOVER, + PKGMGR_EVENT_RECOVER }; enum pkgmgr_status { @@ -27,7 +27,7 @@ enum pkgmgr_status { PKGMGR_STATUS_PROCESSING, PKGMGR_STATUS_COMMAND, PKGMGR_STATUS_END, - PKGMGR_STATUS_ERROR, + PKGMGR_STATUS_ERROR }; extern int pkgmgr_init(void); diff --git a/include/service_common.h b/include/service_common.h index eaa06ea..9cc0885 100644 --- a/include/service_common.h +++ b/include/service_common.h @@ -16,7 +16,7 @@ enum tcb_type { TCB_CLIENT_TYPE_APP = 0x00, TCB_CLIENT_TYPE_SERVICE = 0x01, - TCB_CLIENT_TYPE_UNKNOWN = 0xff, + TCB_CLIENT_TYPE_UNKNOWN = 0xff }; struct tcb; diff --git a/include/slave_life.h b/include/slave_life.h index d294520..5f7fd35 100644 --- a/include/slave_life.h +++ b/include/slave_life.h @@ -29,7 +29,7 @@ enum slave_event { SLAVE_EVENT_PAUSE, SLAVE_EVENT_RESUME, - SLAVE_NEED_TO_REACTIVATE, + SLAVE_NEED_TO_REACTIVATE }; enum slave_state { @@ -64,7 +64,7 @@ enum slave_state { SLAVE_PAUSED, SLAVE_RESUMED, - SLAVE_ERROR = 0xFF, /* Explicitly define the size of this enum type */ + SLAVE_ERROR = 0xFF /* Explicitly define the size of this enum type */ }; extern struct slave_node *slave_ref(struct slave_node *slave); diff --git a/include/xmonitor.h b/include/xmonitor.h index 46d4e51..3e01722 100644 --- a/include/xmonitor.h +++ b/include/xmonitor.h @@ -18,7 +18,7 @@ enum xmonitor_event { XMONITOR_PAUSED, XMONITOR_RESUMED, - XMONITOR_ERROR = 0xFFFFFFFF, /* To specify the size of this enum */ + XMONITOR_ERROR = 0xFFFFFFFF /* To specify the size of this enum */ }; extern int xmonitor_init(void); diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index a442560..6e6a363 100644 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -1,6 +1,6 @@ Name: data-provider-master Summary: Master service provider for liveboxes. -Version: 0.24.16 +Version: 0.24.17 Release: 1 Group: HomeTF/Livebox License: Flora License diff --git a/src/buffer_handler.c b/src/buffer_handler.c index 3db618c..7d67b6a 100644 --- a/src/buffer_handler.c +++ b/src/buffer_handler.c @@ -56,7 +56,7 @@ struct buffer { enum { CREATED = 0x00beef00, - DESTROYED = 0x00dead00, + DESTROYED = 0x00dead00 } state; enum buffer_type type; int refcnt; diff --git a/src/conf.c b/src/conf.c index 31c33a0..5ff4739 100644 --- a/src/conf.c +++ b/src/conf.c @@ -322,7 +322,7 @@ HAPI int conf_loader(void) VALUE, ERROR, COMMENT, - END, + END } state; int ch_idx; int token_idx; diff --git a/src/group.c b/src/group.c index 02851b7..e8650a8 100644 --- a/src/group.c +++ b/src/group.c @@ -492,7 +492,7 @@ HAPI int group_add_livebox(const char *group, const char *pkgname) CONTEXT_ITEM, CONTEXT_OPTION_KEY, CONTEXT_OPTION_VALUE, - CONTEXT_ERROR = 0xFFFFFFFF, + CONTEXT_ERROR = 0xFFFFFFFF } state; state = CLUSTER; diff --git a/src/io.c b/src/io.c index db03937..1d6ee69 100644 --- a/src/io.c +++ b/src/io.c @@ -59,7 +59,7 @@ static inline int load_abi_table(void) GROUP = 0x1, TAG = 0x02, VALUE = 0x03, - ERROR = 0x05, + ERROR = 0x05 } state; enum { PKGNAME = 0x0, diff --git a/src/parser.c b/src/parser.c index babe376..dab3536 100644 --- a/src/parser.c +++ b/src/parser.c @@ -203,7 +203,7 @@ static inline int parse_size(const char *buffer, unsigned int *size) HEIGHT, ERROR, STOP, - END, + END } state; *size = 0; @@ -529,7 +529,7 @@ HAPI struct parser *parser_load(const char *pkgname) VALUE, ERROR, COMMENT, - END, + END } state; int ch_idx; int token_idx; diff --git a/src/script_handler.c b/src/script_handler.c index 76ac35c..91a6285 100644 --- a/src/script_handler.c +++ b/src/script_handler.c @@ -835,7 +835,7 @@ HAPI int script_handler_parse_desc(const char *pkgname, const char *id, const ch VALUE_FILE = 0x03, VALUE_OPTION = 0x04, VALUE_ID = 0x05, - VALUE_TARGET = 0x06, + VALUE_TARGET = 0x06 }; const char *field_name[] = { "type", diff --git a/src/server.c b/src/server.c index 1934462..e0a4ea8 100644 --- a/src/server.c +++ b/src/server.c @@ -68,7 +68,7 @@ static struct info { enum target_type { TYPE_LB, TYPE_PD, - TYPE_ERROR, + TYPE_ERROR }; struct access_cbdata { diff --git a/src/service_common.c b/src/service_common.c index b9116a4..27ab295 100644 --- a/src/service_common.c +++ b/src/service_common.c @@ -40,7 +40,7 @@ int errno; struct service_event_item { enum { - SERVICE_EVENT_TIMER, + SERVICE_EVENT_TIMER } type; union { diff --git a/src/util.c b/src/util.c index 9b34132..60792ce 100644 --- a/src/util.c +++ b/src/util.c @@ -240,7 +240,7 @@ HAPI char *util_replace_string(const char *src, const char *pattern, const char STATE_START, STATE_FIND, STATE_CHECK, - STATE_END, + STATE_END } state; if (!src || !pattern) -- 2.7.4