Changeset 466

Show
Ignore:
Timestamp:
05/14/04 17:58:57 (4 years ago)
Author:
morris
Message:

merge fix from current

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • wired/branches/unlabeled-1.5.2/wired/hotline.c

    r464 r466  
    1 /* $Id: hotline.c,v 1.5.2.1 2004/05/13 21:23:55 morris Exp $ */ 
     1/* $Id: hotline.c,v 1.5.2.2 2004/05/14 15:58:57 morris Exp $ */ 
    22 
    33/* 
    …… 
    114114         
    115115        if(hl_conv_from == (iconv_t) -1 || hl_conv_to == (iconv_t) -1) { 
    116                 wd_log(LOG_ERR, "Could not open libiconv for MacRoman to UTF-8 conversion: %s", 
     116                wd_log(LOG_WARNING, "Could not open libiconv for MacRoman to UTF-8 conversion: %s", 
    117117                        strerror(errno)); 
    118118        } 
    …… 
    17471747        size_t                                  outbytes; 
    17481748         
     1749        /* exit if invalid iconv */ 
     1750        if(direction == (iconv_t) -1) 
     1751                return; 
     1752         
    17491753        /* get sizes */ 
    17501754        outbytes = sizeof(outbuffer);