From 8cf3ec6c9fa6a1d8c8ebb2227f55f158b68fb269 Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Thu, 4 Jul 2013 08:43:26 +0900 Subject: [PATCH] Remoe last trailing comma Change-Id: I43d89a2c569463dfaa57d6b5112a46c75429ea39 --- include/fb.h | 2 +- include/livebox.h | 14 +++++++------- include/livebox_internal.h | 6 +++--- packaging/liblivebox-viewer.spec | 2 +- src/desc_parser.c | 2 +- src/fb.c | 2 +- src/master_rpc.c | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/fb.h b/include/fb.h index 757bdfe..4434692 100644 --- a/include/fb.h +++ b/include/fb.h @@ -20,7 +20,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 }; extern int fb_init(void *disp); diff --git a/include/livebox.h b/include/livebox.h index afb7c5e..32306df 100644 --- a/include/livebox.h +++ b/include/livebox.h @@ -73,7 +73,7 @@ enum content_event_type { PD_KEY_DOWN = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_KEY_MASK | CONTENT_EVENT_KEY_DOWN, PD_KEY_UP = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_KEY_MASK | CONTENT_EVENT_KEY_UP, - CONTENT_EVENT_MAX = 0xFFFFFFFF, + CONTENT_EVENT_MAX = 0xFFFFFFFF }; enum access_event_type { @@ -111,7 +111,7 @@ enum access_event_type { PD_ACCESS_ACTION_UP = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_ACTION_UP, PD_ACCESS_SCROLL_DOWN = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_DOWN, PD_ACCESS_SCROLL_MOVE = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_MOVE, - PD_ACCESS_SCROLL_UP = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_UP, + PD_ACCESS_SCROLL_UP = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_UP }; /* Exported to user app */ @@ -121,7 +121,7 @@ enum livebox_lb_type { LB_TYPE_TEXT = 0x04, /*!< Contents of a livebox is based on formatted text file */ LB_TYPE_PIXMAP = 0x08, /*!< Contens of a livebox is shared by the pixmap(depends on X) */ - LB_TYPE_INVALID = 0xFF, + LB_TYPE_INVALID = 0xFF }; enum livebox_pd_type { @@ -129,7 +129,7 @@ enum livebox_pd_type { PD_TYPE_TEXT = 0x02, /*!< Contents of a PD is based on formatted text file */ PD_TYPE_PIXMAP = 0x04, /*!< Contents of a livebox is shared by the pixmap(depends on X) */ - PD_TYPE_INVALID = 0xFF, + PD_TYPE_INVALID = 0xFF }; enum livebox_event_type { /*!< livebox_event_handler_set Event list */ @@ -160,12 +160,12 @@ enum livebox_event_type { /*!< livebox_event_handler_set Event list */ LB_EVENT_UPDATE_MODE_CHANGED, - LB_EVENT_IGNORED, /*!< Request is ignored */ + LB_EVENT_IGNORED /*!< Request is ignored */ }; enum livebox_fault_type { LB_FAULT_DEACTIVATED, /*!< Livebox is deactivated by its fault operation */ - LB_FAULT_PROVIDER_DISCONNECTED, /*!< Provider is disconnected */ + LB_FAULT_PROVIDER_DISCONNECTED /*!< Provider is disconnected */ }; enum livebox_visible_state { /*!< Must be sync'd with the provider */ @@ -174,7 +174,7 @@ enum livebox_visible_state { /*!< Must be sync'd with the provider */ LB_HIDE_WITH_PAUSE = 0x02, /*!< Livebix is hide, it will paused the update timer, but if a livebox update its contents, update event will come to you */ - LB_VISIBLE_ERROR = 0xFFFFFFFF, /* To enlarge the size of this enumeration type */ + LB_VISIBLE_ERROR = 0xFFFFFFFF /* To enlarge the size of this enumeration type */ }; /*! diff --git a/include/livebox_internal.h b/include/livebox_internal.h index 283a59b..9744c1a 100644 --- a/include/livebox_internal.h +++ b/include/livebox_internal.h @@ -51,14 +51,14 @@ enum lb_type { /*!< Must have to be sync with data-provider-master */ _LB_TYPE_SCRIPT, _LB_TYPE_FILE, _LB_TYPE_TEXT, - _LB_TYPE_BUFFER, + _LB_TYPE_BUFFER }; enum pd_type { /*!< Must have to be sync with data-provider-master */ _PD_TYPE_NONE = 0x0, _PD_TYPE_SCRIPT, _PD_TYPE_TEXT, - _PD_TYPE_BUFFER, + _PD_TYPE_BUFFER }; struct livebox { @@ -66,7 +66,7 @@ struct livebox { enum { CREATE = 0xBEEFbeef, DELETE = 0xDEADdead, /* Delete only for this client */ - DESTROYED = 0x00DEAD00, + DESTROYED = 0x00DEAD00 } state; char *cluster; diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec index dcefc38..af56433 100644 --- a/packaging/liblivebox-viewer.spec +++ b/packaging/liblivebox-viewer.spec @@ -1,6 +1,6 @@ Name: liblivebox-viewer Summary: Library for developing the application. -Version: 0.13.7 +Version: 0.13.8 Release: 1 Group: HomeTF/Livebox License: Flora License diff --git a/src/desc_parser.c b/src/desc_parser.c index d76ac8d..8050a78 100644 --- a/src/desc_parser.c +++ b/src/desc_parser.c @@ -216,7 +216,7 @@ int parse_desc(struct livebox *handle, const char *descfile, int is_pd) VALUE_DATA = 0x02, VALUE_FILE = 0x03, VALUE_OPTION = 0x04, - VALUE_ID = 0x05, + VALUE_ID = 0x05 }; const char *field_name[] = { "type", diff --git a/src/fb.c b/src/fb.c index 2092dff..62b3b25 100644 --- a/src/fb.c +++ b/src/fb.c @@ -54,7 +54,7 @@ struct fb_info { struct buffer { /*!< Must has to be sync with slave & provider */ enum { CREATED = 0x00beef00, - DESTROYED = 0x00dead00, + DESTROYED = 0x00dead00 } state; enum buffer_type type; int refcnt; diff --git a/src/master_rpc.c b/src/master_rpc.c index 904e22d..7e0bf25 100644 --- a/src/master_rpc.c +++ b/src/master_rpc.c @@ -45,7 +45,7 @@ struct command { void *data; enum { TYPE_ACK, - TYPE_NOACK, + TYPE_NOACK } type; }; -- 2.7.4