forked from enlightenment/efl
Edje: Fixed a couple of compilation warnings.
SVN revision: 62566
This commit is contained in:
parent
04bff41881
commit
43a9bc036b
|
@ -722,18 +722,17 @@ compile(void)
|
|||
def = mem_strdup("");
|
||||
else
|
||||
{
|
||||
Eina_List *l;
|
||||
int len;
|
||||
char *data;
|
||||
char *define;
|
||||
|
||||
len = 0;
|
||||
EINA_LIST_FOREACH(defines, l, data)
|
||||
len += strlen(data) + 1;
|
||||
EINA_LIST_FOREACH(defines, l, define)
|
||||
len += strlen(define) + 1;
|
||||
def = mem_alloc(len + 1);
|
||||
def[0] = 0;
|
||||
EINA_LIST_FOREACH(defines, l, data)
|
||||
EINA_LIST_FOREACH(defines, l, define)
|
||||
{
|
||||
strcat(def, data);
|
||||
strcat(def, define);
|
||||
strcat(def, " ");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -241,11 +241,11 @@ source_load(Eet_File *ef)
|
|||
}
|
||||
|
||||
int
|
||||
source_fontmap_save(Eet_File *ef, Eina_List *fonts)
|
||||
source_fontmap_save(Eet_File *ef, Eina_List *font_list)
|
||||
{
|
||||
Font_List fl;
|
||||
|
||||
fl.list = fonts;
|
||||
fl.list = font_list;
|
||||
return eet_data_write(ef, _font_list_edd, "edje_source_fontmap", &fl, 1);
|
||||
}
|
||||
|
||||
|
|
|
@ -162,7 +162,7 @@ void
|
|||
output(void)
|
||||
{
|
||||
Eina_List *l;
|
||||
Eet_File *ef;
|
||||
Eet_File *tef;
|
||||
SrcFile *sf;
|
||||
char *outdir, *p;
|
||||
|
||||
|
@ -181,7 +181,7 @@ output(void)
|
|||
}
|
||||
|
||||
|
||||
ef = eet_open(file_in, EET_FILE_MODE_READ);
|
||||
tef = eet_open(file_in, EET_FILE_MODE_READ);
|
||||
|
||||
if (edje_file->image_dir)
|
||||
{
|
||||
|
@ -296,7 +296,7 @@ output(void)
|
|||
/* FIXME!!!! */
|
||||
/* should be fn->entry -v */
|
||||
snprintf(out, sizeof(out), "edje/fonts/%s", fn->file);
|
||||
font = eet_read(ef, out, &fontsize);
|
||||
font = eet_read(tef, out, &fontsize);
|
||||
if (font)
|
||||
{
|
||||
FILE *f;
|
||||
|
@ -336,7 +336,7 @@ output(void)
|
|||
{
|
||||
char out[4096];
|
||||
FILE *f;
|
||||
SrcFile *sf = eina_list_data_get(srcfiles->list);
|
||||
sf = eina_list_data_get(srcfiles->list);
|
||||
|
||||
|
||||
if (build_sh)
|
||||
|
@ -370,7 +370,7 @@ output(void)
|
|||
chmod(out, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP);
|
||||
|
||||
}
|
||||
eet_close(ef);
|
||||
eet_close(tef);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
Loading…
Reference in New Issue