[evince] djvu: Fix -Wdeclaration-after-statement warnings
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] djvu: Fix -Wdeclaration-after-statement warnings
- Date: Fri, 26 Jul 2013 20:31:59 +0000 (UTC)
commit 387da2aa4930650ca5c9c56c6b876ca71758aaf3
Author: Christian Persch <chpe gnome org>
Date: Fri Jul 26 21:46:31 2013 +0200
djvu: Fix -Wdeclaration-after-statement warnings
backend/djvu/djvu-document.c | 3 ++-
backend/djvu/djvu-text-page.c | 20 ++++++++++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/backend/djvu/djvu-document.c b/backend/djvu/djvu-document.c
index 88977b2..cf9e33a 100644
--- a/backend/djvu/djvu-document.c
+++ b/backend/djvu/djvu-document.c
@@ -734,6 +734,7 @@ djvu_document_file_exporter_end (EvFileExporter *exporter)
{
int d_optc = 1;
const char *d_optv[d_optc];
+ ddjvu_job_t *job;
DjvuDocument *djvu_document = DJVU_DOCUMENT (exporter);
@@ -745,7 +746,7 @@ djvu_document_file_exporter_end (EvFileExporter *exporter)
d_optv[0] = djvu_document->opts->str;
- ddjvu_job_t * job = ddjvu_document_print(djvu_document->d_document, fn, d_optc, d_optv);
+ job = ddjvu_document_print(djvu_document->d_document, fn, d_optc, d_optv);
while (!ddjvu_job_done(job)) {
djvu_handle_events (djvu_document, TRUE, NULL);
}
diff --git a/backend/djvu/djvu-text-page.c b/backend/djvu/djvu-text-page.c
index 83bab18..243bd3e 100644
--- a/backend/djvu/djvu-text-page.c
+++ b/backend/djvu/djvu-text-page.c
@@ -136,13 +136,15 @@ djvu_text_page_selection (DjvuSelectionType type,
miniexp_t p,
int delimit)
{
+ miniexp_t deeper;
+
g_return_val_if_fail (miniexp_consp (p) && miniexp_symbolp
(miniexp_car (p)), FALSE);
if (miniexp_car (p) != page->char_symbol)
delimit |= miniexp_car (p) == page->word_symbol ? 1 : 2;
- miniexp_t deeper = miniexp_cddr (miniexp_cdddr (p));
+ deeper = miniexp_cddr (miniexp_cdddr (p));
while (deeper != miniexp_nil) {
miniexp_t str = miniexp_car (deeper);
if (miniexp_stringp (str)) {
@@ -188,10 +190,12 @@ djvu_text_page_limits (DjvuTextPage *page,
miniexp_t p,
EvRectangle *rect)
{
+ miniexp_t deeper;
+
g_return_if_fail (miniexp_consp (p) &&
miniexp_symbolp (miniexp_car (p)));
- miniexp_t deeper = miniexp_cddr (miniexp_cdddr (p));
+ deeper = miniexp_cddr (miniexp_cdddr (p));
while (deeper != miniexp_nil) {
miniexp_t str = miniexp_car (deeper);
if (miniexp_stringp (str))
@@ -268,9 +272,10 @@ djvu_text_page_position (DjvuTextPage *page,
/* Shamelessly copied from GNU classpath */
while (low <= hi) {
+ DjvuTextLink *link;
+
mid = (low + hi) >> 1;
- DjvuTextLink *link =
- &g_array_index (links, DjvuTextLink, mid);
+ link = &g_array_index (links, DjvuTextLink, mid);
if (link->position == position)
break;
else if (link->position > position)
@@ -335,10 +340,12 @@ djvu_text_page_sexpr (DjvuTextPage *page,
miniexp_t start,
miniexp_t end)
{
+ miniexp_t deeper;
+
g_return_val_if_fail (miniexp_consp (p) && miniexp_symbolp
(miniexp_car (p)), FALSE);
- miniexp_t deeper = miniexp_cddr (miniexp_cdddr (p));
+ deeper = miniexp_cddr (miniexp_cdddr (p));
while (deeper != miniexp_nil) {
miniexp_t str = miniexp_car (deeper);
if (miniexp_stringp (str)) {
@@ -389,13 +396,14 @@ djvu_text_page_append_text (DjvuTextPage *page,
gboolean delimit)
{
char *token_text;
+ miniexp_t deeper;
g_return_if_fail (miniexp_consp (p) &&
miniexp_symbolp (miniexp_car (p)));
delimit |= page->char_symbol != miniexp_car (p);
- miniexp_t deeper = miniexp_cddr (miniexp_cdddr (p));
+ deeper = miniexp_cddr (miniexp_cdddr (p));
while (deeper != miniexp_nil) {
miniexp_t data = miniexp_car (deeper);
if (miniexp_stringp (data)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]