englebass pushed a commit to branch master.
commit 068f1ddc628b8bff0b82a87201c2e753845c4978
Author: Sebastian Dransfeld <[email protected]>
Date: Thu Jun 20 13:08:36 2013 +0200
efl: formatting
---
src/bin/edje/edje_cc_out.c | 2 +-
src/bin/edje/edje_player.c | 2 +-
src/bin/evas/dummy_slave.c | 2 +-
src/examples/ecore/ecore_evas_extn_socket_example.c | 2 +-
src/lib/ecore_con/dns.c | 8 ++++----
src/lib/ecore_con/ecore_con_eet.c | 4 ++--
src/lib/ecore_evas/ecore_evas_util.c | 2 +-
src/lib/eina/eina_module.c | 2 +-
src/lib/eina/eina_value.c | 10 +++++-----
src/lib/evil/evil_util.c | 2 +-
src/modules/emotion/generic/emotion_generic.c | 2 +-
src/modules/evas/engines/gl_common/evas_gl_texture.c | 2 +-
src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c | 2 +-
src/tests/eina/eina_test_model.c | 2 +-
14 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 411a503..f1e487b 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -102,7 +102,7 @@ struct _Script_Lua_Writer
int size;
};
-typedef struct _Script_Write Script_Write;;
+typedef struct _Script_Write Script_Write;
typedef struct _Head_Write Head_Write;
typedef struct _Fonts_Write Fonts_Write;
typedef struct _Image_Write Image_Write;
diff --git a/src/bin/edje/edje_player.c b/src/bin/edje/edje_player.c
index 45bb589..8f93447 100644
--- a/src/bin/edje/edje_player.c
+++ b/src/bin/edje/edje_player.c
@@ -796,7 +796,7 @@ _edje_load_or_show_error(Evas_Object *edje, const char
*file, const char *group)
if (edje_object_file_set(edje, file, group))
{
- edje_object_signal_callback_add(edje, "edje,change,file", "edje",
_edje_reload, NULL);;
+ edje_object_signal_callback_add(edje, "edje,change,file", "edje",
_edje_reload, NULL);
evas_object_focus_set(edje, EINA_TRUE);
return EINA_TRUE;
}
diff --git a/src/bin/evas/dummy_slave.c b/src/bin/evas/dummy_slave.c
index ba815dc..a64ec53 100644
--- a/src/bin/evas/dummy_slave.c
+++ b/src/bin/evas/dummy_slave.c
@@ -144,7 +144,7 @@ int main(int c, char **v)
{
int wfd, rfd;
Slave_Command cmd;
- void *params = NULL;;
+ void *params = NULL;
Eina_Bool quit = EINA_FALSE;
if (c < 3)
diff --git a/src/examples/ecore/ecore_evas_extn_socket_example.c
b/src/examples/ecore/ecore_evas_extn_socket_example.c
index f171c3f..e88adba 100644
--- a/src/examples/ecore/ecore_evas_extn_socket_example.c
+++ b/src/examples/ecore/ecore_evas_extn_socket_example.c
@@ -83,7 +83,7 @@ _mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *e
{
Ecore_Evas *ee = data;
size_t len = 0;
- char *buf = NULL;;
+ char *buf = NULL;
num++;
diff --git a/src/lib/ecore_con/dns.c b/src/lib/ecore_con/dns.c
index 87ecbff..7a0d5e1 100644
--- a/src/lib/ecore_con/dns.c
+++ b/src/lib/ecore_con/dns.c
@@ -431,7 +431,7 @@ static inline unsigned dns_k_permutor_powof(unsigned n) {
unsigned m, i = 0;
for (m = 1; m < n; m <<= 1, i++)
- ;;
+ ;
return i;
} /* dns_k_permutor_powof() */
@@ -748,7 +748,7 @@ size_t dns_strlcpy(char *dst, const char *src, size_t lim) {
}
while (*s++ != '\0')
- ;;
+ ;
return s - src - 1;
} /* dns_strlcpy() */
@@ -772,7 +772,7 @@ size_t dns_strlcat(char *dst, const char *src, size_t lim) {
p = s;
while (*s++ != '\0')
- ;;
+ ;
return lim + (s - p - 1);
} /* dns_strlcat() */
@@ -875,7 +875,7 @@ static long dns_send(int fd, const void *src, size_t lim,
int flags) {
if (count == -1 && errno == EPIPE) {
while (-1 == sigtimedwait(&piped, NULL, &(struct
timespec){ 0, 0 }) && errno == EINTR)
- ;;
+ ;
}
if ((error = dns_sigmask(SIG_SETMASK, &blocked, NULL)))
diff --git a/src/lib/ecore_con/ecore_con_eet.c
b/src/lib/ecore_con/ecore_con_eet.c
index d146dd6..9ec6972 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -547,7 +547,7 @@ ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const
char *name, Ecore_Con_
if (!ece) return ;
- eced = calloc(1, sizeof (Ecore_Con_Eet_Data));;
+ eced = calloc(1, sizeof (Ecore_Con_Eet_Data));
if (!eced) return ;
eced->func = func;
@@ -571,7 +571,7 @@ ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece,
const char *name, Ecore_
if (!ece) return ;
- eced = calloc(1, sizeof (Ecore_Con_Eet_Raw_Data));;
+ eced = calloc(1, sizeof (Ecore_Con_Eet_Raw_Data));
if (!eced) return ;
eced->func = func;
diff --git a/src/lib/ecore_evas/ecore_evas_util.c
b/src/lib/ecore_evas/ecore_evas_util.c
index e50c8de..b027497 100644
--- a/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
@@ -233,7 +233,7 @@ ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object
*obj, Ecore_Evas_Object_
if (!_ecore_evas_object_evas_check(__FUNCTION__, ee, obj))
return EINA_FALSE;
- old_ee = _evas_object_associate_get(obj);;
+ old_ee = _evas_object_associate_get(obj);
if (old_ee)
ecore_evas_object_dissociate(old_ee, obj);
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index 6eb90f6..7731b3d 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -539,7 +539,7 @@ eina_module_find(const Eina_Array *array, const char
*module)
continue;
if (!strncmp(module, file_m, len))
- return m;;
+ return m;
}
return NULL;
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index d7fe84a..9dc811b 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -5105,7 +5105,7 @@ EAPI const unsigned int eina_prime_table[] =
EAPI Eina_Value *
eina_value_new(const Eina_Value_Type *type)
{
- Eina_Value *value = eina_mempool_malloc(_eina_value_mp,
sizeof(Eina_Value));;
+ Eina_Value *value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));
if (!value)
{
eina_error_set(EINA_ERROR_OUT_OF_MEMORY);
@@ -5209,7 +5209,7 @@ eina_value_array_new(const Eina_Value_Type *subtype,
unsigned int step)
EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(subtype), EINA_FALSE);
- value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));;
+ value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));
if (!value)
return NULL;
@@ -5229,7 +5229,7 @@ eina_value_list_new(const Eina_Value_Type *subtype)
EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(subtype), EINA_FALSE);
- value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));;
+ value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));
if (!value)
return NULL;
@@ -5249,7 +5249,7 @@ eina_value_hash_new(const Eina_Value_Type *subtype,
unsigned int buckets_power_s
EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(subtype), EINA_FALSE);
- value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));;
+ value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));
if (!value)
return NULL;
@@ -5267,7 +5267,7 @@ eina_value_struct_new(const Eina_Value_Struct_Desc *desc)
{
Eina_Value *value;
- value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));;
+ value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));
if (!value)
return NULL;
diff --git a/src/lib/evil/evil_util.c b/src/lib/evil/evil_util.c
index ad42559..a02c7c4 100644
--- a/src/lib/evil/evil_util.c
+++ b/src/lib/evil/evil_util.c
@@ -91,7 +91,7 @@ evil_utf16_to_utf8(const wchar_t *text16)
return NULL;
#if _WIN32_WINNT >= 0x0600
- flag = WC_ERR_INVALID_CHARS;;
+ flag = WC_ERR_INVALID_CHARS;
#endif
size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL);
diff --git a/src/modules/emotion/generic/emotion_generic.c
b/src/modules/emotion/generic/emotion_generic.c
index 1b64a1a..427341b 100644
--- a/src/modules/emotion/generic/emotion_generic.c
+++ b/src/modules/emotion/generic/emotion_generic.c
@@ -1797,7 +1797,7 @@ static void _players_all_from(const char *path)
const Eina_File_Direct_Info *info;
int count = 0;
Eina_Iterator *itr = eina_file_direct_ls(path);
- if (!itr) goto end;;
+ if (!itr) goto end;
EINA_ITERATOR_FOREACH(itr, info)
{
if (access(info->path, R_OK | X_OK) == 0)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c
b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index 86656ce..c00bd8d 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -318,7 +318,7 @@ _pool_tex_find(Evas_Engine_GL_Context *gc, int w, int h,
pt->slot = -1;
pt->fslot = -1;
pt->whole = 1;
- *apt = _pool_tex_alloc(pt, w, h, u, v);;
+ *apt = _pool_tex_alloc(pt, w, h, u, v);
return pt;
}
diff --git a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
index 1cea16b..c3e3a40 100644
--- a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
+++ b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
@@ -1155,7 +1155,7 @@ evas_image_load_file_data_jpeg_alpha_internal(Image_Entry
*ie, FILE *f, int *err
{
jpeg_destroy_decompress(&cinfo);
*error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
- return EINA_FALSE;;
+ return EINA_FALSE;
}
data = alloca(w * 16 * 3);
if (!ie->flags.loaded)
diff --git a/src/tests/eina/eina_test_model.c b/src/tests/eina/eina_test_model.c
index 54a2258..5f494f9 100644
--- a/src/tests/eina/eina_test_model.c
+++ b/src/tests/eina/eina_test_model.c
@@ -476,7 +476,7 @@ START_TEST(eina_model_test_deep_copy)
s1 = eina_model_to_string(m);
fail_unless(s1 != NULL);
- ck_assert_str_eq(s1, "Eina_Model_Type_Generic({a: 0, b: 1, c: 2, d: 3, e:
4}, [Eina_Model_Type_Generic({x: 0}, []), Eina_Model_Type_Generic({x: 1}, []),
Eina_Model_Type_Generic({x: 2}, []), Eina_Model_Type_Generic({x: 3}, []),
Eina_Model_Type_Generic({x: 4}, [])])");;
+ ck_assert_str_eq(s1, "Eina_Model_Type_Generic({a: 0, b: 1, c: 2, d: 3, e:
4}, [Eina_Model_Type_Generic({x: 0}, []), Eina_Model_Type_Generic({x: 1}, []),
Eina_Model_Type_Generic({x: 2}, []), Eina_Model_Type_Generic({x: 3}, []),
Eina_Model_Type_Generic({x: 4}, [])])");
cp = eina_model_deep_copy(m);
fail_unless(cp != NULL);
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
