diff options
author | Peter J. R. Moulder <pjmoulder@src.gnome.org> | 2008-03-30 05:43:43 +0000 |
---|---|---|
committer | Peter J. R. Moulder <pjmoulder@src.gnome.org> | 2008-03-30 05:43:43 +0000 |
commit | 8b60be7f9ac274c014294c51f88da884a3b0c99f (patch) | |
tree | 654b4d6a08a93e2bc0e957a010f87e8e597b5841 | |
parent | 71b9dffeed9300e3c1c6168a6023a6ee9a086889 (diff) | |
download | libcroco-8b60be7f9ac274c014294c51f88da884a3b0c99f.tar.gz |
Add ‘const’ to various function prototypes, as discussed at http://www.mail-archive.com/libcroco-list@gnome.org/msg00049.html . This change is a noop in the sense that it has no effect on libcroco's object files, but does affect source-level compatibility, both forwards and backwards — though in practice I'd guess that no existing code will break from this.
svn path=/trunk/; revision=315
38 files changed, 221 insertions, 220 deletions
diff --git a/src/cr-additional-sel.c b/src/cr-additional-sel.c index 45bf2c7..5a37eba 100644 --- a/src/cr-additional-sel.c +++ b/src/cr-additional-sel.c @@ -230,11 +230,11 @@ cr_additional_sel_prepend (CRAdditionalSel * a_this, CRAdditionalSel * a_sel) } guchar * -cr_additional_sel_to_string (CRAdditionalSel * a_this) +cr_additional_sel_to_string (CRAdditionalSel const * a_this) { guchar *result = NULL; GString *str_buf = NULL; - CRAdditionalSel *cur = NULL; + CRAdditionalSel const *cur = NULL; g_return_val_if_fail (a_this, NULL); @@ -332,7 +332,7 @@ cr_additional_sel_to_string (CRAdditionalSel * a_this) } guchar * -cr_additional_sel_one_to_string (CRAdditionalSel *a_this) +cr_additional_sel_one_to_string (CRAdditionalSel const *a_this) { guchar *result = NULL; GString *str_buf = NULL; @@ -439,7 +439,7 @@ cr_additional_sel_one_to_string (CRAdditionalSel *a_this) * Dumps the current instance of #CRAdditionalSel to a file */ void -cr_additional_sel_dump (CRAdditionalSel * a_this, FILE * a_fp) +cr_additional_sel_dump (CRAdditionalSel const * a_this, FILE * a_fp) { guchar *tmp_str = NULL; diff --git a/src/cr-additional-sel.h b/src/cr-additional-sel.h index 536ad2d..7ca3e07 100644 --- a/src/cr-additional-sel.h +++ b/src/cr-additional-sel.h @@ -85,11 +85,11 @@ void cr_additional_sel_set_attr_sel (CRAdditionalSel *a_this, CRAdditionalSel * cr_additional_sel_prepend (CRAdditionalSel *a_this, CRAdditionalSel *a_sel) ; -guchar * cr_additional_sel_to_string (CRAdditionalSel *a_this) ; +guchar * cr_additional_sel_to_string (CRAdditionalSel const *a_this) ; -guchar * cr_additional_sel_one_to_string (CRAdditionalSel *a_this) ; +guchar * cr_additional_sel_one_to_string (CRAdditionalSel const *a_this) ; -void cr_additional_sel_dump (CRAdditionalSel *a_this, FILE *a_fp) ; +void cr_additional_sel_dump (CRAdditionalSel const *a_this, FILE *a_fp) ; void cr_additional_sel_destroy (CRAdditionalSel *a_this) ; diff --git a/src/cr-attr-sel.c b/src/cr-attr-sel.c index 65ed7e6..787f0c0 100644 --- a/src/cr-attr-sel.c +++ b/src/cr-attr-sel.c @@ -105,9 +105,9 @@ cr_attr_sel_prepend_attr_sel (CRAttrSel * a_this, * Returns the serialized attribute selector. */ guchar * -cr_attr_sel_to_string (CRAttrSel * a_this) +cr_attr_sel_to_string (CRAttrSel const * a_this) { - CRAttrSel *cur = NULL; + CRAttrSel const *cur = NULL; guchar *result = NULL; GString *str_buf = NULL; @@ -184,7 +184,7 @@ cr_attr_sel_to_string (CRAttrSel * a_this) * Dumps the current instance of #CRAttrSel to a file. */ void -cr_attr_sel_dump (CRAttrSel * a_this, FILE * a_fp) +cr_attr_sel_dump (CRAttrSel const * a_this, FILE * a_fp) { guchar *tmp_str = NULL; diff --git a/src/cr-attr-sel.h b/src/cr-attr-sel.h index 27dfd34..82d5a87 100644 --- a/src/cr-attr-sel.h +++ b/src/cr-attr-sel.h @@ -63,9 +63,9 @@ enum CRStatus cr_attr_sel_append_attr_sel (CRAttrSel * a_this, enum CRStatus cr_attr_sel_prepend_attr_sel (CRAttrSel *a_this, CRAttrSel *a_attr_sel) ; -guchar * cr_attr_sel_to_string (CRAttrSel *a_this) ; +guchar * cr_attr_sel_to_string (CRAttrSel const *a_this) ; -void cr_attr_sel_dump (CRAttrSel *a_this, FILE *a_fp) ; +void cr_attr_sel_dump (CRAttrSel const *a_this, FILE *a_fp) ; void cr_attr_sel_destroy (CRAttrSel *a_this) ; diff --git a/src/cr-declaration.c b/src/cr-declaration.c index b1dea12..dcb8998 100644 --- a/src/cr-declaration.c +++ b/src/cr-declaration.c @@ -42,7 +42,7 @@ *Dumps (serializes) one css declaration to a file. */ static void -dump (CRDeclaration * a_this, FILE * a_fp, glong a_indent) +dump (CRDeclaration const * a_this, FILE * a_fp, glong a_indent) { guchar *str = NULL; @@ -448,10 +448,10 @@ cr_declaration_append2 (CRDeclaration * a_this, *Dumps a declaration list to a file. */ void -cr_declaration_dump (CRDeclaration * a_this, FILE * a_fp, glong a_indent, +cr_declaration_dump (CRDeclaration const * a_this, FILE * a_fp, glong a_indent, gboolean a_one_per_line) { - CRDeclaration *cur = NULL; + CRDeclaration const *cur = NULL; g_return_if_fail (a_this); @@ -475,7 +475,7 @@ cr_declaration_dump (CRDeclaration * a_this, FILE * a_fp, glong a_indent, *Dumps the first declaration of the declaration list to a file. */ void -cr_declaration_dump_one (CRDeclaration * a_this, FILE * a_fp, glong a_indent) +cr_declaration_dump_one (CRDeclaration const * a_this, FILE * a_fp, glong a_indent) { g_return_if_fail (a_this); @@ -493,7 +493,7 @@ cr_declaration_dump_one (CRDeclaration * a_this, FILE * a_fp, glong a_indent) *free the string using g_free(). */ gchar * -cr_declaration_to_string (CRDeclaration * a_this, gulong a_indent) +cr_declaration_to_string (CRDeclaration const * a_this, gulong a_indent) { GString *stringue = NULL; @@ -562,9 +562,9 @@ cr_declaration_to_string (CRDeclaration * a_this, gulong a_indent) *Serializes the declaration list into a string */ guchar * -cr_declaration_list_to_string (CRDeclaration * a_this, gulong a_indent) +cr_declaration_list_to_string (CRDeclaration const * a_this, gulong a_indent) { - CRDeclaration *cur = NULL; + CRDeclaration const *cur = NULL; GString *stringue = NULL; guchar *str = NULL, *result = NULL; @@ -600,10 +600,10 @@ cr_declaration_list_to_string (CRDeclaration * a_this, gulong a_indent) *Returns the serialized form the declararation. */ guchar * -cr_declaration_list_to_string2 (CRDeclaration * a_this, +cr_declaration_list_to_string2 (CRDeclaration const * a_this, gulong a_indent, gboolean a_one_decl_per_line) { - CRDeclaration *cur = NULL; + CRDeclaration const *cur = NULL; GString *stringue = NULL; guchar *str = NULL, *result = NULL; @@ -648,9 +648,9 @@ cr_declaration_list_to_string2 (CRDeclaration * a_this, *Return the number of properties in the declaration */ gint -cr_declaration_nr_props (CRDeclaration * a_this) +cr_declaration_nr_props (CRDeclaration const * a_this) { - CRDeclaration *cur = NULL; + CRDeclaration const *cur = NULL; int nr = 0; g_return_val_if_fail (a_this, -1); diff --git a/src/cr-declaration.h b/src/cr-declaration.h index 7aa994f..eee8be3 100644 --- a/src/cr-declaration.h +++ b/src/cr-declaration.h @@ -100,14 +100,14 @@ CRDeclaration * cr_declaration_prepend (CRDeclaration *a_this, CRDeclaration * cr_declaration_unlink (CRDeclaration * a_decl) ; void -cr_declaration_dump (CRDeclaration *a_this, +cr_declaration_dump (CRDeclaration const *a_this, FILE *a_fp, glong a_indent, gboolean a_one_per_line) ; -void cr_declaration_dump_one (CRDeclaration *a_this, +void cr_declaration_dump_one (CRDeclaration const *a_this, FILE *a_fp, glong a_indent) ; -gint cr_declaration_nr_props (CRDeclaration *a_this) ; +gint cr_declaration_nr_props (CRDeclaration const *a_this) ; CRDeclaration * cr_declaration_get_from_list (CRDeclaration *a_this, int itemnr) ; @@ -115,13 +115,13 @@ CRDeclaration * cr_declaration_get_from_list (CRDeclaration *a_this, CRDeclaration * cr_declaration_get_by_prop_name (CRDeclaration *a_this, const guchar *a_str) ; -gchar * cr_declaration_to_string (CRDeclaration *a_this, +gchar * cr_declaration_to_string (CRDeclaration const *a_this, gulong a_indent) ; -guchar * cr_declaration_list_to_string (CRDeclaration *a_this, +guchar * cr_declaration_list_to_string (CRDeclaration const *a_this, gulong a_indent) ; -guchar * cr_declaration_list_to_string2 (CRDeclaration *a_this, +guchar * cr_declaration_list_to_string2 (CRDeclaration const *a_this, gulong a_indent, gboolean a_one_decl_per_line) ; diff --git a/src/cr-doc-handler.c b/src/cr-doc-handler.c index a735bfd..e19b845 100644 --- a/src/cr-doc-handler.c +++ b/src/cr-doc-handler.c @@ -100,7 +100,7 @@ cr_doc_handler_new (void) *Returns CR_OK upon successfull completion, an error code otherwise. */ enum CRStatus -cr_doc_handler_get_ctxt (CRDocHandler * a_this, gpointer * a_ctxt) +cr_doc_handler_get_ctxt (CRDocHandler const * a_this, gpointer * a_ctxt) { g_return_val_if_fail (a_this && a_this->priv, CR_BAD_PARAM_ERROR); @@ -137,7 +137,7 @@ cr_doc_handler_set_ctxt (CRDocHandler * a_this, gpointer a_ctxt) *Returns CR_OK upon successfull completion, an error code otherwise. */ enum CRStatus -cr_doc_handler_get_result (CRDocHandler * a_this, gpointer * a_result) +cr_doc_handler_get_result (CRDocHandler const * a_this, gpointer * a_result) { g_return_val_if_fail (a_this && a_this->priv, CR_BAD_PARAM_ERROR); diff --git a/src/cr-doc-handler.h b/src/cr-doc-handler.h index 222ab47..d12673f 100644 --- a/src/cr-doc-handler.h +++ b/src/cr-doc-handler.h @@ -276,11 +276,11 @@ CRDocHandler * cr_doc_handler_new (void) ; enum CRStatus cr_doc_handler_set_result (CRDocHandler *a_this, gpointer a_result) ; -enum CRStatus cr_doc_handler_get_result (CRDocHandler *a_this, gpointer * a_result) ; +enum CRStatus cr_doc_handler_get_result (CRDocHandler const *a_this, gpointer * a_result) ; enum CRStatus cr_doc_handler_set_ctxt (CRDocHandler *a_this, gpointer a_ctxt) ; -enum CRStatus cr_doc_handler_get_ctxt (CRDocHandler *a_this, gpointer * a_ctxt) ; +enum CRStatus cr_doc_handler_get_ctxt (CRDocHandler const *a_this, gpointer * a_ctxt) ; enum CRStatus cr_doc_handler_set_default_sac_handler (CRDocHandler *a_this) ; diff --git a/src/cr-fonts.c b/src/cr-fonts.c index 94c4f2c..6ef347e 100644 --- a/src/cr-fonts.c +++ b/src/cr-fonts.c @@ -27,10 +27,10 @@ #include <string.h> static enum CRStatus -cr_font_family_to_string_real (CRFontFamily * a_this, +cr_font_family_to_string_real (CRFontFamily const * a_this, gboolean a_walk_list, GString ** a_string) { - guchar *name = NULL; + guchar const *name = NULL; enum CRStatus result = CR_OK; if (!*a_string) { @@ -46,31 +46,31 @@ cr_font_family_to_string_real (CRFontFamily * a_this, switch (a_this->type) { case FONT_FAMILY_SANS_SERIF: - name = (guchar *) "sans-serif"; + name = (guchar const *) "sans-serif"; break; case FONT_FAMILY_SERIF: - name = (guchar *) "sans-serif"; + name = (guchar const *) "sans-serif"; break; case FONT_FAMILY_CURSIVE: - name = (guchar *) "cursive"; + name = (guchar const *) "cursive"; break; case FONT_FAMILY_FANTASY: - name = (guchar *) "fantasy"; + name = (guchar const *) "fantasy"; break; case FONT_FAMILY_MONOSPACE: - name = (guchar *) "monospace"; + name = (guchar const *) "monospace"; break; case FONT_FAMILY_NON_GENERIC: - name = (guchar *) a_this->name; + name = (guchar const *) a_this->name; break; default: - name = (guchar *) NULL; + name = NULL; break; } @@ -92,32 +92,32 @@ static const gchar * cr_predefined_absolute_font_size_to_string (enum CRPredefinedAbsoluteFontSize a_code) { - gchar *str = NULL; + gchar const *str = NULL; switch (a_code) { case FONT_SIZE_XX_SMALL: - str = (gchar *) "xx-small"; + str = "xx-small"; break; case FONT_SIZE_X_SMALL: - str = (gchar *) "x-small"; + str = "x-small"; break; case FONT_SIZE_SMALL: - str = (gchar *) "small"; + str = "small"; break; case FONT_SIZE_MEDIUM: - str = (gchar *) "medium"; + str = "medium"; break; case FONT_SIZE_LARGE: - str = (gchar *) "large"; + str = "large"; break; case FONT_SIZE_X_LARGE: - str = (gchar *) "x-large"; + str = "x-large"; break; case FONT_SIZE_XX_LARGE: - str = (gchar *) "xx-large"; + str = "xx-large"; break; default: - str = (gchar *) "unknown absolute font size value"; + str = "unknown absolute font size value"; } return str; } @@ -125,17 +125,17 @@ cr_predefined_absolute_font_size_to_string (enum CRPredefinedAbsoluteFontSize static const gchar * cr_relative_font_size_to_string (enum CRRelativeFontSize a_code) { - gchar *str = NULL; + gchar const *str = NULL; switch (a_code) { case FONT_SIZE_LARGER: - str = (gchar *) "larger"; + str = "larger"; break; case FONT_SIZE_SMALLER: - str = (gchar *) "smaller"; + str = "smaller"; break; default: - str = (gchar *) "unknown relative font size value"; + str = "unknown relative font size value"; break; } return str; @@ -179,7 +179,7 @@ cr_font_family_new (enum CRFontFamilyType a_type, guchar * a_name) * g_free(). */ guchar * -cr_font_family_to_string (CRFontFamily * a_this, +cr_font_family_to_string (CRFontFamily const * a_this, gboolean a_walk_font_family_list) { enum CRStatus status = CR_OK; @@ -383,7 +383,7 @@ cr_font_size_clear (CRFontSize * a_this) * Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus -cr_font_size_copy (CRFontSize * a_dst, CRFontSize * a_src) +cr_font_size_copy (CRFontSize * a_dst, CRFontSize const * a_src) { g_return_val_if_fail (a_dst && a_src, CR_BAD_PARAM_ERROR); @@ -499,7 +499,7 @@ cr_font_size_set_to_inherit (CRFontSize *a_this) * Returns TRUE if the current instance is set to 'inherit'. */ gboolean -cr_font_size_is_set_to_inherit (CRFontSize *a_this) +cr_font_size_is_set_to_inherit (CRFontSize const *a_this) { g_return_val_if_fail (a_this, FALSE) ; @@ -514,7 +514,7 @@ cr_font_size_is_set_to_inherit (CRFontSize *a_this) * has to bee freed using g_free(). */ gchar * -cr_font_size_to_string (CRFontSize * a_this) +cr_font_size_to_string (CRFontSize const * a_this) { gchar *str = NULL; @@ -673,7 +673,7 @@ cr_font_size_is_predefined_absolute_font_size * Returns the serialized form of #CRFontSizeAdjust */ gchar * -cr_font_size_adjust_to_string (CRFontSizeAdjust * a_this) +cr_font_size_adjust_to_string (CRFontSizeAdjust const * a_this) { gchar *str = NULL; diff --git a/src/cr-fonts.h b/src/cr-fonts.h index 4f72320..9eaeeeb 100644 --- a/src/cr-fonts.h +++ b/src/cr-fonts.h @@ -235,7 +235,7 @@ cr_font_family_append (CRFontFamily *a_this, CRFontFamily *a_family_to_append) ; guchar * -cr_font_family_to_string (CRFontFamily *a_this, +cr_font_family_to_string (CRFontFamily const *a_this, gboolean a_walk_font_family_list) ; CRFontFamily * @@ -258,7 +258,7 @@ CRFontSize * cr_font_size_new (void) ; enum CRStatus cr_font_size_clear (CRFontSize *a_this) ; enum CRStatus cr_font_size_copy (CRFontSize *a_dst, - CRFontSize *a_src) ; + CRFontSize const *a_src) ; enum CRStatus cr_font_size_set_predefined_absolute_font_size (CRFontSize *a_this, enum CRPredefinedAbsoluteFontSize a_predefined) ; enum CRStatus cr_font_size_set_relative_font_size (CRFontSize *a_this, @@ -270,9 +270,9 @@ enum CRStatus cr_font_size_set_absolute_font_size (CRFontSize *a_this, enum CRStatus cr_font_size_set_to_inherit (CRFontSize *a_this) ; -gboolean cr_font_size_is_set_to_inherit (CRFontSize *a_this) ; +gboolean cr_font_size_is_set_to_inherit (CRFontSize const *a_this) ; -gchar* cr_font_size_to_string (CRFontSize *a_this) ; +gchar* cr_font_size_to_string (CRFontSize const *a_this) ; void cr_font_size_destroy (CRFontSize *a_font_size) ; @@ -282,7 +282,7 @@ void cr_font_size_destroy (CRFontSize *a_font_size) ; CRFontSizeAdjust * cr_font_size_adjust_new (void) ; -gchar * cr_font_size_adjust_to_string (CRFontSizeAdjust *a_this) ; +gchar * cr_font_size_adjust_to_string (CRFontSizeAdjust const *a_this) ; void cr_font_size_adjust_destroy (CRFontSizeAdjust *a_this) ; diff --git a/src/cr-input.c b/src/cr-input.c index 242a185..3cc283e 100644 --- a/src/cr-input.c +++ b/src/cr-input.c @@ -354,7 +354,7 @@ cr_input_unref (CRInput * a_this) * and only if this method returns CR_OK. */ enum CRStatus -cr_input_end_of_input (CRInput * a_this, gboolean * a_end_of_input) +cr_input_end_of_input (CRInput const * a_this, gboolean * a_end_of_input) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_end_of_input, CR_BAD_PARAM_ERROR); @@ -373,7 +373,7 @@ cr_input_end_of_input (CRInput * a_this, gboolean * a_end_of_input) *before the end, -1 in case of error. */ glong -cr_input_get_nb_bytes_left (CRInput * a_this) +cr_input_get_nb_bytes_left (CRInput const * a_this) { g_return_val_if_fail (a_this && PRIVATE (a_this), -1); g_return_val_if_fail (PRIVATE (a_this)->nb_bytes @@ -512,7 +512,7 @@ cr_input_set_line_num (CRInput * a_this, glong a_line_num) *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus -cr_input_get_line_num (CRInput * a_this, glong * a_line_num) +cr_input_get_line_num (CRInput const * a_this, glong * a_line_num) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_line_num, CR_BAD_PARAM_ERROR); @@ -551,7 +551,7 @@ cr_input_set_column_num (CRInput * a_this, glong a_col) *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus -cr_input_get_column_num (CRInput * a_this, glong * a_col) +cr_input_get_column_num (CRInput const * a_this, glong * a_col) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_col, CR_BAD_PARAM_ERROR); @@ -743,7 +743,7 @@ cr_input_consume_white_spaces (CRInput * a_this, gulong * a_nb_chars) *otherwise. */ enum CRStatus -cr_input_peek_char (CRInput * a_this, guint32 * a_char) +cr_input_peek_char (CRInput const * a_this, guint32 * a_char) { enum CRStatus status = CR_OK; glong consumed = 0, @@ -792,7 +792,7 @@ cr_input_peek_char (CRInput * a_this, guint32 * a_char) *CR_OUT_OF_BOUNDS_ERROR if the indexed byte is out of bounds. */ enum CRStatus -cr_input_peek_byte (CRInput * a_this, enum CRSeekPos a_origin, +cr_input_peek_byte (CRInput const * a_this, enum CRSeekPos a_origin, gulong a_offset, guchar * a_byte) { gulong abs_offset = 0; @@ -844,7 +844,7 @@ cr_input_peek_byte (CRInput * a_this, enum CRSeekPos a_origin, *Returns the read byte or 0 if something bad happened. */ guchar -cr_input_peek_byte2 (CRInput * a_this, gulong a_offset, gboolean * a_eof) +cr_input_peek_byte2 (CRInput const * a_this, gulong a_offset, gboolean * a_eof) { guchar result = 0; enum CRStatus status = CR_ERROR; @@ -983,7 +983,7 @@ cr_input_seek_index (CRInput * a_this, enum CRSeekPos a_origin, gint a_pos) *function returns CR_OK. */ enum CRStatus -cr_input_get_cur_pos (CRInput * a_this, CRInputPos * a_pos) +cr_input_get_cur_pos (CRInput const * a_this, CRInputPos * a_pos) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_pos, CR_BAD_PARAM_ERROR); @@ -1011,7 +1011,7 @@ cr_input_get_cur_pos (CRInput * a_this, CRInputPos * a_pos) *code otherwise. */ enum CRStatus -cr_input_get_parsing_location (CRInput *a_this, +cr_input_get_parsing_location (CRInput const *a_this, CRParsingLocation *a_loc) { g_return_val_if_fail (a_this @@ -1043,7 +1043,7 @@ cr_input_get_parsing_location (CRInput *a_this, *otherwise. */ enum CRStatus -cr_input_get_cur_index (CRInput * a_this, glong * a_index) +cr_input_get_cur_index (CRInput const * a_this, glong * a_index) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_index, CR_BAD_PARAM_ERROR); @@ -1104,7 +1104,7 @@ cr_input_set_end_of_file (CRInput * a_this, gboolean a_eof) *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus -cr_input_get_end_of_file (CRInput * a_this, gboolean * a_eof) +cr_input_get_end_of_file (CRInput const * a_this, gboolean * a_eof) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_eof, CR_BAD_PARAM_ERROR); @@ -1146,7 +1146,7 @@ cr_input_set_end_of_line (CRInput * a_this, gboolean a_eol) *otherwise. */ enum CRStatus -cr_input_get_end_of_line (CRInput * a_this, gboolean * a_eol) +cr_input_get_end_of_line (CRInput const * a_this, gboolean * a_eol) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_eol, CR_BAD_PARAM_ERROR); @@ -1167,7 +1167,7 @@ cr_input_get_end_of_line (CRInput * a_this, gboolean * a_eol) * Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus -cr_input_set_cur_pos (CRInput * a_this, CRInputPos * a_pos) +cr_input_set_cur_pos (CRInput * a_this, CRInputPos const * a_pos) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_pos, CR_BAD_PARAM_ERROR); diff --git a/src/cr-input.h b/src/cr-input.h index 976b73f..9eb402a 100644 --- a/src/cr-input.h +++ b/src/cr-input.h @@ -93,15 +93,15 @@ enum CRStatus cr_input_consume_white_spaces (CRInput *a_this, gulong *a_nb_chars) ; enum CRStatus -cr_input_peek_byte (CRInput *a_this, enum CRSeekPos a_origin, +cr_input_peek_byte (CRInput const *a_this, enum CRSeekPos a_origin, gulong a_offset, guchar *a_byte) ; guchar -cr_input_peek_byte2 (CRInput *a_this, gulong a_offset, +cr_input_peek_byte2 (CRInput const *a_this, gulong a_offset, gboolean *a_eof) ; enum CRStatus -cr_input_peek_char (CRInput *a_this, guint32 *a_char) ; +cr_input_peek_char (CRInput const *a_this, guint32 *a_char) ; guchar * cr_input_get_byte_addr (CRInput *a_this, @@ -115,29 +115,29 @@ cr_input_seek_index (CRInput *a_this, enum CRSeekPos a_origin, gint a_pos) ; enum CRStatus -cr_input_get_cur_index (CRInput *a_this, glong *a_index) ; +cr_input_get_cur_index (CRInput const *a_this, glong *a_index) ; enum CRStatus cr_input_set_cur_index (CRInput *a_this, glong a_index) ; enum CRStatus -cr_input_get_cur_pos (CRInput *a_this, CRInputPos * a_pos) ; +cr_input_get_cur_pos (CRInput const *a_this, CRInputPos * a_pos) ; enum CRStatus -cr_input_set_cur_pos (CRInput *a_this, CRInputPos *a_pos) ; +cr_input_set_cur_pos (CRInput *a_this, CRInputPos const *a_pos) ; enum CRStatus -cr_input_get_parsing_location (CRInput *a_this, +cr_input_get_parsing_location (CRInput const *a_this, CRParsingLocation *a_loc) ; enum CRStatus -cr_input_get_end_of_line (CRInput *a_this, gboolean *a_eol) ; +cr_input_get_end_of_line (CRInput const *a_this, gboolean *a_eol) ; enum CRStatus cr_input_set_end_of_line (CRInput *a_this, gboolean a_eol) ; enum CRStatus -cr_input_get_end_of_file (CRInput *a_this, gboolean *a_eof) ; +cr_input_get_end_of_file (CRInput const *a_this, gboolean *a_eof) ; enum CRStatus cr_input_set_end_of_file (CRInput *a_this, gboolean a_eof) ; @@ -146,13 +146,13 @@ enum CRStatus cr_input_set_line_num (CRInput *a_this, glong a_line_num) ; enum CRStatus -cr_input_get_line_num (CRInput *a_this, glong *a_line_num) ; +cr_input_get_line_num (CRInput const *a_this, glong *a_line_num) ; enum CRStatus cr_input_set_column_num (CRInput *a_this, glong a_col) ; enum CRStatus -cr_input_get_column_num (CRInput *a_this, glong *a_col) ; +cr_input_get_column_num (CRInput const *a_this, glong *a_col) ; enum CRStatus cr_input_increment_line_num (CRInput *a_this, @@ -163,10 +163,10 @@ cr_input_increment_col_num (CRInput *a_this, glong a_increment) ; glong -cr_input_get_nb_bytes_left (CRInput *a_this) ; +cr_input_get_nb_bytes_left (CRInput const *a_this) ; enum CRStatus -cr_input_end_of_input (CRInput *a_this, gboolean *a_end_of_input) ; +cr_input_end_of_input (CRInput const *a_this, gboolean *a_end_of_input) ; G_END_DECLS diff --git a/src/cr-num.c b/src/cr-num.c index 2a14011..28c5df0 100644 --- a/src/cr-num.c +++ b/src/cr-num.c @@ -92,7 +92,7 @@ cr_num_new_with_val (gdouble a_val, enum CRNumType a_type) *free the returned string. */ guchar * -cr_num_to_string (CRNum * a_this) +cr_num_to_string (CRNum const * a_this) { gdouble test_val = 0.0; @@ -215,7 +215,7 @@ cr_num_to_string (CRNum * a_this) *error code otherwise. */ enum CRStatus -cr_num_copy (CRNum * a_dest, CRNum * a_src) +cr_num_copy (CRNum * a_dest, CRNum const * a_src) { g_return_val_if_fail (a_dest && a_src, CR_BAD_PARAM_ERROR); @@ -234,7 +234,7 @@ cr_num_copy (CRNum * a_dest, CRNum * a_src) *Must be freed by cr_num_destroy(). */ CRNum * -cr_num_dup (CRNum * a_this) +cr_num_dup (CRNum const * a_this) { CRNum *result = NULL; enum CRStatus status = CR_OK; @@ -284,7 +284,7 @@ cr_num_set (CRNum * a_this, gdouble a_val, enum CRNumType a_type) *FALSE otherwise. */ gboolean -cr_num_is_fixed_length (CRNum * a_this) +cr_num_is_fixed_length (CRNum const * a_this) { gboolean result = FALSE; diff --git a/src/cr-num.h b/src/cr-num.h index 83e9dc7..2b73aaf 100644 --- a/src/cr-num.h +++ b/src/cr-num.h @@ -102,20 +102,20 @@ cr_num_new_with_val (gdouble a_val, enum CRNumType a_type) ; CRNum * -cr_num_dup (CRNum *a_this) ; +cr_num_dup (CRNum const *a_this) ; guchar * -cr_num_to_string (CRNum *a_this) ; +cr_num_to_string (CRNum const *a_this) ; enum CRStatus -cr_num_copy (CRNum *a_dest, CRNum *a_src) ; +cr_num_copy (CRNum *a_dest, CRNum const *a_src) ; enum CRStatus cr_num_set (CRNum *a_this, gdouble a_val, enum CRNumType a_type) ; gboolean -cr_num_is_fixed_length (CRNum *a_this) ; +cr_num_is_fixed_length (CRNum const *a_this) ; void cr_num_destroy (CRNum *a_this) ; diff --git a/src/cr-parser.c b/src/cr-parser.c index 4b081d3..0fa1ffa 100644 --- a/src/cr-parser.c +++ b/src/cr-parser.c @@ -2952,7 +2952,7 @@ cr_parser_set_use_core_grammar (CRParser * a_this, * Returns CR_OK upon succesful completion, an error code otherwise. */ enum CRStatus -cr_parser_get_use_core_grammar (CRParser * a_this, +cr_parser_get_use_core_grammar (CRParser const * a_this, gboolean * a_use_core_grammar) { g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR); @@ -4441,7 +4441,7 @@ cr_parser_get_tknzr (CRParser * a_this, CRTknzr ** a_tknzr) *otherwise. */ enum CRStatus -cr_parser_get_parsing_location (CRParser *a_this, +cr_parser_get_parsing_location (CRParser const *a_this, CRParsingLocation *a_loc) { g_return_val_if_fail (a_this diff --git a/src/cr-parser.h b/src/cr-parser.h index 1534afb..6dce943 100644 --- a/src/cr-parser.h +++ b/src/cr-parser.h @@ -68,7 +68,7 @@ enum CRStatus cr_parser_set_tknzr (CRParser *a_this, CRTknzr *a_tknzr) ; enum CRStatus cr_parser_get_tknzr (CRParser *a_this, CRTknzr **a_tknzr) ; -enum CRStatus cr_parser_get_parsing_location (CRParser *a_this, CRParsingLocation *a_loc) ; +enum CRStatus cr_parser_get_parsing_location (CRParser const *a_this, CRParsingLocation *a_loc) ; enum CRStatus cr_parser_try_to_skip_spaces_and_comments (CRParser *a_this) ; @@ -81,7 +81,7 @@ enum CRStatus cr_parser_get_sac_handler (CRParser *a_this, enum CRStatus cr_parser_set_use_core_grammar (CRParser *a_this, gboolean a_use_core_grammar) ; -enum CRStatus cr_parser_get_use_core_grammar (CRParser *a_this, +enum CRStatus cr_parser_get_use_core_grammar (CRParser const *a_this, gboolean *a_use_core_grammar) ; enum CRStatus cr_parser_parse (CRParser *a_this) ; diff --git a/src/cr-parsing-location.c b/src/cr-parsing-location.c index 44891a3..4fe4acc 100644 --- a/src/cr-parsing-location.c +++ b/src/cr-parsing-location.c @@ -82,7 +82,7 @@ cr_parsing_location_init (CRParsingLocation *a_this) */ enum CRStatus cr_parsing_location_copy (CRParsingLocation *a_to, - CRParsingLocation *a_from) + CRParsingLocation const *a_from) { g_return_val_if_fail (a_to && a_from, CR_BAD_PARAM_ERROR) ; @@ -99,7 +99,7 @@ cr_parsing_location_copy (CRParsingLocation *a_to, *Returns the serialized string or NULL in case of an error. */ gchar * -cr_parsing_location_to_string (CRParsingLocation *a_this, +cr_parsing_location_to_string (CRParsingLocation const *a_this, enum CRParsingLocationSerialisationMask a_mask) { GString *result = NULL ; @@ -141,7 +141,7 @@ cr_parsing_location_to_string (CRParsingLocation *a_this, * @a_fp: the file pointer to dump the parsing location to. */ void -cr_parsing_location_dump (CRParsingLocation *a_this, +cr_parsing_location_dump (CRParsingLocation const *a_this, enum CRParsingLocationSerialisationMask a_mask, FILE *a_fp) { diff --git a/src/cr-parsing-location.h b/src/cr-parsing-location.h index 66a26a1..b8064a5 100644 --- a/src/cr-parsing-location.h +++ b/src/cr-parsing-location.h @@ -54,11 +54,11 @@ CRParsingLocation * cr_parsing_location_new (void) ; enum CRStatus cr_parsing_location_init (CRParsingLocation *a_this) ; enum CRStatus cr_parsing_location_copy (CRParsingLocation *a_to, - CRParsingLocation *a_from) ; + CRParsingLocation const *a_from) ; -gchar * cr_parsing_location_to_string (CRParsingLocation *a_this, +gchar * cr_parsing_location_to_string (CRParsingLocation const *a_this, enum CRParsingLocationSerialisationMask a_mask) ; -void cr_parsing_location_dump (CRParsingLocation *a_this, +void cr_parsing_location_dump (CRParsingLocation const *a_this, enum CRParsingLocationSerialisationMask a_mask, FILE *a_fp) ; diff --git a/src/cr-prop-list.c b/src/cr-prop-list.c index 66c6fa4..0ce57fa 100644 --- a/src/cr-prop-list.c +++ b/src/cr-prop-list.c @@ -207,7 +207,7 @@ cr_prop_list_set_prop (CRPropList * a_this, CRString * a_prop) *otherwise. */ enum CRStatus -cr_prop_list_get_prop (CRPropList * a_this, CRString ** a_prop) +cr_prop_list_get_prop (CRPropList const * a_this, CRString ** a_prop) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_prop, CR_BAD_PARAM_ERROR); @@ -241,7 +241,7 @@ cr_prop_list_set_decl (CRPropList * a_this, CRDeclaration * a_decl) * Returns CR_OK upon successful completion. */ enum CRStatus -cr_prop_list_get_decl (CRPropList * a_this, CRDeclaration ** a_decl) +cr_prop_list_get_decl (CRPropList const * a_this, CRDeclaration ** a_decl) { g_return_val_if_fail (a_this && PRIVATE (a_this) && a_decl, CR_BAD_PARAM_ERROR); diff --git a/src/cr-prop-list.h b/src/cr-prop-list.h index a003be2..797ba43 100644 --- a/src/cr-prop-list.h +++ b/src/cr-prop-list.h @@ -53,7 +53,7 @@ CRPropList * cr_prop_list_prepend2 (CRPropList *a_this, enum CRStatus cr_prop_list_set_prop (CRPropList *a_this, CRString *a_prop) ; -enum CRStatus cr_prop_list_get_prop (CRPropList *a_this, +enum CRStatus cr_prop_list_get_prop (CRPropList const *a_this, CRString **a_prop) ; enum CRStatus cr_prop_list_lookup_prop (CRPropList *a_this, @@ -67,7 +67,7 @@ CRPropList * cr_prop_list_get_prev (CRPropList *a_this) ; enum CRStatus cr_prop_list_set_decl (CRPropList *a_this, CRDeclaration *a_decl); -enum CRStatus cr_prop_list_get_decl (CRPropList *a_this, +enum CRStatus cr_prop_list_get_decl (CRPropList const *a_this, CRDeclaration **a_decl) ; CRPropList * cr_prop_list_unlink (CRPropList *a_this, diff --git a/src/cr-pseudo.c b/src/cr-pseudo.c index 353dab1..a46e69e 100644 --- a/src/cr-pseudo.c +++ b/src/cr-pseudo.c @@ -52,7 +52,7 @@ cr_pseudo_new (void) * string using g_free(). */ guchar * -cr_pseudo_to_string (CRPseudo * a_this) +cr_pseudo_to_string (CRPseudo const * a_this) { guchar *result = NULL; GString *str_buf = NULL; @@ -128,7 +128,7 @@ cr_pseudo_to_string (CRPseudo * a_this) * */ void -cr_pseudo_dump (CRPseudo * a_this, FILE * a_fp) +cr_pseudo_dump (CRPseudo const * a_this, FILE * a_fp) { guchar *tmp_str = NULL; diff --git a/src/cr-pseudo.h b/src/cr-pseudo.h index 6de6c9e..8917da4 100644 --- a/src/cr-pseudo.h +++ b/src/cr-pseudo.h @@ -53,9 +53,9 @@ struct _CRPseudo CRPseudo * cr_pseudo_new (void) ; -guchar * cr_pseudo_to_string (CRPseudo *a_this) ; +guchar * cr_pseudo_to_string (CRPseudo const *a_this) ; -void cr_pseudo_dump (CRPseudo *a_this, FILE *a_fp) ; +void cr_pseudo_dump (CRPseudo const *a_this, FILE *a_fp) ; void cr_pseudo_destroy (CRPseudo *a_this) ; diff --git a/src/cr-rgb.c b/src/cr-rgb.c index dcfca32..6313a58 100644 --- a/src/cr-rgb.c +++ b/src/cr-rgb.c @@ -243,7 +243,7 @@ cr_rgb_new_with_vals (gulong a_red, gulong a_green, *rgb. MUST BE FREED by the caller using g_free(). */ guchar * -cr_rgb_to_string (CRRgb * a_this) +cr_rgb_to_string (CRRgb const * a_this) { guchar *result = NULL; GString *str_buf = NULL; @@ -289,7 +289,7 @@ cr_rgb_to_string (CRRgb * a_this) *to a file. */ void -cr_rgb_dump (CRRgb * a_this, FILE * a_fp) +cr_rgb_dump (CRRgb const * a_this, FILE * a_fp) { guchar *str = NULL; @@ -388,7 +388,7 @@ cr_rgb_set_to_inherit (CRRgb *a_this, gboolean a_inherit) * Returns TRUE if the rgb is set to the value "inherit", FALSE otherwise. */ gboolean -cr_rgb_is_set_to_inherit (CRRgb *a_this) +cr_rgb_is_set_to_inherit (CRRgb const *a_this) { g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR) ; @@ -407,7 +407,7 @@ cr_rgb_is_set_to_inherit (CRRgb *a_this) *transparent, FALSE otherwise. */ gboolean -cr_rgb_is_set_to_transparent (CRRgb *a_this) +cr_rgb_is_set_to_transparent (CRRgb const *a_this) { g_return_val_if_fail (a_this, FALSE) ; return a_this->is_transparent ; @@ -441,7 +441,7 @@ cr_rgb_set_to_transparent (CRRgb *a_this, *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus -cr_rgb_set_from_rgb (CRRgb * a_this, CRRgb * a_rgb) +cr_rgb_set_from_rgb (CRRgb * a_this, CRRgb const * a_rgb) { g_return_val_if_fail (a_this && a_rgb, CR_BAD_PARAM_ERROR); @@ -602,7 +602,7 @@ cr_rgb_set_from_term (CRRgb *a_this, const struct _CRTerm *a_value) } enum CRStatus -cr_rgb_copy (CRRgb *a_dest, CRRgb*a_src) +cr_rgb_copy (CRRgb *a_dest, CRRgb const *a_src) { g_return_val_if_fail (a_dest && a_src, CR_BAD_PARAM_ERROR) ; diff --git a/src/cr-rgb.h b/src/cr-rgb.h index f6b4e8a..a127a44 100644 --- a/src/cr-rgb.h +++ b/src/cr-rgb.h @@ -63,17 +63,17 @@ enum CRStatus cr_rgb_set (CRRgb *a_this, gulong a_red, gulong a_green, gulong a_blue, gboolean a_is_percentage) ; -enum CRStatus cr_rgb_copy (CRRgb *a_dest, CRRgb*a_src) ; +enum CRStatus cr_rgb_copy (CRRgb *a_dest, CRRgb const *a_src) ; enum CRStatus cr_rgb_set_to_inherit (CRRgb *a_this, gboolean a_inherit) ; -gboolean cr_rgb_is_set_to_inherit (CRRgb *a_this) ; +gboolean cr_rgb_is_set_to_inherit (CRRgb const *a_this) ; -gboolean cr_rgb_is_set_to_transparent (CRRgb *a_this) ; +gboolean cr_rgb_is_set_to_transparent (CRRgb const *a_this) ; enum CRStatus cr_rgb_set_to_transparent (CRRgb *a_this, gboolean a_is_transparent) ; -enum CRStatus cr_rgb_set_from_rgb (CRRgb *a_this, CRRgb *a_rgb) ; +enum CRStatus cr_rgb_set_from_rgb (CRRgb *a_this, CRRgb const *a_rgb) ; enum CRStatus cr_rgb_set_from_name (CRRgb *a_this, const guchar *a_color_name) ; @@ -83,9 +83,9 @@ struct _CRTerm; enum CRStatus cr_rgb_set_from_term (CRRgb *a_this, const struct _CRTerm *a_value); -guchar * cr_rgb_to_string (CRRgb *a_this) ; +guchar * cr_rgb_to_string (CRRgb const *a_this) ; -void cr_rgb_dump (CRRgb *a_this, FILE *a_fp) ; +void cr_rgb_dump (CRRgb const *a_this, FILE *a_fp) ; void cr_rgb_destroy (CRRgb *a_this) ; diff --git a/src/cr-selector.c b/src/cr-selector.c index 6fe1267..a3603e3 100644 --- a/src/cr-selector.c +++ b/src/cr-selector.c @@ -138,7 +138,7 @@ cr_selector_append_simple_sel (CRSelector * a_this, } guchar * -cr_selector_to_string (CRSelector * a_this) +cr_selector_to_string (CRSelector const * a_this) { guchar *result = NULL; GString *str_buf = NULL; @@ -147,7 +147,7 @@ cr_selector_to_string (CRSelector * a_this) g_return_val_if_fail (str_buf, NULL); if (a_this) { - CRSelector *cur = NULL; + CRSelector const *cur = NULL; for (cur = a_this; cur; cur = cur->next) { if (cur->simple_sel) { @@ -188,7 +188,7 @@ cr_selector_to_string (CRSelector * a_this) *Serializes the current instance of #CRSelector to a file. */ void -cr_selector_dump (CRSelector * a_this, FILE * a_fp) +cr_selector_dump (CRSelector const * a_this, FILE * a_fp) { guchar *tmp_buf = NULL; diff --git a/src/cr-selector.h b/src/cr-selector.h index fd5ef7a..dd6a7f7 100644 --- a/src/cr-selector.h +++ b/src/cr-selector.h @@ -80,9 +80,9 @@ CRSelector* cr_selector_append_simple_sel (CRSelector *a_this, CRSelector* cr_selector_prepend (CRSelector *a_this, CRSelector *a_new) ; -guchar * cr_selector_to_string (CRSelector *a_this) ; +guchar * cr_selector_to_string (CRSelector const *a_this) ; -void cr_selector_dump (CRSelector *a_this, FILE *a_fp) ; +void cr_selector_dump (CRSelector const *a_this, FILE *a_fp) ; void cr_selector_ref (CRSelector *a_this) ; diff --git a/src/cr-simple-sel.c b/src/cr-simple-sel.c index e135589..e8d57af 100644 --- a/src/cr-simple-sel.c +++ b/src/cr-simple-sel.c @@ -100,12 +100,12 @@ cr_simple_sel_prepend_simple_sel (CRSimpleSel * a_this, CRSimpleSel * a_sel) } guchar * -cr_simple_sel_to_string (CRSimpleSel * a_this) +cr_simple_sel_to_string (CRSimpleSel const * a_this) { GString *str_buf = NULL; guchar *result = NULL; - CRSimpleSel *cur = NULL; + CRSimpleSel const *cur = NULL; g_return_val_if_fail (a_this, NULL); @@ -162,7 +162,7 @@ cr_simple_sel_to_string (CRSimpleSel * a_this) guchar * -cr_simple_sel_one_to_string (CRSimpleSel * a_this) +cr_simple_sel_one_to_string (CRSimpleSel const * a_this) { GString *str_buf = NULL; guchar *result = NULL; @@ -214,7 +214,7 @@ cr_simple_sel_one_to_string (CRSimpleSel * a_this) *otherwise. */ enum CRStatus -cr_simple_sel_dump (CRSimpleSel * a_this, FILE * a_fp) +cr_simple_sel_dump (CRSimpleSel const * a_this, FILE * a_fp) { guchar *tmp_str = NULL; @@ -245,8 +245,8 @@ cr_simple_sel_dump (CRSimpleSel * a_this, FILE * a_fp) enum CRStatus cr_simple_sel_compute_specificity (CRSimpleSel * a_this) { - CRAdditionalSel *cur_add_sel = NULL; - CRSimpleSel *cur_sel = NULL; + CRAdditionalSel const *cur_add_sel = NULL; + CRSimpleSel const *cur_sel = NULL; gulong a = 0, b = 0, c = 0; diff --git a/src/cr-simple-sel.h b/src/cr-simple-sel.h index 6c35ec7..d8edc00 100644 --- a/src/cr-simple-sel.h +++ b/src/cr-simple-sel.h @@ -112,13 +112,13 @@ CRSimpleSel * cr_simple_sel_append_simple_sel (CRSimpleSel *a_this, CRSimpleSel * cr_simple_sel_prepend_simple_sel (CRSimpleSel *a_this, CRSimpleSel *a_sel) ; -guchar * cr_simple_sel_to_string (CRSimpleSel *a_this) ; +guchar * cr_simple_sel_to_string (CRSimpleSel const *a_this) ; -guchar * cr_simple_sel_one_to_string (CRSimpleSel * a_this) ; +guchar * cr_simple_sel_one_to_string (CRSimpleSel const * a_this) ; -enum CRStatus cr_simple_sel_dump (CRSimpleSel *a_this, FILE *a_fp) ; +enum CRStatus cr_simple_sel_dump (CRSimpleSel const *a_this, FILE *a_fp) ; -enum CRStatus cr_simple_sel_dump_attr_sel_list (CRSimpleSel *a_this) ; +enum CRStatus cr_simple_sel_dump_attr_sel_list (CRSimpleSel const *a_this) ; enum CRStatus cr_simple_sel_compute_specificity (CRSimpleSel *a_this) ; diff --git a/src/cr-statement.c b/src/cr-statement.c index 1c1ea0d..a1b8259 100644 --- a/src/cr-statement.c +++ b/src/cr-statement.c @@ -586,7 +586,7 @@ cr_statement_clear (CRStatement * a_this) *by the caller, using g_free(). */ static gchar * -cr_statement_ruleset_to_string (CRStatement * a_this, glong a_indent) +cr_statement_ruleset_to_string (CRStatement const * a_this, glong a_indent) { GString *stringue = NULL; gchar *tmp_str = NULL, @@ -650,7 +650,7 @@ cr_statement_ruleset_to_string (CRStatement * a_this, glong a_indent) *using g_free(). */ static gchar * -cr_statement_font_face_rule_to_string (CRStatement * a_this, +cr_statement_font_face_rule_to_string (CRStatement const * a_this, glong a_indent) { gchar *result = NULL, *tmp_str = NULL ; @@ -698,7 +698,7 @@ cr_statement_font_face_rule_to_string (CRStatement * a_this, *freed by the caller using g_free(). */ static gchar * -cr_statement_charset_to_string (CRStatement *a_this, +cr_statement_charset_to_string (CRStatement const *a_this, gulong a_indent) { gchar *str = NULL ; @@ -743,7 +743,7 @@ cr_statement_charset_to_string (CRStatement *a_this, *Returns the serialized string. Must be freed by the caller */ static gchar * -cr_statement_at_page_rule_to_string (CRStatement *a_this, +cr_statement_at_page_rule_to_string (CRStatement const *a_this, gulong a_indent) { GString *stringue = NULL; @@ -795,12 +795,12 @@ cr_statement_at_page_rule_to_string (CRStatement *a_this, *by the caller using g_free(). */ static gchar * -cr_statement_media_rule_to_string (CRStatement *a_this, +cr_statement_media_rule_to_string (CRStatement const *a_this, gulong a_indent) { gchar *str = NULL ; GString *stringue = NULL ; - GList *cur = NULL; + GList const *cur = NULL; g_return_val_if_fail (a_this->type == AT_MEDIA_RULE_STMT, NULL); @@ -814,7 +814,7 @@ cr_statement_media_rule_to_string (CRStatement *a_this, cur = cur->next) { if (cur->data) { guchar *str = cr_string_dup2 - ((CRString *) cur->data); + ((CRString const *) cur->data); if (str) { if (cur->prev) { @@ -850,7 +850,7 @@ cr_statement_media_rule_to_string (CRStatement *a_this, static gchar * -cr_statement_import_rule_to_string (CRStatement *a_this, +cr_statement_import_rule_to_string (CRStatement const *a_this, gulong a_indent) { GString *stringue = NULL ; @@ -878,12 +878,12 @@ cr_statement_import_rule_to_string (CRStatement *a_this, return NULL; if (a_this->kind.import_rule->media_list) { - GList *cur = NULL; + GList const *cur = NULL; for (cur = a_this->kind.import_rule->media_list; cur; cur = cur->next) { if (cur->data) { - CRString *crstr = cur->data; + CRString const *crstr = cur->data; if (cur->prev) { g_string_append @@ -1931,9 +1931,9 @@ cr_statement_unlink (CRStatement * a_stmt) *Returns number of rules in the statement list. */ gint -cr_statement_nr_rules (CRStatement * a_this) +cr_statement_nr_rules (CRStatement const * a_this) { - CRStatement *cur = NULL; + CRStatement const *cur = NULL; int nr = 0; g_return_val_if_fail (a_this, -1); @@ -2039,7 +2039,7 @@ cr_statement_ruleset_get_declarations (CRStatement * a_this, *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus -cr_statement_ruleset_get_sel_list (CRStatement * a_this, CRSelector ** a_list) +cr_statement_ruleset_get_sel_list (CRStatement const * a_this, CRSelector ** a_list) { g_return_val_if_fail (a_this && a_this->type == RULESET_STMT && a_this->kind.ruleset, CR_BAD_PARAM_ERROR); @@ -2226,7 +2226,7 @@ cr_statement_at_import_rule_set_url (CRStatement * a_this, *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus -cr_statement_at_import_rule_get_url (CRStatement * a_this, +cr_statement_at_import_rule_get_url (CRStatement const * a_this, CRString ** a_url) { g_return_val_if_fail (a_this @@ -2247,7 +2247,7 @@ cr_statement_at_import_rule_get_url (CRStatement * a_this, *Returns the number of rules in the media rule; */ int -cr_statement_at_media_nr_rules (CRStatement * a_this) +cr_statement_at_media_nr_rules (CRStatement const * a_this) { g_return_val_if_fail (a_this && a_this->type == AT_MEDIA_RULE_STMT @@ -2373,7 +2373,7 @@ cr_statement_at_charset_rule_set_charset (CRStatement * a_this, * Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus -cr_statement_at_charset_rule_get_charset (CRStatement * a_this, +cr_statement_at_charset_rule_get_charset (CRStatement const * a_this, CRString ** a_charset) { g_return_val_if_fail (a_this @@ -2491,7 +2491,7 @@ cr_statement_at_font_face_rule_add_decl (CRStatement * a_this, *using g_free(). */ gchar * -cr_statement_to_string (CRStatement * a_this, gulong a_indent) +cr_statement_to_string (CRStatement const * a_this, gulong a_indent) { gchar *str = NULL ; @@ -2537,9 +2537,9 @@ cr_statement_to_string (CRStatement * a_this, gulong a_indent) } gchar* -cr_statement_list_to_string (CRStatement *a_this, gulong a_indent) +cr_statement_list_to_string (CRStatement const *a_this, gulong a_indent) { - CRStatement *cur_stmt = NULL ; + CRStatement const *cur_stmt = NULL ; GString *stringue = NULL ; gchar *str = NULL ; @@ -2579,7 +2579,7 @@ cr_statement_list_to_string (CRStatement *a_this, gulong a_indent) *Dumps the css2 statement to a file. */ void -cr_statement_dump (CRStatement * a_this, FILE * a_fp, gulong a_indent) +cr_statement_dump (CRStatement const * a_this, FILE * a_fp, gulong a_indent) { gchar *str = NULL ; @@ -2604,7 +2604,7 @@ cr_statement_dump (CRStatement * a_this, FILE * a_fp, gulong a_indent) *Dumps a ruleset statement to a file. */ void -cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent) +cr_statement_dump_ruleset (CRStatement const * a_this, FILE * a_fp, glong a_indent) { guchar *str = NULL; @@ -2627,7 +2627,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent) *Dumps a font face rule statement to a file. */ void -cr_statement_dump_font_face_rule (CRStatement * a_this, FILE * a_fp, +cr_statement_dump_font_face_rule (CRStatement const * a_this, FILE * a_fp, glong a_indent) { gchar *str = NULL ; @@ -2653,7 +2653,7 @@ cr_statement_dump_font_face_rule (CRStatement * a_this, FILE * a_fp, *Dumps an \@charset rule statement to a file. */ void -cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent) +cr_statement_dump_charset (CRStatement const * a_this, FILE * a_fp, gulong a_indent) { guchar *str = NULL; @@ -2679,7 +2679,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent) *Dumps an \@page rule statement on stdout. */ void -cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent) +cr_statement_dump_page (CRStatement const * a_this, FILE * a_fp, gulong a_indent) { guchar *str = NULL; @@ -2706,7 +2706,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent) *Dumps an \@media rule statement to a file. */ void -cr_statement_dump_media_rule (CRStatement * a_this, +cr_statement_dump_media_rule (CRStatement const * a_this, FILE * a_fp, gulong a_indent) { @@ -2730,7 +2730,7 @@ cr_statement_dump_media_rule (CRStatement * a_this, *Dumps an \@import rule statement to a file. */ void -cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp, +cr_statement_dump_import_rule (CRStatement const * a_this, FILE * a_fp, gulong a_indent) { gchar *str = NULL ; diff --git a/src/cr-statement.h b/src/cr-statement.h index 53abd68..74a2330 100644 --- a/src/cr-statement.h +++ b/src/cr-statement.h @@ -314,7 +314,7 @@ cr_statement_ruleset_set_sel_list (CRStatement *a_this, CRSelector *a_sel_list) ; enum CRStatus -cr_statement_ruleset_get_sel_list (CRStatement *a_this, +cr_statement_ruleset_get_sel_list (CRStatement const *a_this, CRSelector **a_list) ; enum CRStatus @@ -346,11 +346,11 @@ cr_statement_at_import_rule_set_url (CRStatement *a_this, CRString *a_url) ; enum CRStatus -cr_statement_at_import_rule_get_url (CRStatement *a_this, +cr_statement_at_import_rule_get_url (CRStatement const *a_this, CRString **a_url) ; gint -cr_statement_at_media_nr_rules (CRStatement *a_this) ; +cr_statement_at_media_nr_rules (CRStatement const *a_this) ; CRStatement * cr_statement_at_media_get_from_list (CRStatement *a_this, int itemnr) ; @@ -360,7 +360,7 @@ cr_statement_at_page_rule_set_sel (CRStatement *a_this, CRSelector *a_sel) ; enum CRStatus -cr_statement_at_page_rule_get_sel (CRStatement *a_this, +cr_statement_at_page_rule_get_sel (CRStatement const *a_this, CRSelector **a_sel) ; enum CRStatus @@ -376,7 +376,7 @@ cr_statement_at_charset_rule_set_charset (CRStatement *a_this, CRString *a_charset) ; enum CRStatus -cr_statement_at_charset_rule_get_charset (CRStatement *a_this, +cr_statement_at_charset_rule_get_charset (CRStatement const *a_this, CRString **a_charset) ; enum CRStatus @@ -393,41 +393,41 @@ cr_statement_at_font_face_rule_add_decl (CRStatement *a_this, CRTerm *a_value) ; gchar * -cr_statement_to_string (CRStatement * a_this, gulong a_indent) ; +cr_statement_to_string (CRStatement const * a_this, gulong a_indent) ; gchar* -cr_statement_list_to_string (CRStatement *a_this, gulong a_indent) ; +cr_statement_list_to_string (CRStatement const *a_this, gulong a_indent) ; void -cr_statement_dump (CRStatement *a_this, FILE *a_fp, gulong a_indent) ; +cr_statement_dump (CRStatement const *a_this, FILE *a_fp, gulong a_indent) ; void -cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, +cr_statement_dump_ruleset (CRStatement const * a_this, FILE * a_fp, glong a_indent) ; void -cr_statement_dump_font_face_rule (CRStatement * a_this, +cr_statement_dump_font_face_rule (CRStatement const * a_this, FILE * a_fp, glong a_indent) ; void -cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, +cr_statement_dump_page (CRStatement const * a_this, FILE * a_fp, gulong a_indent) ; void -cr_statement_dump_media_rule (CRStatement * a_this, +cr_statement_dump_media_rule (CRStatement const * a_this, FILE * a_fp, gulong a_indent) ; void -cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp, +cr_statement_dump_import_rule (CRStatement const * a_this, FILE * a_fp, gulong a_indent) ; void -cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, +cr_statement_dump_charset (CRStatement const * a_this, FILE * a_fp, gulong a_indent) ; gint -cr_statement_nr_rules (CRStatement *a_this) ; +cr_statement_nr_rules (CRStatement const *a_this) ; CRStatement * cr_statement_get_from_list (CRStatement *a_this, int itemnr) ; diff --git a/src/cr-string.c b/src/cr-string.c index 2529b72..633fcab 100644 --- a/src/cr-string.c +++ b/src/cr-string.c @@ -72,7 +72,7 @@ cr_string_new_from_string (const gchar * a_string) *@return the newly instanciated #CRString. */ CRString * -cr_string_new_from_gstring (GString *a_string) +cr_string_new_from_gstring (GString const *a_string) { CRString *result = NULL ; @@ -91,7 +91,7 @@ cr_string_new_from_gstring (GString *a_string) } CRString * -cr_string_dup (CRString *a_this) +cr_string_dup (CRString const *a_this) { CRString *result = NULL ; g_return_val_if_fail (a_this, NULL) ; @@ -107,7 +107,7 @@ cr_string_dup (CRString *a_this) } gchar * -cr_string_dup2 (CRString *a_this) +cr_string_dup2 (CRString const *a_this) { gchar *result = NULL ; @@ -128,7 +128,7 @@ cr_string_dup2 (CRString *a_this) *@param a_this the current instance of #CRString */ const gchar * -cr_string_peek_raw_str (CRString *a_this) +cr_string_peek_raw_str (CRString const *a_this) { g_return_val_if_fail (a_this, NULL) ; @@ -145,7 +145,7 @@ cr_string_peek_raw_str (CRString *a_this) *of -1 if no length can be returned. */ gint -cr_string_peek_raw_str_len (CRString *a_this) +cr_string_peek_raw_str_len (CRString const *a_this) { g_return_val_if_fail (a_this && a_this->stryng, -1) ; diff --git a/src/cr-string.h b/src/cr-string.h index 2564534..2700f0e 100644 --- a/src/cr-string.h +++ b/src/cr-string.h @@ -64,11 +64,11 @@ struct _CRString { CRString * cr_string_new (void) ; CRString *cr_string_new_from_string (const gchar * a_string) ; -CRString * cr_string_new_from_gstring (GString *a_string) ; -CRString *cr_string_dup (CRString *a_this) ; -gchar *cr_string_dup2 (CRString *a_this) ; -const gchar *cr_string_peek_raw_str (CRString *a_this) ; -gint cr_string_peek_raw_str_len (CRString *a_this) ; +CRString * cr_string_new_from_gstring (GString const *a_string) ; +CRString *cr_string_dup (CRString const *a_this) ; +gchar *cr_string_dup2 (CRString const *a_this) ; +const gchar *cr_string_peek_raw_str (CRString const *a_this) ; +gint cr_string_peek_raw_str_len (CRString const *a_this) ; void cr_string_destroy (CRString *a_this) ; G_END_DECLS diff --git a/src/cr-stylesheet.c b/src/cr-stylesheet.c index 3b9a1e2..69909da 100644 --- a/src/cr-stylesheet.c +++ b/src/cr-stylesheet.c @@ -57,11 +57,11 @@ cr_stylesheet_new (CRStatement * a_stmts) *@return the serialized stylesheet. */ gchar * -cr_stylesheet_to_string (CRStyleSheet *a_this) +cr_stylesheet_to_string (CRStyleSheet const *a_this) { gchar *str = NULL; GString *stringue = NULL; - CRStatement *cur_stmt = NULL; + CRStatement const *cur_stmt = NULL; g_return_val_if_fail (a_this, NULL); @@ -95,7 +95,7 @@ cr_stylesheet_to_string (CRStyleSheet *a_this) *@param a_fp the destination file */ void -cr_stylesheet_dump (CRStyleSheet * a_this, FILE * a_fp) +cr_stylesheet_dump (CRStyleSheet const * a_this, FILE * a_fp) { gchar *str = NULL ; @@ -115,7 +115,7 @@ cr_stylesheet_dump (CRStyleSheet * a_this, FILE * a_fp) *@return number of rules in the stylesheet. */ gint -cr_stylesheet_nr_rules (CRStyleSheet * a_this) +cr_stylesheet_nr_rules (CRStyleSheet const * a_this) { g_return_val_if_fail (a_this, -1); diff --git a/src/cr-stylesheet.h b/src/cr-stylesheet.h index 3766a28..f35c94e 100644 --- a/src/cr-stylesheet.h +++ b/src/cr-stylesheet.h @@ -84,10 +84,10 @@ struct _CRStyleSheet CRStyleSheet * cr_stylesheet_new (CRStatement *a_stmts) ; -gchar * cr_stylesheet_to_string (CRStyleSheet *a_this) ; -void cr_stylesheet_dump (CRStyleSheet *a_this, FILE *a_fp) ; +gchar * cr_stylesheet_to_string (CRStyleSheet const *a_this) ; +void cr_stylesheet_dump (CRStyleSheet const *a_this, FILE *a_fp) ; -gint cr_stylesheet_nr_rules (CRStyleSheet *a_this) ; +gint cr_stylesheet_nr_rules (CRStyleSheet const *a_this) ; CRStatement * cr_stylesheet_statement_get_from_list (CRStyleSheet *a_this, int itemnr) ; diff --git a/src/cr-term.c b/src/cr-term.c index 33eed40..d6db51a 100644 --- a/src/cr-term.c +++ b/src/cr-term.c @@ -276,10 +276,10 @@ cr_term_prepend_term (CRTerm * a_this, CRTerm * a_new_term) *form of #CRTerm. MUST BE FREED BY THE CALLER using g_free(). */ guchar * -cr_term_to_string (CRTerm * a_this) +cr_term_to_string (CRTerm const * a_this) { GString *str_buf = NULL; - CRTerm *cur = NULL; + CRTerm const *cur = NULL; guchar *result = NULL, *content = NULL; @@ -473,7 +473,7 @@ cr_term_to_string (CRTerm * a_this) } guchar * -cr_term_one_to_string (CRTerm * a_this) +cr_term_one_to_string (CRTerm const * a_this) { GString *str_buf = NULL; guchar *result = NULL, @@ -677,7 +677,7 @@ cr_term_one_to_string (CRTerm * a_this) *@param a_fp the destination file pointer. */ void -cr_term_dump (CRTerm * a_this, FILE * a_fp) +cr_term_dump (CRTerm const * a_this, FILE * a_fp) { guchar *content = NULL; @@ -697,9 +697,9 @@ cr_term_dump (CRTerm * a_this, FILE * a_fp) *@return number of terms in the expression. */ int -cr_term_nr_values (CRTerm *a_this) +cr_term_nr_values (CRTerm const *a_this) { - CRTerm *cur = NULL ; + CRTerm const *cur = NULL ; int nr = 0; g_return_val_if_fail (a_this, -1) ; diff --git a/src/cr-term.h b/src/cr-term.h index 41b6d78..0f22dda 100644 --- a/src/cr-term.h +++ b/src/cr-term.h @@ -169,13 +169,13 @@ CRTerm * cr_term_append_term (CRTerm *a_this, CRTerm *a_new_term) ; CRTerm * cr_term_prepend_term (CRTerm *a_this, CRTerm *a_new_term) ; -guchar * cr_term_to_string (CRTerm *a_this) ; +guchar * cr_term_to_string (CRTerm const *a_this) ; -guchar * cr_term_one_to_string (CRTerm * a_this) ; +guchar * cr_term_one_to_string (CRTerm const * a_this) ; -void cr_term_dump (CRTerm *a_this, FILE *a_fp) ; +void cr_term_dump (CRTerm const *a_this, FILE *a_fp) ; -int cr_term_nr_values (CRTerm *a_this) ; +int cr_term_nr_values (CRTerm const *a_this) ; CRTerm * cr_term_get_from_list (CRTerm *a_this, int itemnr) ; diff --git a/src/cr-utils.c b/src/cr-utils.c index 36d1d9c..ed4be3e 100644 --- a/src/cr-utils.c +++ b/src/cr-utils.c @@ -1299,10 +1299,10 @@ cr_utils_dump_n_chars2 (guchar a_char, GString * a_string, glong a_nb) *@param a_list_of_strings the list of strings to be duplicated. */ GList * -cr_utils_dup_glist_of_string (GList * a_list_of_strings) +cr_utils_dup_glist_of_string (GList const * a_list_of_strings) { - GList *cur = NULL, - *result = NULL; + GList const *cur = NULL; + GList *result = NULL; g_return_val_if_fail (a_list_of_strings, NULL); @@ -1325,16 +1325,17 @@ cr_utils_dup_glist_of_string (GList * a_list_of_strings) *happened. */ GList * -cr_utils_dup_glist_of_cr_string (GList * a_list_of_strings) +cr_utils_dup_glist_of_cr_string (GList const * a_list_of_strings) { - GList *cur = NULL, *result = NULL; + GList const *cur = NULL; + GList *result = NULL; g_return_val_if_fail (a_list_of_strings, NULL); for (cur = a_list_of_strings; cur; cur = cur->next) { CRString *str = NULL; - str = cr_string_dup ((CRString *) cur->data) ; + str = cr_string_dup ((CRString const *) cur->data) ; if (str) result = g_list_append (result, str); } diff --git a/src/cr-utils.h b/src/cr-utils.h index 5230780..54aa249 100644 --- a/src/cr-utils.h +++ b/src/cr-utils.h @@ -236,10 +236,10 @@ cr_utils_dump_n_chars2 (guchar a_char, GString *a_string, glong a_nb) ; GList * -cr_utils_dup_glist_of_string (GList *a_list) ; +cr_utils_dup_glist_of_string (GList const *a_list) ; GList * -cr_utils_dup_glist_of_cr_string (GList * a_list_of_strings) ; +cr_utils_dup_glist_of_cr_string (GList const * a_list_of_strings) ; G_END_DECLS |