ecore-buffer: fix formatting 13/40313/4
authorSeunghun Lee <shiin.lee@samsung.com>
Tue, 2 Jun 2015 05:40:33 +0000 (14:40 +0900)
committerSeunghun Lee <shiin.lee@samsung.com>
Thu, 4 Jun 2015 01:05:03 +0000 (18:05 -0700)
Change-Id: I57bc9fe315b749bbaf512f18db4668ed59b77897

src/lib/ecore_buffer/ecore_buffer.c
src/lib/ecore_buffer/ecore_buffer_consumer.c
src/lib/ecore_buffer/ecore_buffer_private.h
src/lib/ecore_buffer/ecore_buffer_provider.c
src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c

index 2aaaaa9d8beb079378f519300c0586a4a37c5e44..818dfa2d6fccf6a4f610ab72ebab064371a6a697 100644 (file)
@@ -28,7 +28,7 @@ struct _Ecore_Buffer
    unsigned int flags;
 
    Ecore_Buffer_Data buffer_data;
-   Ecore_Buffer_Modulebm;
+   Ecore_Buffer_Module *bm;
 
    Eina_Hash *data;
    Eina_Inlist *free_callbacks;
@@ -38,7 +38,7 @@ struct _Ecore_Buffer_Cb_Data
 {
    EINA_INLIST;
    Ecore_Buffer_Cb cb;
-   voiddata;
+   void *data;
 };
 
 static Eina_Hash *_backends;
