diff options
author | Abhishek Sharma <sharma.abhishek.it@gmail.com> | 2011-11-06 00:28:22 +0530 |
---|---|---|
committer | Abhishek Sharma <sharma.abhishek.it@gmail.com> | 2011-11-06 00:28:22 +0530 |
commit | 511a09dfcc59cbec7f5f2e50d17eb833d2fd6628 (patch) | |
tree | a3b8e46c917fc4562f1da479158bfecb9239cb72 /src/cr-string.c | |
parent | 50584f3b30393a9c3bbf0a183c663b459d6fa6c6 (diff) | |
download | libcroco-511a09dfcc59cbec7f5f2e50d17eb833d2fd6628.tar.gz |
Revert "Sending recent tested changes from inkscape developers to libcroco upstream"
This reverts commit ac3e66fa2bb416507b5b5cf114c1edaa3455f105.
Diffstat (limited to 'src/cr-string.c')
-rw-r--r-- | src/cr-string.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/cr-string.c b/src/cr-string.c index 7c656f5..633fcab 100644 --- a/src/cr-string.c +++ b/src/cr-string.c @@ -32,7 +32,9 @@ CRString * cr_string_new (void) { - CRString *result = (CRString *)g_try_malloc (sizeof (CRString)) ; + CRString *result = NULL ; + + result = g_try_malloc (sizeof (CRString)) ; if (!result) { cr_utils_trace_info ("Out of memory") ; return NULL ; @@ -51,7 +53,9 @@ cr_string_new (void) CRString * cr_string_new_from_string (const gchar * a_string) { - CRString *result = cr_string_new () ; + CRString *result = NULL ; + + result = cr_string_new () ; if (!result) { cr_utils_trace_info ("Out of memory") ; return NULL ; @@ -68,9 +72,11 @@ 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 = cr_string_new () ; + CRString *result = NULL ; + + result = cr_string_new () ; if (!result) { cr_utils_trace_info ("Out of memory") ; return NULL ; @@ -85,11 +91,12 @@ 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) ; - CRString *result = cr_string_new_from_gstring (a_this->stryng) ; + result = cr_string_new_from_gstring (a_this->stryng) ; if (!result) { cr_utils_trace_info ("Out of memory") ; return NULL ; @@ -100,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 ; @@ -121,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) ; @@ -138,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) ; |