summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2010-12-14 06:19:30 +0000
committerVincent Torri <vincent.torri@gmail.com>2010-12-14 06:19:30 +0000
commitc69cd7ec2799285415474b8eacf1dcf239f09dcd (patch)
tree6519f05406af50ee5f4859d78c569de0ec2c0c57 /legacy
parentaad53ed90d47cec175227a7f74093a7928e82344 (diff)
use size_t when it does not hurt
SVN revision: 55548
Diffstat (limited to 'legacy')
-rw-r--r--legacy/edje/src/lib/edje_calc.c2
-rw-r--r--legacy/edje/src/lib/edje_entry.c10
-rw-r--r--legacy/edje/src/lib/edje_load.c2
-rw-r--r--legacy/edje/src/lib/edje_private.h2
-rw-r--r--legacy/edje/src/lib/edje_text.c6
-rw-r--r--legacy/edje/src/lib/edje_util.c2
6 files changed, 12 insertions, 12 deletions
diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index 2eed526..c1aa0d0 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -847,7 +847,7 @@ _edje_part_recalc_single_text(FLOAT_T sc,
847 { 847 {
848 char *font2; 848 char *font2;
849 849
850 int len = strlen(font) + sizeof("edje/fonts/") + 1; 850 size_t len = strlen(font) + sizeof("edje/fonts/") + 1;
851 font2 = alloca(len); 851 font2 = alloca(len);
852 sprintf(font2, "edje/fonts/%s", font); 852 sprintf(font2, "edje/fonts/%s", font);
853 font = font2; 853 font = font2;
diff --git a/legacy/edje/src/lib/edje_entry.c b/legacy/edje/src/lib/edje_entry.c
index a44c91a..581c72b 100644
--- a/legacy/edje/src/lib/edje_entry.c
+++ b/legacy/edje/src/lib/edje_entry.c
@@ -569,7 +569,7 @@ _edje_anchor_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN
569 Evas_Event_Mouse_Down *ev = event_info; 569 Evas_Event_Mouse_Down *ev = event_info;
570 Edje_Real_Part *rp = an->en->rp; 570 Edje_Real_Part *rp = an->en->rp;
571 char *buf, *n; 571 char *buf, *n;
572 int len; 572 size_t len;
573 int ignored; 573 int ignored;
574 Entry *en; 574 Entry *en;
575 575
@@ -601,7 +601,7 @@ _edje_anchor_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
601 Evas_Event_Mouse_Up *ev = event_info; 601 Evas_Event_Mouse_Up *ev = event_info;
602 Edje_Real_Part *rp = an->en->rp; 602 Edje_Real_Part *rp = an->en->rp;
603 char *buf, *n; 603 char *buf, *n;
604 int len; 604 size_t len;
605 int ignored; 605 int ignored;
606 Entry *en; 606 Entry *en;
607 607
@@ -628,7 +628,7 @@ _edje_anchor_mouse_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN
628 Evas_Event_Mouse_Move *ev = event_info; 628 Evas_Event_Mouse_Move *ev = event_info;
629 Edje_Real_Part *rp = an->en->rp; 629 Edje_Real_Part *rp = an->en->rp;
630 char *buf, *n; 630 char *buf, *n;
631 int len; 631 size_t len;
632 int ignored; 632 int ignored;
633 Entry *en; 633 Entry *en;
634 634
@@ -655,7 +655,7 @@ _edje_anchor_mouse_in_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
655 Evas_Event_Mouse_In *ev = event_info; 655 Evas_Event_Mouse_In *ev = event_info;
656 Edje_Real_Part *rp = an->en->rp; 656 Edje_Real_Part *rp = an->en->rp;
657 char *buf, *n; 657 char *buf, *n;
658 int len; 658 size_t len;
659 int ignored; 659 int ignored;
660 660
661 ignored = rp->part->ignore_flags & ev->event_flags; 661 ignored = rp->part->ignore_flags & ev->event_flags;
@@ -677,7 +677,7 @@ _edje_anchor_mouse_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
677 Evas_Event_Mouse_Out *ev = event_info; 677 Evas_Event_Mouse_Out *ev = event_info;
678 Edje_Real_Part *rp = an->en->rp; 678 Edje_Real_Part *rp = an->en->rp;
679 char *buf, *n; 679 char *buf, *n;
680 int len; 680 size_t len;
681 int ignored; 681 int ignored;
682 682
683 ignored = rp->part->ignore_flags & ev->event_flags; 683 ignored = rp->part->ignore_flags & ev->event_flags;
diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index 5c7c778..a75ed49 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -1440,7 +1440,7 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const char *signal, const char *
1440 if (origin > length) 1440 if (origin > length)
1441 { 1441 {
1442 char *tmp; 1442 char *tmp;
1443 int alias_length; 1443 size_t alias_length;
1444 1444
1445 alias_length = strlen(alias); 1445 alias_length = strlen(alias);
1446 tmp = alloca(alias_length + origin - length + 2); 1446 tmp = alloca(alias_length + origin - length + 2);
diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index b84c99d..4612043 100644
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -1786,7 +1786,7 @@ EAPI void _edje_module_shutdown();
1786static inline Eina_Bool 1786static inline Eina_Bool
1787edje_program_is_strncmp(const char *str) 1787edje_program_is_strncmp(const char *str)
1788{ 1788{
1789 unsigned int length; 1789 size_t length;
1790 1790
1791 length = strlen(str); 1791 length = strlen(str);
1792 1792
diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c
index 84cbf64..67a5c5c 100644
--- a/legacy/edje/src/lib/edje_text.c
+++ b/legacy/edje/src/lib/edje_text.c
@@ -266,7 +266,7 @@ static const char *
266_edje_text_font_get(const char *base, const char *new, char **free_later) 266_edje_text_font_get(const char *base, const char *new, char **free_later)
267{ 267{
268 const char *base_style, *new_style, *aux; 268 const char *base_style, *new_style, *aux;
269 int font_len, style_len; 269 size_t font_len, style_len;
270 270
271 if (base && (!new)) 271 if (base && (!new))
272 return base; 272 return base;
@@ -283,7 +283,7 @@ _edje_text_font_get(const char *base, const char *new, char **free_later)
283 283
284 font_len = strlen(new); 284 font_len = strlen(new);
285 aux = strchr(base_style, ','); 285 aux = strchr(base_style, ',');
286 style_len = (aux) ? (aux - base_style) : (int) strlen(base_style); 286 style_len = (aux) ? (aux - base_style) : strlen(base_style);
287 287
288 *free_later = malloc(font_len + style_len + 1); 288 *free_later = malloc(font_len + style_len + 1);
289 memcpy(*free_later, new, font_len); 289 memcpy(*free_later, new, font_len);
@@ -365,7 +365,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
365 { 365 {
366 char *font2; 366 char *font2;
367 367
368 int len = strlen(font) + sizeof("edje/fonts/") + 1; 368 size_t len = strlen(font) + sizeof("edje/fonts/") + 1;
369 font2 = alloca(len); 369 font2 = alloca(len);
370 sprintf(font2, "edje/fonts/%s", font); 370 sprintf(font2, "edje/fonts/%s", font);
371 font = font2; 371 font = font2;
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index 5088de1..5b85fef 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -2528,7 +2528,7 @@ static Edje_Box_Layout *
2528_edje_box_layout_external_new(const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data) 2528_edje_box_layout_external_new(const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data)
2529{ 2529{
2530 Edje_Box_Layout *l; 2530 Edje_Box_Layout *l;
2531 int name_len; 2531 size_t name_len;
2532 2532
2533 name_len = strlen(name) + 1; 2533 name_len = strlen(name) + 1;
2534 l = malloc(sizeof(Edje_Box_Layout) + name_len); 2534 l = malloc(sizeof(Edje_Box_Layout) + name_len);