Changeset 600 for branches/1.3/utils.c

Show
Ignore:
Timestamp:
07/05/2009 07:36:11 AM (4 years ago)
Author:
moo
Message:

merged r347,r348,r349,r350,r351,r352,r355 from trunk

Location:
branches/1.3
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.3

    • Property svn:ignore

      •  

        old new  
        3232run-tests.php 
        3333structinfo.m4 
         34autom4te.cache 
        3435tags 
        3536 
    • Property svn:mergeinfo changed
      /trunkmerged: 347-352,​355

  • branches/1.3/utils.c

    r593 r600  
    732732int xc_vtrace(const char *fmt, va_list args) /* {{{ */ 
    733733{ 
    734     vfprintf(stderr, fmt, args); 
    735     return 0; 
     734    return vfprintf(stderr, fmt, args); 
    736735} 
    737736/* }}} */ 
    … …  
    739738{ 
    740739    va_list args; 
     740    int ret; 
    741741 
    742742    va_start(args, fmt); 
    743     xc_vtrace(fmt, args); 
     743    ret = xc_vtrace(fmt, args); 
    744744    va_end(args); 
    745     return 0; 
    746 } 
    747 /* }}} */ 
     745    return ret; 
     746} 
     747/* }}} */