@@ -112,7 +112,7 @@ _ecore_buffer_backends_free(const Eina_Hash *hash EINA_UNUSED, const void *key E
 EAPI Eina_Bool
 ecore_buffer_register(Ecore_Buffer_Backend *be)
 {
-   Ecore_Buffer_Modulebm;
+   Ecore_Buffer_Module *bm;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(be, 0);
 
@@ -234,10 +234,10 @@ ecore_buffer_shutdown(void)
 }
 
 EAPI Ecore_Buffer*
-ecore_buffer_new(const charengine, unsigned int width, unsigned int height, Ecore_Buffer_Format format, unsigned int flags)
+ecore_buffer_new(const char *engine, unsigned int width, unsigned int height, Ecore_Buffer_Format format, unsigned int flags)
 {
-   Ecore_Buffer_Modulebm;
-   Ecore_Bufferbo;
+   Ecore_Buffer_Module *bm;
+   Ecore_Buffer *bo;
    void *bo_data;
 
    bm = _ecore_buffer_get_backend(engine);
@@ -323,9 +323,9 @@ ecore_buffer_new_with_tbm_surface(const char *engine, void *tbm_surface, unsigne
 }
 
 EAPI void
-ecore_buffer_free(Ecore_Bufferbuf)
+ecore_buffer_free(Ecore_Buffer *buf)
 {
-   Ecore_Buffer_Cb_Datafree_cb;
+   Ecore_Buffer_Cb_Data *free_cb;
 
    EINA_SAFETY_ON_NULL_RETURN(buf);
 
@@ -409,12 +409,12 @@ ecore_buffer_flags_get(Ecore_Buffer *buf)
 }
 
 EAPI void
-ecore_buffer_free_callback_add(Ecore_Buffer* buf, Ecore_Buffer_Cb func, void* data)
+ecore_buffer_free_callback_add(Ecore_Buffer *buf, Ecore_Buffer_Cb func, void *data)
 {
    EINA_SAFETY_ON_NULL_RETURN(buf);
    EINA_SAFETY_ON_NULL_RETURN(func);
 
-   Ecore_Buffer_Cb_Datafree_cb;
+   Ecore_Buffer_Cb_Data *free_cb;
 
    free_cb = calloc(sizeof(Ecore_Buffer_Cb_Data), 1);
    if (!free_cb)
@@ -426,9 +426,9 @@ ecore_buffer_free_callback_add(Ecore_Buffer* buf, Ecore_Buffer_Cb func, void* da
 }
 
 EAPI void
-ecore_buffer_free_callback_remove(Ecore_Buffer* buf, Ecore_Buffer_Cb func, void* data)
+ecore_buffer_free_callback_remove(Ecore_Buffer *buf, Ecore_Buffer_Cb func, void *data)
 {
-   Ecore_Buffer_Cb_Datafree_cb;
+   Ecore_Buffer_Cb_Data *free_cb;
 
    EINA_SAFETY_ON_NULL_RETURN(buf);
    EINA_SAFETY_ON_NULL_RETURN(func);
@@ -450,7 +450,7 @@ ecore_buffer_free_callback_remove(Ecore_Buffer* buf, Ecore_Buffer_Cb func, void*
 }
 
 const char *
-_ecore_buffer_engine_name_get(Ecore_Bufferbuf)
+_ecore_buffer_engine_name_get(Ecore_Buffer *buf)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(buf, 0);
    EINA_SAFETY_ON_NULL_RETURN_VAL(buf->bm, 0);
@@ -480,10 +480,10 @@ _ecore_buffer_export(Ecore_Buffer *buf, int *id)
 }
 
 Ecore_Buffer *
-_ecore_buffer_import(const charengine, int width, int height, Ecore_Buffer_Format format, Ecore_Export_Type type, int export_id, unsigned int flags)
+_ecore_buffer_import(const char *engine, int width, int height, Ecore_Buffer_Format format, Ecore_Export_Type type, int export_id, unsigned int flags)
 {
-   Ecore_Buffer_Modulebm;
-   Ecore_Bufferbo;
+   Ecore_Buffer_Module *bm;
+   Ecore_Buffer *bo;
    void *bo_data;
 
    bm = _ecore_buffer_get_backend(engine);
index d6d8c79f5c553007065b5611e669dda33195b514..24e530c066c3005786dea090fa543bb259690650 100644 (file)
@@ -25,12 +25,12 @@ struct _Ecore_Buffer_Consumer
 
 static void       _ecore_buffer_consumer_cb_provider_connected(void *data, struct bq_consumer *bq_consumer);
 static void       _ecore_buffer_consumer_cb_provider_disconnected(void *data, struct bq_consumer *bq_consumer);
-static void       _ecore_buffer_consumer_cb_buffer_attached(void *data, struct bq_consumer *bq_consumer, struct bq_buffer *id, const charengine, int32_t width, int32_t height, int32_t format, uint32_t flags);
+static void       _ecore_buffer_consumer_cb_buffer_attached(void *data, struct bq_consumer *bq_consumer, struct bq_buffer *id, const char *engine, int32_t width, int32_t height, int32_t format, uint32_t flags);
 static void       _ecore_buffer_consumer_cb_buffer_id_set(void *data, struct bq_consumer *bq_consumer, struct bq_buffer *buffer, int32_t id, int32_t offset0, int32_t stride0, int32_t offset1, int32_t stride1, int32_t offset2, int32_t stride2);
 static void       _ecore_buffer_consumer_cb_buffer_fd_set(void *data, struct bq_consumer *bq_consumer, struct bq_buffer *buffer, int32_t fd, int32_t offset0, int32_t stride0, int32_t offset1, int32_t stride1, int32_t offset2, int32_t stride2);
 static void       _ecore_buffer_consumer_cb_buffer_detached(void *data, struct bq_consumer *bq_consumer, struct bq_buffer *id);
 static void       _ecore_buffer_consumer_cb_add_buffer(void *data, struct bq_consumer *bq_consumer, struct bq_buffer *buffer, uint32_t serial);
-static void       _ecore_buffer_consumer_cb_buffer_free(Ecore_Bufferbuf, void *data);
+static void       _ecore_buffer_consumer_cb_buffer_free(Ecore_Buffer *buf, void *data);
 static Eina_Bool  _ecore_buffer_consumer_buffer_import(Ecore_Buffer_Consumer *csmr, Shared_Buffer *sb, int32_t seed, Ecore_Export_Type export_type);
 
 struct bq_consumer_listener _ecore_buffer_consumer_listener =
@@ -253,7 +253,7 @@ _ecore_buffer_consumer_cb_provider_disconnected(void *data, struct bq_consumer *
 }
 
 static void
-_ecore_buffer_consumer_cb_buffer_attached(void *data, struct bq_consumer *bq_consumer EINA_UNUSED, struct bq_buffer *id, const charengine, int32_t width, int32_t height, int32_t format, uint32_t flags)
+_ecore_buffer_consumer_cb_buffer_attached(void *data, struct bq_consumer *bq_consumer EINA_UNUSED, struct bq_buffer *id, const char *engine, int32_t width, int32_t height, int32_t format, uint32_t flags)
 {
    Ecore_Buffer_Consumer *csmr = data;
    Shared_Buffer *sb;
@@ -274,7 +274,7 @@ _ecore_buffer_consumer_cb_buffer_attached(void *data, struct bq_consumer *bq_con
 }
 
 static void
-_ecore_buffer_consumer_cb_buffer_free(Ecore_Bufferbuf, void *data EINA_UNUSED)
+_ecore_buffer_consumer_cb_buffer_free(Ecore_Buffer *buf, void *data EINA_UNUSED)
 {
    Shared_Buffer *sb = _ecore_buffer_user_data_get(buf, "shared-buffer");
 
index b5df57a83e95e78aed7da7f2d81708f2ec7961a5..4756b8c9339edd0c3bbc719fb85cb51773c92ed1 100644 (file)
@@ -33,9 +33,9 @@ do {                                         \
 
 extern int _ecore_buffer_queue_log_dom;
 
-const char        *_ecore_buffer_engine_name_get(Ecore_Bufferbuf);
+const char        *_ecore_buffer_engine_name_get(Ecore_Buffer *buf);
 Ecore_Export_Type  _ecore_buffer_export(Ecore_Buffer *buf, int *id);
-Ecore_Buffer      *_ecore_buffer_import(const charengine, int width, int height, Ecore_Buffer_Format format, Ecore_Export_Type type, int export_id, unsigned int flags);
+Ecore_Buffer      *_ecore_buffer_import(const char *engine, int width, int height, Ecore_Buffer_Format format, Ecore_Export_Type type, int export_id, unsigned int flags);
 void               _ecore_buffer_user_data_set(Ecore_Buffer *buf, const void *key, const void *data);
 void              *_ecore_buffer_user_data_get(Ecore_Buffer *buf, const void *key);
 
index a150e9d515d0cd871889aab26eaaa79a3706b0d8..297ab013a876c03d10b10071e57b31d5443db537 100644 (file)
@@ -29,7 +29,7 @@ static void           _ecore_buffer_provider_cb_consumer_disconnected(void *data
 static void           _ecore_buffer_provider_cb_add_buffer(void *data, struct bq_provider *bq_provider, struct bq_buffer *buffer, uint32_t serial);
 static Shared_Buffer *_ecore_buffer_provider_shared_buffer_new(Ecore_Buffer_Provider *pvdr, Ecore_Buffer *buffer);
 static void           _ecore_buffer_provider_shared_buffer_free(Ecore_Buffer_Provider *pvdr, Shared_Buffer *sb);
-static void           _ecore_buffer_provider_cb_buffer_free(Ecore_Bufferbuf, void *data);
+static void           _ecore_buffer_provider_cb_buffer_free(Ecore_Buffer *buf, void *data);
 
 struct bq_provider_listener _ecore_buffer_provider_listener =
 {
@@ -291,7 +291,7 @@ _ecore_buffer_provider_cb_add_buffer(void *data, struct bq_provider *bq_provider
 }
 
 static void
-_ecore_buffer_provider_cb_buffer_free(Ecore_Bufferbuf, void *data)
+_ecore_buffer_provider_cb_buffer_free(Ecore_Buffer *buf, void *data)
 {
    Ecore_Buffer_Provider *pvdr = data;
    Shared_Buffer *sb = _ecore_buffer_user_data_get(buf, "shared-buffer");
@@ -311,7 +311,7 @@ _ecore_buffer_provider_shared_buffer_new(Ecore_Buffer_Provider *pvdr, Ecore_Buff
    unsigned int w = 0, h = 0, format = 0;
    Ecore_Export_Type export_type;
    int export_id;
-   const charengine;
+   const char *engine;
    unsigned int flags;
 
    if (!pvdr)
index 3c5e099053df13738417cb564e4468d36dc58753..5ce3c4918a69a9ebf7cd8aa4e834453ee30a071f 100644 (file)
@@ -227,7 +227,7 @@ _ecore_buffer_x11_dri2_init(const char *context EINA_UNUSED, const char *options
    char *device_name;
    int fd = 0;
    drm_magic_t magic;
-   Ecore_Buffer_Module_X11_Dri2_Datamdata = NULL;
+   Ecore_Buffer_Module_X11_Dri2_Data *mdata = NULL;
 
    if (!ecore_x_init(NULL))
      return NULL;
@@ -293,11 +293,11 @@ _ecore_buffer_x11_dri2_shutdown(Ecore_Buffer_Module_Data bmdata)
 static Ecore_Buffer_Data
 _ecore_buffer_x11_dri2_buffer_alloc(Ecore_Buffer_Module_Data bmdata, int width, int height, Ecore_Buffer_Format format, unsigned int flags EINA_UNUSED)
 {
-   Ecore_X_Displayxdpy;
+   Ecore_X_Display *xdpy;
    Ecore_X_Pixmap pixmap;
    Ecore_Buffer_X11_Dri2_Data *buf;
    Ecore_Buffer_Module_X11_Dri2_Data *bm = bmdata;
-   DRI2Bufferbufs = NULL;
+   DRI2Buffer *bufs = NULL;
    tbm_bo bo = NULL;
    int bpp;
    int num_plane;
@@ -425,11 +425,11 @@ static void *
 _ecore_buffer_x11_dri2_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, int w, int h, Ecore_Buffer_Format format, Ecore_Export_Type type, int export_id, unsigned int flags EINA_UNUSED)
 {
    Ecore_Buffer_Module_X11_Dri2_Data *bm = bmdata;
-   Ecore_X_Displayxdpy;
+   Ecore_X_Display *xdpy;
    Ecore_X_Pixmap pixmap = (Ecore_X_Pixmap)export_id;
    Ecore_Buffer_X11_Dri2_Data *buf;
    int rw, rh, rx, ry;
-   DRI2Bufferbufs = NULL;
+   DRI2Buffer *bufs = NULL;
    tbm_bo bo = NULL;
    int rcount;
    unsigned int attachment = DRI2BufferFrontLeft;
index 3118bdae10b4829f7cf5f7891edc3e6423a05409..b3c0c545d11c89988e4fd295436828032b47d870 100644 (file)
@@ -537,7 +537,7 @@ static Ecore_Pixmap
 _ecore_buffer_x11_dri3_pixmap_get(Ecore_Buffer_Module_Data bmdata EINA_UNUSED, Ecore_Buffer_Data data)
 {
    Ecore_Buffer_X11_Dri3_Data *buf = data;
-   Ecore_X_Displayxdpy;
+   Ecore_X_Display *xdpy;
    Ecore_X_Window root;
    tbm_surface_info_s info;
    tbm_bo bo;