Changeset 1587

Show
Ignore:
Timestamp:
06/20/08 18:21:52 (3 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r1586 r1587  
    112008-06-20  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * cherokee/macros.h (PRINT_ERRNO): Fix: It was not printing the 
     4        right 'file' and 'line number' values. 
    25 
    36        * qa/run-tests.py: Tries to raise the initial file descriptor 
    …… 
    1821 
    1922        * cherokee/buffer.c (cherokee_buffer_decode_base64): Fixes an 
    20         issue on systems where "char" != "signed char". Patch by MΓΌller 
     23        issue on systems where "char" != "signed char". Patch by Muller 
    2124        Tiziano <t...@dev-zero.ch>. 
    2225 

  • cherokee/trunk/cherokee/macros.h

    r1562 r1587  
    283283# define PRINT_MSG(fmt,arg...)       fprintf(stderr, fmt, ##arg) 
    284284# define PRINT_ERROR(fmt,arg...)     fprintf(stderr, "%s:%d: "fmt, __FILE__, __LINE__, ##arg) 
    285 # define PRINT_ERRNO(err,fmt,arg...) cherokee_print_errno(err, fmt"\n", ##arg) 
     285# define PRINT_ERRNO(err,fmt,arg...) cherokee_print_errno(err, "%s:%d: "fmt"\n", __FILE__, __LINE__, ##arg) 
    286286#else 
    287287# define PRINT_MSG(fmt,...)          fprintf(stderr, fmt, __VA_ARGS__) 
    288288# define PRINT_ERROR(fmt,...)        fprintf(stderr, "%s:%d: "fmt, __FILE__, __LINE__, __VA_ARGS__) 
    289 # define PRINT_ERRNO(err,fmt,...)    cherokee_print_errno(err, fmt"\n", __VA_ARGS__) 
     289# define PRINT_ERRNO(err,fmt,...)    cherokee_print_errno(err, "%s:%d: "fmt"\n", __FILE__, __LINE__, __VA_ARGS__) 
    290290#endif 
    291291 

  • cherokee/trunk/cherokee/util.c

    r1584 r1587  
    12451245        if (errstr == NULL) 
    12461246                errstr = "unknwon error (?)"; 
     1247 
    12471248        cherokee_buffer_ensure_size (&buffer, 128); 
    12481249        va_start (ap, format); 
    …… 
    12511252 
    12521253        cherokee_buffer_replace_string (&buffer, "${errno}", 8, errstr, strlen(errstr)); 
    1253         PRINT_ERROR_S (buffer.buf); 
     1254        PRINT_MSG_S (buffer.buf); 
    12541255 
    12551256        cherokee_buffer_mrproper (&buffer);