forked from enlightenment/efl
parent
aad53ed90d
commit
c69cd7ec27
|
@ -847,7 +847,7 @@ _edje_part_recalc_single_text(FLOAT_T sc,
|
||||||
{
|
{
|
||||||
char *font2;
|
char *font2;
|
||||||
|
|
||||||
int len = strlen(font) + sizeof("edje/fonts/") + 1;
|
size_t len = strlen(font) + sizeof("edje/fonts/") + 1;
|
||||||
font2 = alloca(len);
|
font2 = alloca(len);
|
||||||
sprintf(font2, "edje/fonts/%s", font);
|
sprintf(font2, "edje/fonts/%s", font);
|
||||||
font = font2;
|
font = font2;
|
||||||
|
|
|
@ -569,7 +569,7 @@ _edje_anchor_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN
|
||||||
Evas_Event_Mouse_Down *ev = event_info;
|
Evas_Event_Mouse_Down *ev = event_info;
|
||||||
Edje_Real_Part *rp = an->en->rp;
|
Edje_Real_Part *rp = an->en->rp;
|
||||||
char *buf, *n;
|
char *buf, *n;
|
||||||
int len;
|
size_t len;
|
||||||
int ignored;
|
int ignored;
|
||||||
Entry *en;
|
Entry *en;
|
||||||
|
|
||||||
|
@ -601,7 +601,7 @@ _edje_anchor_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
|
||||||
Evas_Event_Mouse_Up *ev = event_info;
|
Evas_Event_Mouse_Up *ev = event_info;
|
||||||
Edje_Real_Part *rp = an->en->rp;
|
Edje_Real_Part *rp = an->en->rp;
|
||||||
char *buf, *n;
|
char *buf, *n;
|
||||||
int len;
|
size_t len;
|
||||||
int ignored;
|
int ignored;
|
||||||
Entry *en;
|
Entry *en;
|
||||||
|
|
||||||
|
@ -628,7 +628,7 @@ _edje_anchor_mouse_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN
|
||||||
Evas_Event_Mouse_Move *ev = event_info;
|
Evas_Event_Mouse_Move *ev = event_info;
|
||||||
Edje_Real_Part *rp = an->en->rp;
|
Edje_Real_Part *rp = an->en->rp;
|
||||||
char *buf, *n;
|
char *buf, *n;
|
||||||
int len;
|
size_t len;
|
||||||
int ignored;
|
int ignored;
|
||||||
Entry *en;
|
Entry *en;
|
||||||
|
|
||||||
|
@ -655,7 +655,7 @@ _edje_anchor_mouse_in_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
|
||||||
Evas_Event_Mouse_In *ev = event_info;
|
Evas_Event_Mouse_In *ev = event_info;
|
||||||
Edje_Real_Part *rp = an->en->rp;
|
Edje_Real_Part *rp = an->en->rp;
|
||||||
char *buf, *n;
|
char *buf, *n;
|
||||||
int len;
|
size_t len;
|
||||||
int ignored;
|
int ignored;
|
||||||
|
|
||||||
ignored = rp->part->ignore_flags & ev->event_flags;
|
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
|
||||||
Evas_Event_Mouse_Out *ev = event_info;
|
Evas_Event_Mouse_Out *ev = event_info;
|
||||||
Edje_Real_Part *rp = an->en->rp;
|
Edje_Real_Part *rp = an->en->rp;
|
||||||
char *buf, *n;
|
char *buf, *n;
|
||||||
int len;
|
size_t len;
|
||||||
int ignored;
|
int ignored;
|
||||||
|
|
||||||
ignored = rp->part->ignore_flags & ev->event_flags;
|
ignored = rp->part->ignore_flags & ev->event_flags;
|
||||||
|
|
|
@ -1440,7 +1440,7 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const char *signal, const char *
|
||||||
if (origin > length)
|
if (origin > length)
|
||||||
{
|
{
|
||||||
char *tmp;
|
char *tmp;
|
||||||
int alias_length;
|
size_t alias_length;
|
||||||
|
|
||||||
alias_length = strlen(alias);
|
alias_length = strlen(alias);
|
||||||
tmp = alloca(alias_length + origin - length + 2);
|
tmp = alloca(alias_length + origin - length + 2);
|
||||||
|
|
|
@ -1786,7 +1786,7 @@ EAPI void _edje_module_shutdown();
|
||||||
static inline Eina_Bool
|
static inline Eina_Bool
|
||||||
edje_program_is_strncmp(const char *str)
|
edje_program_is_strncmp(const char *str)
|
||||||
{
|
{
|
||||||
unsigned int length;
|
size_t length;
|
||||||
|
|
||||||
length = strlen(str);
|
length = strlen(str);
|
||||||
|
|
||||||
|
|
|
@ -266,7 +266,7 @@ static const char *
|
||||||
_edje_text_font_get(const char *base, const char *new, char **free_later)
|
_edje_text_font_get(const char *base, const char *new, char **free_later)
|
||||||
{
|
{
|
||||||
const char *base_style, *new_style, *aux;
|
const char *base_style, *new_style, *aux;
|
||||||
int font_len, style_len;
|
size_t font_len, style_len;
|
||||||
|
|
||||||
if (base && (!new))
|
if (base && (!new))
|
||||||
return base;
|
return base;
|
||||||
|
@ -283,7 +283,7 @@ _edje_text_font_get(const char *base, const char *new, char **free_later)
|
||||||
|
|
||||||
font_len = strlen(new);
|
font_len = strlen(new);
|
||||||
aux = strchr(base_style, ',');
|
aux = strchr(base_style, ',');
|
||||||
style_len = (aux) ? (aux - base_style) : (int) strlen(base_style);
|
style_len = (aux) ? (aux - base_style) : strlen(base_style);
|
||||||
|
|
||||||
*free_later = malloc(font_len + style_len + 1);
|
*free_later = malloc(font_len + style_len + 1);
|
||||||
memcpy(*free_later, new, font_len);
|
memcpy(*free_later, new, font_len);
|
||||||
|
@ -365,7 +365,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
|
||||||
{
|
{
|
||||||
char *font2;
|
char *font2;
|
||||||
|
|
||||||
int len = strlen(font) + sizeof("edje/fonts/") + 1;
|
size_t len = strlen(font) + sizeof("edje/fonts/") + 1;
|
||||||
font2 = alloca(len);
|
font2 = alloca(len);
|
||||||
sprintf(font2, "edje/fonts/%s", font);
|
sprintf(font2, "edje/fonts/%s", font);
|
||||||
font = font2;
|
font = font2;
|
||||||
|
|
|
@ -2528,7 +2528,7 @@ static Edje_Box_Layout *
|
||||||
_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)
|
_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)
|
||||||
{
|
{
|
||||||
Edje_Box_Layout *l;
|
Edje_Box_Layout *l;
|
||||||
int name_len;
|
size_t name_len;
|
||||||
|
|
||||||
name_len = strlen(name) + 1;
|
name_len = strlen(name) + 1;
|
||||||
l = malloc(sizeof(Edje_Box_Layout) + name_len);
|
l = malloc(sizeof(Edje_Box_Layout) + name_len);
|
||||||
|
|
Loading…
Reference in New Issue