From 3908f7c264485a5e8b9f7b98d3edc6b3ac529217 Mon Sep 17 00:00:00 2001 From: englebass Date: Thu, 18 Aug 2011 10:59:49 +0000 Subject: [PATCH] ethumb: Fix shadow warnings git-svn-id: https://svn.enlightenment.org/svn/e/trunk/ethumb@62564 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/ethumbd_child.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/bin/ethumbd_child.c b/src/bin/ethumbd_child.c index 5ab7f25..3d6acac 100644 --- a/src/bin/ethumbd_child.c +++ b/src/bin/ethumbd_child.c @@ -184,15 +184,15 @@ static int _ec_op_new(struct _Ethumbd_Child *ec) { int r; - int index; + int idx; - r = _ec_read_safe(STDIN_FILENO, &index, sizeof(index)); + r = _ec_read_safe(STDIN_FILENO, &idx, sizeof(idx)); if (!r) return 0; - DBG("ethumbd new(). index = %d", index); + DBG("ethumbd new(). idx = %d", idx); - ec->ethumbt[index] = ethumb_new(); + ec->ethumbt[idx] = ethumb_new(); return 1; } @@ -200,16 +200,16 @@ static int _ec_op_del(struct _Ethumbd_Child *ec) { int r; - int index; + int idx; - r = _ec_read_safe(STDIN_FILENO, &index, sizeof(index)); + r = _ec_read_safe(STDIN_FILENO, &idx, sizeof(idx)); if (!r) return 0; - DBG("ethumbd del(). index = %d", index); + DBG("ethumbd del(). idx = %d", idx); - ethumb_free(ec->ethumbt[index]); - ec->ethumbt[index] = NULL; + ethumb_free(ec->ethumbt[idx]); + ec->ethumbt[idx] = NULL; return 1; } @@ -248,11 +248,11 @@ _ec_op_generated_cb(void *data __UNUSED__, Ethumb *e, Eina_Bool success) static int _ec_op_generate(struct _Ethumbd_Child *ec) { - int index; + int idx; char *path, *key, *thumb_path, *thumb_key; int r; - r = _ec_read_safe(STDIN_FILENO, &index, sizeof(index)); + r = _ec_read_safe(STDIN_FILENO, &idx, sizeof(idx)); if (!r) return 0; @@ -269,16 +269,16 @@ _ec_op_generate(struct _Ethumbd_Child *ec) if (!r) return 0; - ethumb_file_set(ec->ethumbt[index], path, key); - ethumb_thumb_path_set(ec->ethumbt[index], thumb_path, thumb_key); + ethumb_file_set(ec->ethumbt[idx], path, key); + ethumb_thumb_path_set(ec->ethumbt[idx], thumb_path, thumb_key); - if (ethumb_exists(ec->ethumbt[index])) + if (ethumb_exists(ec->ethumbt[idx])) { - _ec_op_generated_cb(ec, ec->ethumbt[index], EINA_TRUE); + _ec_op_generated_cb(ec, ec->ethumbt[idx], EINA_TRUE); } else { - ethumb_generate(ec->ethumbt[index], _ec_op_generated_cb, ec, NULL); + ethumb_generate(ec->ethumbt[idx], _ec_op_generated_cb, ec, NULL); } free(path); @@ -577,11 +577,11 @@ _ec_document_page_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) } static void -_ec_setup_process(struct _Ethumbd_Child *ec, int index, int type) +_ec_setup_process(struct _Ethumbd_Child *ec, int idx, int type) { Ethumb *e; - e = ec->ethumbt[index]; + e = ec->ethumbt[idx]; switch (type) { @@ -645,10 +645,10 @@ static int _ec_op_setup(struct _Ethumbd_Child *ec) { int r; - int index; + int idx; int type; - r = _ec_read_safe(STDIN_FILENO, &index, sizeof(index)); + r = _ec_read_safe(STDIN_FILENO, &idx, sizeof(idx)); if (!r) return 0; @@ -657,7 +657,7 @@ _ec_op_setup(struct _Ethumbd_Child *ec) return 0; while (type != ETHUMBD_SETUP_FINISHED) { - _ec_setup_process(ec, index, type); + _ec_setup_process(ec, idx, type); r = _ec_read_safe(STDIN_FILENO, &type, sizeof(type)); if (!r) return 0; -- 2.7.4