From 5799d09e269c91669d5dd8b20b3f19339409e677 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Wed, 4 Oct 2017 21:11:32 +0200 Subject: Remove shadowed variables. --- source/pdf/pdf-image.c | 2 +- source/pdf/pdf-lex.c | 2 +- source/pdf/pdf-page.c | 4 ++-- source/pdf/pdf-repair.c | 3 --- source/pdf/pdf-xref.c | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) (limited to 'source/pdf') diff --git a/source/pdf/pdf-image.c b/source/pdf/pdf-image.c index 4da69a50..48c78d96 100644 --- a/source/pdf/pdf-image.c +++ b/source/pdf/pdf-image.c @@ -395,7 +395,7 @@ pdf_add_image(fz_context *ctx, pdf_document *doc, fz_image *image, int mask) else { unsigned int size; - int n, h; + int h; unsigned char *d, *s; raw_or_unknown_compression: diff --git a/source/pdf/pdf-lex.c b/source/pdf/pdf-lex.c index c823dca7..2a1b4685 100644 --- a/source/pdf/pdf-lex.c +++ b/source/pdf/pdf-lex.c @@ -156,7 +156,7 @@ lex_number(fz_context *ctx, fz_stream *f, pdf_lexbuf *buf, int c) while (s < e) { - int c = fz_read_byte(ctx, f); + c = fz_read_byte(ctx, f); switch (c) { case IS_WHITE: diff --git a/source/pdf/pdf-page.c b/source/pdf/pdf-page.c index 7748cc33..f47593d0 100644 --- a/source/pdf/pdf-page.c +++ b/source/pdf/pdf-page.c @@ -679,7 +679,7 @@ find_seps(fz_context *ctx, fz_separations **seps, pdf_obj *obj) /* If the separation colorants exists for this DeviceN color space * add those prior to our search for DeviceN color */ pdf_obj *cols = pdf_dict_get(ctx, pdf_array_get(ctx, obj, 4), PDF_NAME_Colorants); - int i, n = pdf_dict_len(ctx, cols); + n = pdf_dict_len(ctx, cols); for (i = 0; i < n; i++) find_seps(ctx, seps, pdf_dict_get_val(ctx, cols, i)); } @@ -1113,7 +1113,7 @@ pdf_insert_page(fz_context *ctx, pdf_document *doc, int at, pdf_obj *page_ref) /* Adjust page counts */ while (parent) { - int count = pdf_to_int(ctx, pdf_dict_get(ctx, parent, PDF_NAME_Count)); + count = pdf_to_int(ctx, pdf_dict_get(ctx, parent, PDF_NAME_Count)); pdf_dict_put_drop(ctx, parent, PDF_NAME_Count, pdf_new_int(ctx, doc, count + 1)); parent = pdf_dict_get(ctx, parent, PDF_NAME_Parent); } diff --git a/source/pdf/pdf-repair.c b/source/pdf/pdf-repair.c index 29d11e55..e4606c27 100644 --- a/source/pdf/pdf-repair.c +++ b/source/pdf/pdf-repair.c @@ -619,7 +619,6 @@ pdf_repair_xref(fz_context *ctx, pdf_document *doc) if (roots) { - int i; for (i = num_roots-1; i > 0; i--) { if (pdf_is_dict(ctx, roots[i])) @@ -671,8 +670,6 @@ pdf_repair_xref(fz_context *ctx, pdf_document *doc) } fz_always(ctx) { - int i; - for (i = 0; i < num_roots; i++) pdf_drop_obj(ctx, roots[i]); fz_free(ctx, roots); diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c index 6a4117d9..02fe6ee4 100644 --- a/source/pdf/pdf-xref.c +++ b/source/pdf/pdf-xref.c @@ -1246,7 +1246,7 @@ pdf_load_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf) xref_len = pdf_xref_len(ctx, doc); for (i = 0; i < xref_len; i++) { - pdf_xref_entry *entry = pdf_get_xref_entry(ctx, doc, i); + entry = pdf_get_xref_entry(ctx, doc, i); if (entry->type == 'n') { /* Special case code: "0000000000 * n" means free, -- cgit v1.2.3