diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | src/cr-fonts.c | 33 | ||||
-rw-r--r-- | src/cr-style.c | 17 |
3 files changed, 37 insertions, 18 deletions
@@ -1,3 +1,8 @@ +2004-02-10 Dodji Seketeli <dodji@gnome.org> + + * src/cr-fonts.c: debugged serialization stuffs + * src/cr-style.c: more serialization debugging + 2004-02-08 dodji <dodji@gnome.org> * src/cr-style.c: more style structure debugging materials. diff --git a/src/cr-fonts.c b/src/cr-fonts.c index 39e5f14..9a52dde 100644 --- a/src/cr-fonts.c +++ b/src/cr-fonts.c @@ -35,14 +35,18 @@ cr_font_family_to_string_real (CRFontFamily *a_this, guchar * name = NULL ; enum CRStatus result = CR_OK ; - g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR) ; - if (!*a_string) { *a_string = g_string_new (NULL) ; g_return_val_if_fail (*a_string, CR_INSTANCIATION_FAILED_ERROR) ; } + + if (!a_this) + { + g_string_append_printf (*a_string, "NULL") ; + return CR_OK ; + } switch (a_this->type) { @@ -177,9 +181,12 @@ cr_font_family_to_string (CRFontFamily *a_this, guchar *result = NULL ; GString *stringue = NULL ; - g_return_val_if_fail (a_this, - NULL) ; - + if (!a_this) + { + result = g_strdup ("NULL") ; + g_return_val_if_fail (result, NULL) ; + return result ; + } status = cr_font_family_to_string_real (a_this, a_walk_font_family_list, &stringue) ; @@ -389,8 +396,13 @@ gchar* cr_font_size_to_string (CRFontSize *a_this) { gchar *str = NULL ; - g_return_val_if_fail (a_this, NULL) ; - + + if (!a_this) + { + str = g_strdup ("NULL") ; + g_return_val_if_fail (str, NULL) ; + return str ; + } switch (a_this->type) { case PREDEFINED_ABSOLUTE_FONT_SIZE: @@ -419,7 +431,12 @@ cr_font_size_adjust_to_string (CRFontSizeAdjust *a_this) { gchar *str = NULL ; - g_return_val_if_fail (a_this, NULL) ; + if (!a_this) + { + str = g_strdup ("NULL") ; + g_return_val_if_fail (str, NULL) ; + return str ; + } switch (a_this->type) { diff --git a/src/cr-style.c b/src/cr-style.c index dd7bc89..f10e674 100644 --- a/src/cr-style.c +++ b/src/cr-style.c @@ -2356,7 +2356,7 @@ cr_style_num_prop_val_to_string (CRNumPropVal *a_prop_val, str = g_string_new (NULL) ; cr_utils_dump_n_chars2 (' ', str, a_nb_indent) ; - g_string_append_printf (str, "NumPropVal {") ; + g_string_append_printf (str, "%s", "NumPropVal {") ; tmp_str = cr_num_to_string (&a_prop_val->sv) ; if (!tmp_str) { @@ -2375,10 +2375,8 @@ cr_style_num_prop_val_to_string (CRNumPropVal *a_prop_val, g_string_append_printf (str, "av: %s ", tmp_str) ; g_free (tmp_str) ; tmp_str = NULL ; - g_string_append_printf (str, "}") ; - g_string_append (str, str->str) ; - - g_string_append (a_str, str->str) ; + g_string_append_printf (str, "%s", "}") ; + g_string_append_printf (a_str, "%s", str->str) ; status = CR_OK ; cleanup: @@ -2439,8 +2437,7 @@ cr_style_rgb_prop_val_to_string (CRRgbPropVal *a_prop_val, tmp_str = NULL ; g_string_append_printf (str, "}") ; - g_string_append (str, str->str) ; - g_string_append (a_str, str->str) ; + g_string_append_printf (a_str, "%s", str->str) ; status = CR_OK ; cleanup: @@ -2678,7 +2675,7 @@ cr_style_to_string (CRStyle *a_this, str = *a_str ; } cr_utils_dump_n_chars2 (' ', str, a_nb_indent) ; - g_string_append_printf (str, "style {") ; + g_string_append_printf (str, "style {\n") ; /*loop over the num_props and to_string() them*/ for (i = NUM_PROP_TOP ; i < NB_NUM_PROPS ; i++) { @@ -2695,7 +2692,7 @@ cr_style_to_string (CRStyle *a_this, } else { - g_string_append_printf (str, "NULL:") ; + g_string_append_printf (str, "%s", "NULL") ; } tmp_str = NULL ; cr_style_num_prop_val_to_string (&a_this->num_props[i], str, @@ -2713,7 +2710,7 @@ cr_style_to_string (CRStyle *a_this, } else { - g_string_append_printf (str, "NULL: ") ; + g_string_append_printf (str, "%s", "NULL: ") ; } tmp_str = NULL ; cr_style_rgb_prop_val_to_string (&a_this->rgb_props[i], str, |