/* PSPP - a program for statistical analysis.
- Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#endif
struct converter
- {
- const char *tocode;
- const char *fromcode;
+ {
+ char *tocode;
+ char *fromcode;
iconv_t conv;
};
const int err = errno;
fprintf (stderr,
"Warning: "
- "cannot create a converter for \"%s\" to \"%s\": %s\n",
+ "cannot create a converter for `%s' to `%s': %s\n",
fromcode, tocode, strerror (err));
}
return converter->conv;
}
+
+/* Similar to recode_string_pool, but allocates the returned value on the heap
+ instead of in a pool. It is the caller's responsibility to free the
+ returned value. */
char *
recode_string (const char *to, const char *from,
const char *text, int length)
}
-/* Return a string based on TEXT which must be encoded using FROM.
- The returned string will be encoded in TO.
- 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.
-*/
+/* Converts the string TEXT, which should be encoded in FROM-encoding, to a
+ dynamically allocated string in TO-encoding. Any characters which cannot be
+ converted will be represented by '?'.
+
+ LENGTH should be the length of the string or -1, if null terminated.
+
+ The returned string will be allocated on POOL.
+
+ This function's behaviour differs from that of g_convert_with_fallback
+ provided by GLib. The GLib function will fail (returns NULL) if any part of
+ the input string is not valid in the declared input encoding. This function
+ however perseveres even in the presence of badly encoded input. */
char *
recode_string_pool (const char *to, const char *from,
- const char *text, int length, struct pool *pool)
+ const char *text, int length, struct pool *pool)
{
char *outbuf = 0;
size_t outbufferlength;
}
/* Fall through */
case E2BIG:
- free (outbuf);
+ pool_free (pool, outbuf);
outbufferlength <<= 1;
outbuf = pool_malloc (pool, outbufferlength);
op = outbuf;
break;
default:
/* should never happen */
- fprintf (stderr, "Character conversion error: %s\n", strerror (the_error));
+ fprintf (stderr, "Character conversion error: %s\n",
+ strerror (the_error));
NOT_REACHED ();
break;
}
{
struct hmapx_node *node;
struct converter *cvtr;
+
HMAPX_FOR_EACH (cvtr, node, &map)
{
+ free (cvtr->tocode);
+ free (cvtr->fromcode);
iconv_close (cvtr->conv);
free (cvtr);
}