diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcroco/cr-enc-handler.c | 6 | ||||
| -rw-r--r-- | src/libcroco/cr-input.c | 2 | ||||
| -rw-r--r-- | src/libcroco/cr-sel-eng.c | 4 | ||||
| -rw-r--r-- | src/libcroco/cr-simple-sel.c | 2 | ||||
| -rw-r--r-- | src/libcroco/cr-tknzr.c | 8 |
5 files changed, 13 insertions, 9 deletions
diff --git a/src/libcroco/cr-enc-handler.c b/src/libcroco/cr-enc-handler.c index 646bf1fe2..a7c4269ad 100644 --- a/src/libcroco/cr-enc-handler.c +++ b/src/libcroco/cr-enc-handler.c @@ -89,8 +89,7 @@ cr_enc_handler_get_instance (enum CREncoding a_enc) for (i = 0; gv_default_enc_handlers[i].encoding; i++) { if (gv_default_enc_handlers[i].encoding == a_enc) { - return (CREncHandler *) - & gv_default_enc_handlers[i].encoding; + return (CREncHandler *) & gv_default_enc_handlers[i]; } } @@ -118,8 +117,7 @@ cr_enc_handler_resolve_enc_alias (const guchar * a_alias_name, g_return_val_if_fail (a_alias_name != NULL, CR_BAD_PARAM_ERROR); - alias_name_up = g_strdup (a_alias_name); - g_ascii_strup (alias_name_up, -1); + alias_name_up = (guchar *) g_ascii_strup ((const gchar *) a_alias_name, -1); for (i = 0; gv_default_aliases[i].name; i++) { if (!strcmp (gv_default_aliases[i].name, (const gchar *) alias_name_up)) { diff --git a/src/libcroco/cr-input.c b/src/libcroco/cr-input.c index 5395ae214..732068aff 100644 --- a/src/libcroco/cr-input.c +++ b/src/libcroco/cr-input.c @@ -722,6 +722,8 @@ cr_input_consume_white_spaces (CRInput * a_this, gulong * a_nb_chars) } + *a_nb_chars = (gulong) nb_consumed; + if (nb_consumed && status == CR_END_OF_INPUT_ERROR) { status = CR_OK; } diff --git a/src/libcroco/cr-sel-eng.c b/src/libcroco/cr-sel-eng.c index ed40de393..6f496df2f 100644 --- a/src/libcroco/cr-sel-eng.c +++ b/src/libcroco/cr-sel-eng.c @@ -139,7 +139,7 @@ lang_pseudo_class_handler (CRSelEng *const a_this, /* "xml:lang" needed for SVG */ if ( (strqcmp (a_sel->content.pseudo->name->stryng->str, "lang", 4 ) && (strqcmp (a_sel->content.pseudo->name->stryng->str, "xml:lang", 8 ) ) ) - || !a_sel->content.pseudo->type == FUNCTION_PSEUDO) { + || a_sel->content.pseudo->type != FUNCTION_PSEUDO) { cr_utils_trace_info ("This handler is for :lang only"); return FALSE; } @@ -180,7 +180,7 @@ first_child_pseudo_class_handler (CRSelEng *const a_this, if (strcmp (a_sel->content.pseudo->name->stryng->str, "first-child") - || !a_sel->content.pseudo->type == IDENT_PSEUDO) { + || a_sel->content.pseudo->type != IDENT_PSEUDO) { cr_utils_trace_info ("This handler is for :first-child only"); return FALSE; } diff --git a/src/libcroco/cr-simple-sel.c b/src/libcroco/cr-simple-sel.c index a4670fe88..4df93fa77 100644 --- a/src/libcroco/cr-simple-sel.c +++ b/src/libcroco/cr-simple-sel.c @@ -254,7 +254,7 @@ cr_simple_sel_compute_specificity (CRSimpleSel * a_this) g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR); for (cur_sel = a_this; cur_sel; cur_sel = cur_sel->next) { - if (cur_sel->type_mask | TYPE_SELECTOR) { + if (cur_sel->type_mask & TYPE_SELECTOR) { c++; /*hmmh, is this a new language ? */ } else if (!cur_sel->name || !cur_sel->name->stryng diff --git a/src/libcroco/cr-tknzr.c b/src/libcroco/cr-tknzr.c index 228471bf9..83f6ab3c0 100644 --- a/src/libcroco/cr-tknzr.c +++ b/src/libcroco/cr-tknzr.c @@ -1902,6 +1902,8 @@ cr_tknzr_seek_index (CRTknzr * a_this, enum CRSeekPos a_origin, gint a_pos) enum CRStatus cr_tknzr_consume_chars (CRTknzr * a_this, guint32 a_char, glong * a_nb_char) { + gulong consumed = *(gulong *) a_nb_char; + enum CRStatus status; g_return_val_if_fail (a_this && PRIVATE (a_this) && PRIVATE (a_this)->input, CR_BAD_PARAM_ERROR); @@ -1912,8 +1914,10 @@ cr_tknzr_consume_chars (CRTknzr * a_this, guint32 a_char, glong * a_nb_char) PRIVATE (a_this)->token_cache = NULL; } - return cr_input_consume_chars (PRIVATE (a_this)->input, - a_char, a_nb_char); + status = cr_input_consume_chars (PRIVATE (a_this)->input, + a_char, &consumed); + *a_nb_char = (glong) consumed; + return status; } enum CRStatus |