[EGIT] [core/efl] master 03/04: evas: get rid of clobbered warning.

[Cedric BAIL]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d22155487b21d6910813ad0aa0d12b86fb7051b8

commit d22155487b21d6910813ad0aa0d12b86fb7051b8
Author: Cedric BAIL ced...@osg.samsung.com
Date:   Sat Apr 25 19:59:18 2015 +0200

evas: get rid of clobbered warning.
---
 src/modules/evas/image_loaders/png/evas_image_load_png.c | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/evas/image_loaders/png/evas_image_load_png.c 
b/src/modules/evas/image_loaders/png/evas_image_load_png.c
index a8e9aa3..6b5395e 100644
--- a/src/modules/evas/image_loaders/png/evas_image_load_png.c
+++ b/src/modules/evas/image_loaders/png/evas_image_load_png.c
@@ -94,7 +94,7 @@ evas_image_load_file_head_png(void *loader_data,
png_uint_32 w32, h32;
int bit_depth, color_type, interlace_type;
char hasa;
-   Eina_Bool r = EINA_FALSE;
+   volatile Eina_Bool r = EINA_FALSE;
 
opts = loader-opts;
f = loader-f;
@@ -218,10 +218,12 @@ evas_image_load_file_data_png(void *loader_data,
unsigned int pack_offset;
int w, h;
int bit_depth, color_type, interlace_type;
-   char hasa, passes;
+   volatile char hasa;
+   char passes;
int i, j, p, k;
-   int scale_ratio = 1, image_w = 0, image_h = 0;
-   Eina_Bool r = EINA_FALSE;
+   volatile int scale_ratio = 1;
+   int image_w = 0, image_h = 0;
+   volatile Eina_Bool r = EINA_FALSE;
 
opts = loader-opts;
f = loader-f;

-- 

[EGIT] [core/efl] master 02/04: ecore_con: fix typos and improve document consistence.

[Thiep Ha]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=663bdcaf07a5d8550e6fe09d07a7089b1bb7a91c

commit 663bdcaf07a5d8550e6fe09d07a7089b1bb7a91c
Author: Thiep Ha thie...@gmail.com
Date:   Sat Apr 25 19:35:23 2015 +0200

ecore_con: fix typos and improve document consistence.

Summary:
This patch fixes typos and uses primitive verb in brief section
to improve document consistence for ecore_con.

Reviewers: Hermet, cedric

Reviewed By: cedric

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2424

Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
 src/lib/ecore_con/Ecore_Con.h | 180 +-
 1 file changed, 90 insertions(+), 90 deletions(-)

diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h
index 2c99079..0544858 100644
--- a/src/lib/ecore_con/Ecore_Con.h
+++ b/src/lib/ecore_con/Ecore_Con.h
@@ -81,7 +81,7 @@
  * retrieval of the client's ip with @ref ecore_con_client_ip_get and
  * associating data with the client using ecore_con_client_data_set.
  * @li ECORE_CON_EVENT_CLIENT_DEL: Whenever a client connection to an
- * @c Ecore_Con_Server, an event of this type is emitted.  The contents of
+ * @c Ecore_Con_Server is destroyed, an event of this type is emitted.  The 
contents of
  * the data with this event are variable, but if the client object in the data
  * is non-null, it must be freed with @ref ecore_con_client_del.
  * @li ECORE_CON_EVENT_CLIENT_DATA: Whenever a server object receives
@@ -668,7 +668,7 @@ EAPI extern int ECORE_CON_EVENT_URL_PROGRESS;
  */
 
 /**
- * Initialises the Ecore_Con library.
+ * @brief Initialise the Ecore_Con library.
  * @return  Number of times the library has been initialised without being
  *  shut down.
  *
@@ -678,7 +678,7 @@ EAPI extern int ECORE_CON_EVENT_URL_PROGRESS;
 EAPI int   ecore_con_init(void);
 
 /**
- * Shuts down the Ecore_Con library.
+ * @brief Shut down the Ecore_Con library.
  * @return  Number of times the library has been initialised without being
  *  shut down.
  * @note This function already calls ecore_shutdown() internally, so you don't
@@ -700,7 +700,7 @@ EAPI int   ecore_con_shutdown(void);
  */
 
 /**
- * Returns if SSL support is available
+ * @brief Return if SSL support is available
  * @return 1 if SSL is available and provided by gnutls,
  * 2 if SSL is available and provided by openssl,
  * 0 if it is not available.
@@ -844,7 +844,7 @@ EAPI Eina_Bool 
ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_
  */
 
 /**
- * Add a SOCKS v4 proxy to the proxy list
+ * @brief Add a SOCKS v4 proxy to the proxy list
  *
  * Use this to create (or return, if previously added) a SOCKS proxy
  * object which can be used by any ecore_con servers.
@@ -858,7 +858,7 @@ EAPI Eina_Bool 
ecore_con_ssl_client_upgrade(Ecore_Con_Client *cl, Ecore_
 EAPI Ecore_Con_Socks *ecore_con_socks4_remote_add(const char *ip, int port, 
const char *username);
 
 /**
- * Find a SOCKS v4 proxy in the proxy list
+ * @brief Find a SOCKS v4 proxy in the proxy list
  *
  * Use this to determine if a SOCKS proxy was previously added by checking
  * the proxy list against the parameters given.
@@ -873,7 +873,7 @@ EAPI Ecore_Con_Socks *ecore_con_socks4_remote_add(const 
char *ip, int port, cons
 EAPI Eina_Boolecore_con_socks4_remote_exists(const char *ip, int port, 
const char *username);
 
 /**
- * Remove a SOCKS v4 proxy from the proxy list and delete it
+ * @brief Remove a SOCKS v4 proxy from the proxy list and delete it
  *
  * Use this to remove a SOCKS proxy from the proxy list by checking
  * the list against the parameters given. The proxy will then be deleted.
@@ -887,7 +887,7 @@ EAPI Eina_Boolecore_con_socks4_remote_exists(const 
char *ip, int port, c
 EAPI void ecore_con_socks4_remote_del(const char *ip, int port, 
const char *username);
 
 /**
- * Add a SOCKS v5 proxy to the proxy list
+ * @brief Add a SOCKS v5 proxy to the proxy list
  *
  * Use this to create (or return, if previously added) a SOCKS proxy
  * object which can be used by any ecore_con servers.
@@ -902,7 +902,7 @@ EAPI void ecore_con_socks4_remote_del(const 
char *ip, int port, cons
 EAPI Ecore_Con_Socks *ecore_con_socks5_remote_add(const char *ip, int port, 
const char *username, const char *password);
 
 /**
- * Find a SOCKS v5 proxy in the proxy list
+ * @brief Find a SOCKS v5 proxy in the proxy list
  *
  * Use this to determine if a SOCKS proxy was previously added by checking
  * the proxy list against the parameters given.
@@ -918,7 +918,7 @@ EAPI Ecore_Con_Socks *ecore_con_socks5_remote_add(const 
char *ip, int port, cons
 EAPI Eina_Boolecore_con_socks5_remote_exists(const char *ip, int port, 
const char *username, const char *password);
 
 /**
- * Remove a SOCKS v5 proxy from the 

[EGIT] [core/efl] master 01/01: eet: fix interger overflow

[Cedric BAIL]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=02bfb82da0dc693a6c14d25d65f47b5630e3db15

commit 02bfb82da0dc693a6c14d25d65f47b5630e3db15
Author: Cedric BAIL ced...@osg.samsung.com
Date:   Sat Apr 25 20:14:26 2015 +0200

eet: fix interger overflow

CID 1256196
---
 src/lib/eet/eet_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index ef4d75c..129e93f 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -1701,7 +1701,7 @@ _base64_dec(const char *file, int *size_ret)
 
  if (tmp)
{
-  int len = _b64_dec(tmp, buf, end - buf);
+  size_t len = _b64_dec(tmp, buf, end - buf);
   char *str = malloc(end - buf + 1);
   strncpy(str, buf, end - buf);
   str[end - buf] = 0;

-- 

[EGIT] [core/elementary] master 01/01: theme: fix typo, thanks arrowdodger.

[Cedric BAIL]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=51f8d50583658008f4ca0a70961fcc2f17ef849e

commit 51f8d50583658008f4ca0a70961fcc2f17ef849e
Author: Cedric BAIL ced...@osg.samsung.com
Date:   Sat Apr 25 20:08:39 2015 +0200

theme: fix typo, thanks arrowdodger.
---
 data/themes/edc/entry.edc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/themes/edc/entry.edc b/data/themes/edc/entry.edc
index 247d45567..a4fd54b 100644
--- a/data/themes/edc/entry.edc
+++ b/data/themes/edc/entry.edc
@@ -52,7 +52,7 @@ group { name: e/widgets/entry/scrollframe;
 group { name: e/widgets/entry/text;
   styles {
  style { name: entry_textblock_style;
-base: font=FN font_size=10 color=# style=shadow,bottom 
shadow_color=#0080 text_class=entry color_classs=entry_text;
+base: font=FN font_size=10 color=# style=shadow,bottom 
shadow_color=#0080 text_class=entry color_class=entry_text;
  }
  style { name: entry_textblock_disabled_style;
 base: font=FN font_size=10 color=#151515 style=shadow,bottom 
shadow_color=#ff19 text_class=entry color_class=entry_text_disabled;

-- 

[EGIT] [apps/rage] master 02/02: fix minor leak in rage on failed win creation

[Carsten Haitzler (Rasterman)]

raster pushed a commit to branch master.

http://git.enlightenment.org/apps/rage.git/commit/?id=ca14bfa26485681be797a1e86fdee20fe48017c6

commit ca14bfa26485681be797a1e86fdee20fe48017c6
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date:   Sun Apr 26 12:23:56 2015 +0900

fix minor leak in rage on failed win creation

fixes CID 61903
---
 src/bin/win.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bin/win.c b/src/bin/win.c
index 733a1d5..83dd798 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -332,7 +332,11 @@ win_add(void)
if (!inf) return NULL;
 
win = elm_win_add(NULL, Rage, ELM_WIN_BASIC);
-   if (!win) return NULL;
+   if (!win)
+ {
+free(inf);
+return NULL;
+ }
 
elm_win_title_set(win, Rage);
elm_win_autodel_set(win, EINA_TRUE);

--