diff options
author | Sebastian Dransfeld <sd@tango.flipp.net> | 2011-08-18 10:59:49 +0000 |
---|---|---|
committer | Sebastian Dransfeld <sd@tango.flipp.net> | 2011-08-18 10:59:49 +0000 |
commit | 04bff418811128cb045028c8b7584c991c881d40 (patch) | |
tree | 261c3a90b9d865993f9b60761fe14fb6e46e05bb /legacy/ethumb | |
parent | 08559f2c8bf637e32280b810a84699c8e8e73d12 (diff) |
ethumb: Fix shadow warnings
SVN revision: 62564
Diffstat (limited to 'legacy/ethumb')
-rw-r--r-- | legacy/ethumb/src/bin/ethumbd_child.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/legacy/ethumb/src/bin/ethumbd_child.c b/legacy/ethumb/src/bin/ethumbd_child.c index 5ab7f250ba..3d6acaccd9 100644 --- a/legacy/ethumb/src/bin/ethumbd_child.c +++ b/legacy/ethumb/src/bin/ethumbd_child.c | |||
@@ -184,15 +184,15 @@ static int | |||
184 | _ec_op_new(struct _Ethumbd_Child *ec) | 184 | _ec_op_new(struct _Ethumbd_Child *ec) |
185 | { | 185 | { |
186 | int r; | 186 | int r; |
187 | int index; | 187 | int idx; |
188 | 188 | ||
189 | r = _ec_read_safe(STDIN_FILENO, &index, sizeof(index)); | 189 | r = _ec_read_safe(STDIN_FILENO, &idx, sizeof(idx)); |
190 | if (!r) | 190 | if (!r) |
191 | return 0; | 191 | return 0; |
192 | 192 | ||
193 | DBG("ethumbd new(). index = %d", index); | 193 | DBG("ethumbd new(). idx = %d", idx); |
194 | 194 | ||
195 | ec->ethumbt[index] = ethumb_new(); | 195 | ec->ethumbt[idx] = ethumb_new(); |
196 | return 1; | 196 | return 1; |
197 | } | 197 | } |
198 | 198 | ||
@@ -200,16 +200,16 @@ static int | |||
200 | _ec_op_del(struct _Ethumbd_Child *ec) | 200 | _ec_op_del(struct _Ethumbd_Child *ec) |
201 | { | 201 | { |
202 | int r; | 202 | int r; |
203 | int index; | 203 | int idx; |
204 | 204 | ||
205 | r = _ec_read_safe(STDIN_FILENO, &index, sizeof(index)); | 205 | r = _ec_read_safe(STDIN_FILENO, &idx, sizeof(idx)); |
206 | if (!r) | 206 | if (!r) |
207 | return 0; | 207 | return 0; |
208 | 208 | ||
209 | DBG("ethumbd del(). index = %d", index); | 209 | DBG("ethumbd del(). idx = %d", idx); |
210 | 210 | ||
211 | ethumb_free(ec->ethumbt[index]); | 211 | ethumb_free(ec->ethumbt[idx]); |
212 | ec->ethumbt[index] = NULL; | 212 | ec->ethumbt[idx] = NULL; |
213 | return 1; | 213 | return 1; |
214 | } | 214 | } |
215 | 215 | ||
@@ -248,11 +248,11 @@ _ec_op_generated_cb(void *data __UNUSED__, Ethumb *e, Eina_Bool success) | |||
248 | static int | 248 | static int |
249 | _ec_op_generate(struct _Ethumbd_Child *ec) | 249 | _ec_op_generate(struct _Ethumbd_Child *ec) |
250 | { | 250 | { |
251 | int index; | 251 | int idx; |
252 | char *path, *key, *thumb_path, *thumb_key; | 252 | char *path, *key, *thumb_path, *thumb_key; |
253 | int r; | 253 | int r; |
254 | 254 | ||
255 | r = _ec_read_safe(STDIN_FILENO, &index, sizeof(index)); | 255 | r = _ec_read_safe(STDIN_FILENO, &idx, sizeof(idx)); |
256 | if (!r) | 256 | if (!r) |
257 | return 0; | 257 | return 0; |
258 | 258 | ||
@@ -269,16 +269,16 @@ _ec_op_generate(struct _Ethumbd_Child *ec) | |||
269 | if (!r) | 269 | if (!r) |
270 | return 0; | 270 | return 0; |
271 | 271 | ||
272 | ethumb_file_set(ec->ethumbt[index], path, key); | 272 | ethumb_file_set(ec->ethumbt[idx], path, key); |
273 | ethumb_thumb_path_set(ec->ethumbt[index], thumb_path, thumb_key); | 273 | ethumb_thumb_path_set(ec->ethumbt[idx], thumb_path, thumb_key); |
274 | 274 | ||
275 | if (ethumb_exists(ec->ethumbt[index])) | 275 | if (ethumb_exists(ec->ethumbt[idx])) |
276 | { | 276 | { |
277 | _ec_op_generated_cb(ec, ec->ethumbt[index], EINA_TRUE); | 277 | _ec_op_generated_cb(ec, ec->ethumbt[idx], EINA_TRUE); |
278 | } | 278 | } |
279 | else | 279 | else |
280 | { | 280 | { |
281 | ethumb_generate(ec->ethumbt[index], _ec_op_generated_cb, ec, NULL); | 281 | ethumb_generate(ec->ethumbt[idx], _ec_op_generated_cb, ec, NULL); |
282 | } | 282 | } |
283 | 283 | ||
284 | free(path); | 284 | free(path); |
@@ -577,11 +577,11 @@ _ec_document_page_set(struct _Ethumbd_Child *ec __UNUSED__, Ethumb *e) | |||
577 | } | 577 | } |
578 | 578 | ||
579 | static void | 579 | static void |
580 | _ec_setup_process(struct _Ethumbd_Child *ec, int index, int type) | 580 | _ec_setup_process(struct _Ethumbd_Child *ec, int idx, int type) |
581 | { | 581 | { |
582 | Ethumb *e; | 582 | Ethumb *e; |
583 | 583 | ||
584 | e = ec->ethumbt[index]; | 584 | e = ec->ethumbt[idx]; |
585 | 585 | ||
586 | switch (type) | 586 | switch (type) |
587 | { | 587 | { |
@@ -645,10 +645,10 @@ static int | |||
645 | _ec_op_setup(struct _Ethumbd_Child *ec) | 645 | _ec_op_setup(struct _Ethumbd_Child *ec) |
646 | { | 646 | { |
647 | int r; | 647 | int r; |
648 | int index; | 648 | int idx; |
649 | int type; | 649 | int type; |
650 | 650 | ||
651 | r = _ec_read_safe(STDIN_FILENO, &index, sizeof(index)); | 651 | r = _ec_read_safe(STDIN_FILENO, &idx, sizeof(idx)); |
652 | if (!r) | 652 | if (!r) |
653 | return 0; | 653 | return 0; |
654 | 654 | ||
@@ -657,7 +657,7 @@ _ec_op_setup(struct _Ethumbd_Child *ec) | |||
657 | return 0; | 657 | return 0; |
658 | while (type != ETHUMBD_SETUP_FINISHED) | 658 | while (type != ETHUMBD_SETUP_FINISHED) |
659 | { | 659 | { |
660 | _ec_setup_process(ec, index, type); | 660 | _ec_setup_process(ec, idx, type); |
661 | r = _ec_read_safe(STDIN_FILENO, &type, sizeof(type)); | 661 | r = _ec_read_safe(STDIN_FILENO, &type, sizeof(type)); |
662 | if (!r) | 662 | if (!r) |
663 | return 0; | 663 | return 0; |