free(buf);
if((buf = icmbstowcs(mbs, charset)) == NULL)
{
- if(*def == '~')
+ if((def != NULL) && (*def == L'~'))
{
flog(LOG_WARNING, "icsmbstowcs: could not convert wcs string into charset %s: %s", charset, strerror(errno));
def++;
free(buf);
if((buf = icwcstombs(wcs, charset)) == NULL)
{
- if(*def == '~')
+ if((def != NULL) && (*def == '~'))
{
flog(LOG_WARNING, "icswcstombs: could not convert mbs string from charset %s: %s", charset, strerror(errno));
def++;
void freewcspair(struct wcspair *pair, struct wcspair **list)
{
- if(list != NULL)
+ struct wcspair *cur;
+
+ for(cur = *list; cur != NULL; list = &(cur->next), cur = cur->next)
{
- if(*list == pair)
- *list = pair->next;
+ if(cur == pair)
+ {
+ *list = cur->next;
+ break;
+ }
}
free(pair->key);
free(pair->val);
free(pair);
}
+
+wchar_t *wpfind(struct wcspair *list, wchar_t *key)
+{
+ for(; list != NULL; list = list->next)
+ {
+ if(!wcscmp(list->key, key))
+ return(list->val);
+ }
+ return(NULL);
+}