aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-11-15 05:19:14 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-11-15 05:19:14 +0000
commit66a43d2a7a239e7ccbfb299d665282d737679c82 (patch)
tree455763d5cd3a3f3e573c604404b8b4045dcda183
parentwarning-- (diff)
downloadefl-66a43d2a7a239e7ccbfb299d665282d737679c82.tar.gz
more warn-- in efl tree.
SVN revision: 79314
-rw-r--r--src/bin/embryo/embryo_cc_sc1.c2
-rw-r--r--src/bin/embryo/embryo_cc_sc6.c4
-rw-r--r--src/bin/evas/evas_cserve2_debug.c8
-rw-r--r--src/bin/evas/evas_cserve2_slaves.c12
-rw-r--r--src/bin/evas/evas_cserve2_usage.c7
-rw-r--r--src/lib/embryo/embryo_amx.c8
-rw-r--r--src/modules/evas/loaders/webp/evas_image_load_webp.c5
7 files changed, 23 insertions, 23 deletions
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index 53baf36539..760bd3c1f6 100644
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -3480,9 +3480,11 @@ static void
doif(void)
{
int flab1, flab2;
+#if 0
int ifindent;
ifindent = stmtindent; /* save the indent of the "if" instruction */
+#endif
flab1 = getlabel(); /* get label number for false branch */
test(flab1, TRUE, FALSE); /*get expression, branch to flab1 if false */
statement(NULL, FALSE); /* if true, do a statement */
diff --git a/src/bin/embryo/embryo_cc_sc6.c b/src/bin/embryo/embryo_cc_sc6.c
index 20c4122faf..f8fc330939 100644
--- a/src/bin/embryo/embryo_cc_sc6.c
+++ b/src/bin/embryo/embryo_cc_sc6.c
@@ -661,7 +661,7 @@ assemble(FILE * fout, FILE * fin)
constvalue *constptr;
cell mainaddr;
int nametable, tags, libraries, publics, natives, pubvars;
- int cod, defsize;
+ int cod;
#if !defined NDEBUG
/* verify that the opcode list is sorted (skip entry 1; it is reserved
@@ -775,7 +775,7 @@ assemble(FILE * fout, FILE * fin)
// #ifdef WORDS_BIGENDIAN
// hdr.flags|=AMX_FLAG_BIGENDIAN;
// #endif
- defsize = hdr.defsize = sizeof(FUNCSTUB);
+ hdr.defsize = sizeof(FUNCSTUB);
assert((hdr.defsize % sizeof(cell)) == 0);
publics = hdr.publics = sizeof hdr; /* public table starts right after the header */
natives = hdr.natives = hdr.publics + numpublics * sizeof(FUNCSTUB);
diff --git a/src/bin/evas/evas_cserve2_debug.c b/src/bin/evas/evas_cserve2_debug.c
index c86045c641..1dd67c7807 100644
--- a/src/bin/evas/evas_cserve2_debug.c
+++ b/src/bin/evas/evas_cserve2_debug.c
@@ -425,27 +425,21 @@ main(void)
Font_Entry *fe;
eina_init();
-
_evas_cserve2_debug_log_dom = eina_log_domain_register
("evas_cserve2_debug", EINA_COLOR_BLUE);
-
if (!_server_connect())
{
ERR("Could not connect to server.");
return -1;
}
-
_debug_msg_send();
-
fonts = _debug_msg_read();
-
EINA_LIST_FREE(fonts, fe)
{
_font_entry_print(fe);
_font_entry_free(fe);
}
-
_server_disconnect();
-
eina_shutdown();
+ return 0;
}
diff --git a/src/bin/evas/evas_cserve2_slaves.c b/src/bin/evas/evas_cserve2_slaves.c
index f0eed76fe9..5cc6379bf7 100644
--- a/src/bin/evas/evas_cserve2_slaves.c
+++ b/src/bin/evas/evas_cserve2_slaves.c
@@ -328,7 +328,11 @@ _slave_proc_path_get(const char *name)
return eina_stringshare_add(name);
}
- getcwd(cwd, sizeof(cwd));
+ if (!getcwd(cwd, sizeof(cwd)))
+ {
+ WRN("getcwd() write returned < 0.");
+ return NULL;
+ }
snprintf(buf, sizeof(buf), "%s/%s", cwd, name);
if (!access(buf, X_OK))
return eina_stringshare_add(buf);
@@ -475,8 +479,10 @@ _slave_thread_cb(void *data)
continue;
}
sd->cmdanswer = sd->cb(sd, &cmd, sd->cmddata, sd->cb_data);
- write(sd->write_fd, &cmd, sizeof(cmd));
-
+ if (write(sd->write_fd, &cmd, sizeof(cmd)) < 0)
+ {
+ WRN("_slave_thread_cb() write returned < 0.");
+ }
n = read(sd->read_fd, &cmd, sizeof(cmd));
}
diff --git a/src/bin/evas/evas_cserve2_usage.c b/src/bin/evas/evas_cserve2_usage.c
index 853e63345d..7482447915 100644
--- a/src/bin/evas/evas_cserve2_usage.c
+++ b/src/bin/evas/evas_cserve2_usage.c
@@ -227,21 +227,16 @@ int
main(void)
{
eina_init();
-
_evas_cserve2_usage_log_dom = eina_log_domain_register
("evas_cserve2_usage", EINA_COLOR_BLUE);
-
if (!_server_connect())
{
ERR("Could not connect to server.");
return -1;
}
-
_usage_msg_send();
-
_usage_msg_read();
-
_server_disconnect();
-
eina_shutdown();
+ return 0;
}
diff --git a/src/lib/embryo/embryo_amx.c b/src/lib/embryo/embryo_amx.c
index 13ef31b006..d4afb508a7 100644
--- a/src/lib/embryo/embryo_amx.c
+++ b/src/lib/embryo/embryo_amx.c
@@ -115,7 +115,6 @@ _embryo_func_get(Embryo_Program *ep, int idx, char *funcname)
static int
_embryo_var_get(Embryo_Program *ep, int idx, char *varname, Embryo_Cell *ep_addr)
{
-
Embryo_Header *hdr;
Embryo_Func_Stub *var;
@@ -207,6 +206,8 @@ _embryo_program_init(Embryo_Program *ep, void *code)
#endif
ep->flags = EMBRYO_FLAG_RELOC;
+#ifdef WORDS_BIGENDIAN
+/* until we do more... this is only used for bigendian */
{
Embryo_Cell cip, code_size, cip_end;
Embryo_Cell *code;
@@ -222,9 +223,10 @@ _embryo_program_init(Embryo_Program *ep, void *code)
#ifdef WORDS_BIGENDIAN
embryo_swap_32(&(code[cip]));
#endif
-
}
}
+#endif
+
/* init native api for handling floating point - default in embryo */
_embryo_args_init(ep);
_embryo_fp_init(ep);
@@ -734,11 +736,9 @@ embryo_data_address_get(Embryo_Program *ep, Embryo_Cell addr)
EAPI Embryo_Cell
embryo_data_heap_push(Embryo_Program *ep, int cells)
{
- Embryo_Header *hdr;
Embryo_Cell addr;
if ((!ep) || (!ep->base)) return EMBRYO_CELL_NONE;
- hdr = (Embryo_Header *)ep->base;
if (ep->stk - ep->hea - (cells * sizeof(Embryo_Cell)) < STKMARGIN)
return EMBRYO_CELL_NONE;
addr = ep->hea;
diff --git a/src/modules/evas/loaders/webp/evas_image_load_webp.c b/src/modules/evas/loaders/webp/evas_image_load_webp.c
index bb59f1629d..b552178141 100644
--- a/src/modules/evas/loaders/webp/evas_image_load_webp.c
+++ b/src/modules/evas/loaders/webp/evas_image_load_webp.c
@@ -34,6 +34,7 @@ evas_image_load_file_head_webp(Image_Entry *ie, const char *file, const char *ke
size_t header_size = 30;
uint8_t header[30];
+ // XXX: use eina_file to mmap things
f = fopen(file, "rb");
if (!f)
{
@@ -72,9 +73,10 @@ evas_image_load_file_data_webp(Image_Entry *ie, const char *file, const char *ke
{
FILE *f;
size_t file_size;
- uint8_t *data, *decoded, *surface;
+ void *data, *decoded, *surface;
int width, height;
+ // XXX: use eina_file to mmap things
f = fopen(file, "rb");
if (!f)
{
@@ -121,6 +123,7 @@ evas_image_load_file_data_webp(Image_Entry *ie, const char *file, const char *ke
*error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
goto free_data;
}
+ // XXX: this copy of the surface is inefficient
memcpy(surface, decoded, width * height * 4);
evas_common_image_premul(ie);