[prelude-cvslog] r10342 - libprelude/branches/libprelude-easy-bindings/src

[noreply at prelude-ids.org]

Author: yoann
Date: 2008-03-06 12:56:38 +0100 (Thu, 06 Mar 2008)
New Revision: 10342

Modified:
   libprelude/branches/libprelude-easy-bindings/src/prelude-string.c
Log:
Fix conflict.


Modified: libprelude/branches/libprelude-easy-bindings/src/prelude-string.c
===================================================================
--- libprelude/branches/libprelude-easy-bindings/src/prelude-string.c	2008-03-06 11:56:30 UTC (rev 10341)
+++ libprelude/branches/libprelude-easy-bindings/src/prelude-string.c	2008-03-06 11:56:38 UTC (rev 10342)
@@ -588,7 +588,6 @@
         int ret;
 
         prelude_return_val_if_fail(src, prelude_error(PRELUDE_ERROR_ASSERTION));
-        prelude_return_val_if_fail(src->size, prelude_error(PRELUDE_ERROR_ASSERTION));
 
         ret = prelude_string_new(dst);
         if ( ret < 0 )
@@ -661,7 +660,7 @@
 const char *prelude_string_get_string(const prelude_string_t *string)
 {
         prelude_return_val_if_fail(string, NULL);
-        return string->data.robuf;
+        return string->data.robuf ? string->data.robuf : "";
 }