[waffle] [PATCH 8/8] android: coding style fixes
Emil Velikov
emil.l.velikov at gmail.com
Tue Apr 5 22:52:25 UTC 2016
Follow waffle's coding style by re-indent and adding space between the
type and *.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/waffle/android/droid_display.c | 2 +-
src/waffle/android/droid_platform.c | 12 +++---
src/waffle/android/droid_surfaceflingerlink.cpp | 55 ++++++++++---------------
src/waffle/android/droid_surfaceflingerlink.h | 26 +++++-------
4 files changed, 38 insertions(+), 57 deletions(-)
diff --git a/src/waffle/android/droid_display.c b/src/waffle/android/droid_display.c
index 6e66d17..306b5f7 100644
--- a/src/waffle/android/droid_display.c
+++ b/src/waffle/android/droid_display.c
@@ -35,7 +35,7 @@
struct wcore_display*
droid_display_connect(struct wcore_platform *wc_plat,
- const char *name)
+ const char *name)
{
bool ok = true;
struct droid_display *self;
diff --git a/src/waffle/android/droid_platform.c b/src/waffle/android/droid_platform.c
index bbf2b14..bf5f34f 100644
--- a/src/waffle/android/droid_platform.c
+++ b/src/waffle/android/droid_platform.c
@@ -84,19 +84,17 @@ error:
}
static bool
-droid_dl_can_open(
- struct wcore_platform *wc_self,
- int32_t waffle_dl)
+droid_dl_can_open(struct wcore_platform *wc_self,
+ int32_t waffle_dl)
{
return linux_platform_dl_can_open(droid_platform(wc_self)->linux,
waffle_dl);
}
static void*
-droid_dl_sym(
- struct wcore_platform *wc_self,
- int32_t waffle_dl,
- const char *name)
+droid_dl_sym(struct wcore_platform *wc_self,
+ int32_t waffle_dl,
+ const char *name)
{
return linux_platform_dl_sym(droid_platform(wc_self)->linux,
waffle_dl, name);
diff --git a/src/waffle/android/droid_surfaceflingerlink.cpp b/src/waffle/android/droid_surfaceflingerlink.cpp
index c3e2fc8..d8422a1 100644
--- a/src/waffle/android/droid_surfaceflingerlink.cpp
+++ b/src/waffle/android/droid_surfaceflingerlink.cpp
@@ -50,7 +50,7 @@ struct droid_surfaceflinger_container {
struct droid_ANativeWindow_container {
// it is important ANativeWindow* is the first element in this structure
- ANativeWindow* native_window;
+ ANativeWindow *native_window;
sp<SurfaceControl> surface_control;
sp<ANativeWindow> window;
};
@@ -61,7 +61,7 @@ const int32_t droid_magic_surface_z = 0x7FFFFFFF;
static void
droid_tear_down_surfaceflinger_link(
- waffle::droid_surfaceflinger_container* pSFContainer)
+ waffle::droid_surfaceflinger_container *pSFContainer)
{
delete pSFContainer->composer_client;
delete pSFContainer;
@@ -70,9 +70,9 @@ droid_tear_down_surfaceflinger_link(
static droid_surfaceflinger_container*
droid_setup_surfaceflinger_link()
{
- bool bRVal;
+ droid_surfaceflinger_container *pSFContainer;
EGLint iRVal;
- droid_surfaceflinger_container* pSFContainer;
+ bool bRVal;
pSFContainer = new droid_surfaceflinger_container;
pSFContainer->composer_client = new SurfaceComposerClient;
@@ -90,9 +90,8 @@ error:
}
static void
-droid_destroy_surface(
- droid_surfaceflinger_container* pSFContainer,
- droid_ANativeWindow_container* pANWContainer)
+droid_destroy_surface(droid_surfaceflinger_container *pSFContainer,
+ droid_ANativeWindow_container *pANWContainer)
{
delete pANWContainer->window;
pSFContainer->composer_client->openGlobalTransaction();
@@ -104,15 +103,12 @@ droid_destroy_surface(
}
static droid_ANativeWindow_container*
-droid_setup_surface(
- int width,
- int height,
- droid_surfaceflinger_container* pSFContainer)
+droid_setup_surface(int width, int height,
+ droid_surfaceflinger_container *pSFContainer)
{
- bool bRVal;
+ droid_ANativeWindow_container *pANWContainer;
EGLint iRVal;
-
- droid_ANativeWindow_container* pANWContainer;
+ bool bRVal;
pANWContainer = new droid_ANativeWindow_container;
@@ -179,9 +175,8 @@ error:
}
static bool
-droid_show_surface(
- droid_surfaceflinger_container* pSFContainer,
- droid_ANativeWindow_container* pANWContainer)
+droid_show_surface(droid_surfaceflinger_container *pSFContainer,
+ droid_ANativeWindow_container *pANWContainer)
{
int iRVal;
@@ -198,11 +193,9 @@ droid_show_surface(
}
static bool
-droid_resize_surface(
- droid_surfaceflinger_container* pSFContainer,
- droid_ANativeWindow_container* pANWContainer,
- int width,
- int height)
+droid_resize_surface(droid_surfaceflinger_container *pSFContainer,
+ droid_ANativeWindow_container* pANWContainer,
+ int width, int height)
{
int iRVal;
@@ -249,9 +242,8 @@ droid_create_surface(
}
extern "C" bool
-droid_show_surface(
- droid_surfaceflinger_container* pSFContainer,
- droid_ANativeWindow_container* pANWContainer)
+droid_show_surface(droid_surfaceflinger_container *pSFContainer,
+ droid_ANativeWindow_container *pANWContainer)
{
return waffle::droid_show_surface(
reinterpret_cast<waffle::droid_surfaceflinger_container*>
@@ -261,11 +253,9 @@ droid_show_surface(
}
extern "C" bool
-droid_resize_surface(
- droid_surfaceflinger_container* pSFContainer,
- droid_ANativeWindow_container* pANWContainer,
- int height,
- int width)
+droid_resize_surface(droid_surfaceflinger_container *pSFContainer,
+ droid_ANativeWindow_container *pANWContainer,
+ int height, int width)
{
return waffle::droid_resize_surface(
reinterpret_cast<waffle::droid_surfaceflinger_container*>
@@ -275,9 +265,8 @@ droid_resize_surface(
}
extern "C" void
-droid_destroy_surface(
- droid_surfaceflinger_container* pSFContainer,
- droid_ANativeWindow_container* pANWContainer)
+droid_destroy_surface(droid_surfaceflinger_container *pSFContainer,
+ droid_ANativeWindow_container *pANWContainer)
{
return waffle::droid_destroy_surface(
reinterpret_cast<waffle::droid_surfaceflinger_container*>
diff --git a/src/waffle/android/droid_surfaceflingerlink.h b/src/waffle/android/droid_surfaceflingerlink.h
index 67c1dc2..7367ce9 100644
--- a/src/waffle/android/droid_surfaceflingerlink.h
+++ b/src/waffle/android/droid_surfaceflingerlink.h
@@ -33,30 +33,24 @@ struct droid_surfaceflinger_container;
struct droid_ANativeWindow_container;
void
-droid_destroy_surface(
- struct droid_surfaceflinger_container* pSFContainer,
- struct droid_ANativeWindow_container* pANWContainer);
+droid_destroy_surface(struct droid_surfaceflinger_container *pSFContainer,
+ struct droid_ANativeWindow_container *pANWContainer);
bool
-droid_show_surface(
- struct droid_surfaceflinger_container* pSFContainer,
- struct droid_ANativeWindow_container* pANWContainer);
+droid_show_surface(struct droid_surfaceflinger_container *pSFContainer,
+ struct droid_ANativeWindow_container *pANWContainer);
bool
-droid_resize_surface(
- struct droid_surfaceflinger_container* pSFContainer,
- struct droid_ANativeWindow_container* pANWContainer,
- int width,
- int height);
+droid_resize_surface(struct droid_surfaceflinger_container *pSFContainer,
+ struct droid_ANativeWindow_container *pANWContainer,
+ int width, int height);
struct droid_ANativeWindow_container*
-droid_create_surface(
- int width,
- int height,
- struct droid_surfaceflinger_container* pSFContainer);
+droid_create_surface(int width, int height,
+ struct droid_surfaceflinger_container *pSFContainer);
bool
-droid_deinit_gl(struct droid_surfaceflinger_container* pSFContainer);
+droid_deinit_gl(struct droid_surfaceflinger_container *pSFContainer);
struct droid_surfaceflinger_container*
droid_init_gl();
--
2.8.0
More information about the waffle
mailing list