summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2013-08-03 20:24:34 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2013-08-03 20:24:34 +0000
commit56c3e481fc471764c4445ca7be1c24099b1885d3 (patch)
tree5d063eb65c9bc0d9f2ebbaec884b819a20010ee4 /src
parentfunction cleanup (diff)
downloadinkscape-56c3e481fc471764c4445ca7be1c24099b1885d3.tar.gz
inkscape-56c3e481fc471764c4445ca7be1c24099b1885d3.zip
cleanup
(bzr r12456)
Diffstat (limited to 'src')
-rw-r--r--src/libcroco/cr-om-parser.c43
1 files changed, 23 insertions, 20 deletions
diff --git a/src/libcroco/cr-om-parser.c b/src/libcroco/cr-om-parser.c
index b8d70e35a..c9ce032af 100644
--- a/src/libcroco/cr-om-parser.c
+++ b/src/libcroco/cr-om-parser.c
@@ -217,9 +217,9 @@ start_font_face (CRDocHandler * a_this,
ParsingContext **ctxtptr = NULL;
UNUSED(a_location);
-
g_return_if_fail (a_this);
- ctxtptr = &ctxt;
+
+ ctxtptr = &ctxt;
status = cr_doc_handler_get_ctxt (a_this, (gpointer *) ctxtptr);
g_return_if_fail (status == CR_OK && ctxt);
g_return_if_fail (ctxt->cur_stmt == NULL);
@@ -316,9 +316,9 @@ charset (CRDocHandler * a_this, CRString * a_charset,
ParsingContext **ctxtptr = NULL;
UNUSED(a_location);
-
g_return_if_fail (a_this);
- ctxtptr = &ctxt;
+
+ ctxtptr = &ctxt;
status = cr_doc_handler_get_ctxt (a_this, (gpointer *) ctxtptr);
g_return_if_fail (status == CR_OK && ctxt);
g_return_if_fail (ctxt->stylesheet);
@@ -352,9 +352,9 @@ start_page (CRDocHandler * a_this,
ParsingContext **ctxtptr = NULL;
UNUSED(a_location);
-
g_return_if_fail (a_this);
- ctxtptr = &ctxt;
+
+ ctxtptr = &ctxt;
status = cr_doc_handler_get_ctxt (a_this, (gpointer *) ctxtptr);
g_return_if_fail (status == CR_OK && ctxt);
g_return_if_fail (ctxt->cur_stmt == NULL);
@@ -395,8 +395,11 @@ end_page (CRDocHandler * a_this,
ParsingContext **ctxtptr = NULL;
CRStatement *stmt = NULL;
+ UNUSED(a_page);
+ UNUSED(a_pseudo_page);
g_return_if_fail (a_this);
- ctxtptr = &ctxt;
+
+ ctxtptr = &ctxt;
status = cr_doc_handler_get_ctxt (a_this, (gpointer *) ctxtptr);
g_return_if_fail (status == CR_OK && ctxt);
g_return_if_fail (ctxt->cur_stmt
@@ -416,8 +419,6 @@ end_page (CRDocHandler * a_this,
cr_statement_destroy (ctxt->cur_stmt);
ctxt->cur_stmt = NULL;
}
- a_page = NULL; /*keep compiler happy */
- a_pseudo_page = NULL; /*keep compiler happy */
}
static void
@@ -431,9 +432,9 @@ start_media (CRDocHandler * a_this,
GList *media_list = NULL;
UNUSED(a_location);
-
g_return_if_fail (a_this);
- ctxtptr = &ctxt;
+
+ ctxtptr = &ctxt;
status = cr_doc_handler_get_ctxt (a_this, (gpointer *) ctxtptr);
g_return_if_fail (status == CR_OK && ctxt);
@@ -443,12 +444,10 @@ start_media (CRDocHandler * a_this,
&& ctxt->stylesheet);
if (a_media_list) {
/*duplicate the media_list */
- media_list = cr_utils_dup_glist_of_cr_string
- (a_media_list);
+ media_list = cr_utils_dup_glist_of_cr_string(a_media_list);
}
ctxt->cur_media_stmt =
- cr_statement_new_at_media_rule
- (ctxt->stylesheet, NULL, media_list);
+ cr_statement_new_at_media_rule(ctxt->stylesheet, NULL, media_list);
}
@@ -460,8 +459,10 @@ end_media (CRDocHandler * a_this, GList * a_media_list)
ParsingContext **ctxtptr = NULL;
CRStatement *stmts = NULL;
+ UNUSED(a_media_list);
g_return_if_fail (a_this);
- ctxtptr = &ctxt;
+
+ ctxtptr = &ctxt;
status = cr_doc_handler_get_ctxt (a_this, (gpointer *) ctxtptr);
g_return_if_fail (status == CR_OK && ctxt);
g_return_if_fail (ctxt
@@ -481,7 +482,6 @@ end_media (CRDocHandler * a_this, GList * a_media_list)
ctxt->cur_stmt = NULL ;
ctxt->cur_media_stmt = NULL ;
- a_media_list = NULL;
}
static void
@@ -499,10 +499,11 @@ import_style (CRDocHandler * a_this,
ParsingContext **ctxtptr = NULL;
GList *media_list = NULL ;
+ UNUSED(a_uri_default_ns);
UNUSED(a_location);
-
g_return_if_fail (a_this);
- ctxtptr = &ctxt;
+
+ ctxtptr = &ctxt;
status = cr_doc_handler_get_ctxt (a_this, (gpointer *) ctxtptr);
g_return_if_fail (status == CR_OK && ctxt);
g_return_if_fail (ctxt->stylesheet);
@@ -574,8 +575,10 @@ end_selector (CRDocHandler * a_this, CRSelector * a_selector_list)
ParsingContext *ctxt = NULL;
ParsingContext **ctxtptr = NULL;
+ UNUSED(a_selector_list);
g_return_if_fail (a_this);
- ctxtptr = &ctxt;
+
+ ctxtptr = &ctxt;
status = cr_doc_handler_get_ctxt (a_this, (gpointer *) ctxtptr);
g_return_if_fail (status == CR_OK && ctxt);
g_return_if_fail (ctxt->cur_stmt && ctxt->stylesheet);