[ekg2-commit] r4596 - trunk/ekg: trunk/ekg/recode.c trunk/ekg/stuff.c

[SVN commit]

Author: darkjames
Date: 2008-09-03 22:37:33 +0200 (Wed, 03 Sep 2008)
New Revision: 4596

Modified:
   trunk/ekg/recode.c
   trunk/ekg/stuff.c
Log:
optimize ekg_convert_string_p()


Modified: trunk/ekg/recode.c
===================================================================
--- trunk/ekg/recode.c	2008-09-03 13:54:18 UTC (rev 4595)
+++ trunk/ekg/recode.c	2008-09-03 20:37:33 UTC (rev 4596)
@@ -365,15 +365,13 @@
  */
 
 char *ekg_convert_string_p(const char *ps, void *ptr) {
-	string_t recod, s = string_init(ps);
-	char *r = NULL;
+	string_t s = string_init(ps);
+	string_t recod;
 
-	if ((recod = ekg_convert_string_t_p(s, ptr))) {
-		r = xstrndup(recod->str, recod->len);
-		string_free(recod, 1);
-	}
+	if ((recod = ekg_convert_string_t_p(s, ptr)))
+		return string_free(recod, 0);
 
-	return r;
+	return NULL;
 }
 
 /**

Modified: trunk/ekg/stuff.c
===================================================================
--- trunk/ekg/stuff.c	2008-09-03 13:54:18 UTC (rev 4595)
+++ trunk/ekg/stuff.c	2008-09-03 20:37:33 UTC (rev 4596)
@@ -3077,15 +3077,13 @@
  */
 
 char *ekg_convert_string_p(const char *ps, void *ptr) {
-	string_t recod, s = string_init(ps);
-	char *r = NULL;
+	string_t s = string_init(ps);
+	string_t recod;
 
-	if ((recod = ekg_convert_string_t_p(s, ptr))) {
-		r = xstrndup(recod->str, recod->len);
-		string_free(recod, 1);
-	}
+	if ((recod = ekg_convert_string_t_p(s, ptr)))
+		return string_free(recod, 0);
 
-	return r;
+	return NULL;
 }
 
 /**