X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=d443619ac5bc9e6deb39860099dc788d53ab5e6d;hp=60189ff76eb6e983c0958af83916a4bd1fe57469;hb=729b96a6bd9342c45e6f65a113fd87c70da85b0a;hpb=f15c854d8500105766b2f5666bb62b983ff24f88

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 60189ff7..d443619a 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -28,6 +28,7 @@
 #include "assertion.h"
 #include "hmapx.h"
 #include "hash-functions.h"
+#include "pool.h"
 
 #include "i18n.h"
 
@@ -85,13 +86,21 @@ create_iconv (const char* tocode, const char* fromcode)
   return converter->conv;
 }
 
+char *
+recode_string (const char *to, const char *from,
+	       const char *text, int length)
+{
+  return recode_string_pool (to, from, text, length, NULL);
+}
+
+
 /* Return a string based on TEXT converted according to HOW.
    If length is not -1, then it must be the number of bytes in TEXT.
    The returned string must be freed when no longer required.
 */
 char *
-recode_string (const char *to, const char *from,
-	       const char *text, int length)
+recode_string_pool (const char *to, const char *from,
+	       const char *text, int length, struct pool *pool)
 {
   char *outbuf = 0;
   size_t outbufferlength;
@@ -121,7 +130,7 @@ recode_string (const char *to, const char *from,
     if ( outbufferlength > length)
       break;
 
-  outbuf = xmalloc(outbufferlength);
+  outbuf = pool_malloc (pool, outbufferlength);
   op = outbuf;
 
   outbytes = outbufferlength;
@@ -158,7 +167,7 @@ recode_string (const char *to, const char *from,
 	  case E2BIG:
 	    free (outbuf);
 	    outbufferlength <<= 1;
-	    outbuf = xmalloc (outbufferlength);
+	    outbuf = pool_malloc (pool, outbufferlength);
 	    op = outbuf;
 	    outbytes = outbufferlength;
 	    inbytes = length;
@@ -176,7 +185,7 @@ recode_string (const char *to, const char *from,
   if (outbytes == 0 )
     {
       char *const oldaddr = outbuf;
-      outbuf = xrealloc (outbuf, outbufferlength + 1);
+      outbuf = pool_realloc (pool, outbuf, outbufferlength + 1);
 
       op += (outbuf - oldaddr) ;
     }