diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-11-08 22:51:43 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-11-08 22:51:43 +0000 |
| commit | 16617cc3f8e4692b2f76e99347a82eb7572bdefa (patch) | |
| tree | 9c97fa99dc5eb5a0255ea03721f413d55d4bfcf4 /src/libcroco/cr-string.c | |
| parent | working on roughen (diff) | |
| parent | merge of branch lp:~inkscape.dev/inkscape/spraytool-no-overlap (diff) | |
| download | inkscape-16617cc3f8e4692b2f76e99347a82eb7572bdefa.tar.gz inkscape-16617cc3f8e4692b2f76e99347a82eb7572bdefa.zip | |
update to trunk
(bzr r14422.3.3)
Diffstat (limited to 'src/libcroco/cr-string.c')
| -rw-r--r-- | src/libcroco/cr-string.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/libcroco/cr-string.c b/src/libcroco/cr-string.c index 47d557d5b..86ad3432c 100644 --- a/src/libcroco/cr-string.c +++ b/src/libcroco/cr-string.c @@ -32,7 +32,9 @@ CRString * cr_string_new (void) { - CRString *result = (CRString *)g_try_malloc (sizeof (CRString)) ; + CRString *result = NULL ; + + result = (CRString *) 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 ; @@ -70,7 +74,9 @@ cr_string_new_from_string (const gchar * a_string) CRString * 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 ; @@ -87,9 +93,10 @@ cr_string_new_from_gstring (GString const *a_string) CRString * 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 ; |