merged r347,r348,r349,r350,r351,r352,r355 from trunk
git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.3@600 c26eb9a1-5813-0410-bd6c-c2e55f420ca71.3
parent
8eb70d60ac
commit
0aead62974
|
@ -31,3 +31,4 @@ processor.out
|
|||
processor_real.c
|
||||
run-tests.php
|
||||
structinfo.m4
|
||||
autom4te.cache
|
||||
|
|
|
@ -198,7 +198,7 @@ else if ($action == 'file') {
|
|||
$dir_url = urlencode($dir);
|
||||
$dir_html = htmlspecialchars($dir);
|
||||
echo <<<EOS
|
||||
<a href="?">$l_root</a> <a href="?path={$dir_url}">{$dir_html}</a>/<b>{$filename}</b><br />
|
||||
<a href="?">$l_root</a> <a href="?path={$dir_url}">{$dir_html}</a>/<strong>{$filename}</strong><br />
|
||||
EOS;
|
||||
|
||||
echo file_head();
|
||||
|
|
8
utils.c
8
utils.c
|
@ -731,17 +731,17 @@ void xc_sandbox_free(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_D
|
|||
/* }}} */
|
||||
int xc_vtrace(const char *fmt, va_list args) /* {{{ */
|
||||
{
|
||||
vfprintf(stderr, fmt, args);
|
||||
return 0;
|
||||
return vfprintf(stderr, fmt, args);
|
||||
}
|
||||
/* }}} */
|
||||
int xc_trace(const char *fmt, ...) /* {{{ */
|
||||
{
|
||||
va_list args;
|
||||
int ret;
|
||||
|
||||
va_start(args, fmt);
|
||||
xc_vtrace(fmt, args);
|
||||
ret = xc_vtrace(fmt, args);
|
||||
va_end(args);
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
/* }}} */
|
||||
|
|
35
utils.h
35
utils.h
|
@ -3,19 +3,44 @@
|
|||
|
||||
#ifdef DEBUG
|
||||
# define IFDEBUG(x) (x)
|
||||
# define TRACE(fmt, ...) \
|
||||
xc_trace("%s:%d: " fmt "\r\n", __FILE__, __LINE__, __VA_ARGS__)
|
||||
int xc_vtrace(const char *fmt, va_list args);
|
||||
int xc_trace(const char *fmt, ...) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2);
|
||||
|
||||
# ifdef ZEND_WIN32
|
||||
static inline int TRACE(const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
int ret;
|
||||
|
||||
va_start(args, fmt);
|
||||
ret = xc_vtrace(fmt, args);
|
||||
va_end(args);
|
||||
return ret;
|
||||
}
|
||||
# else
|
||||
# define TRACE(fmt, ...) \
|
||||
xc_trace("%s:%d: " fmt "\r\n", __FILE__, __LINE__, __VA_ARGS__)
|
||||
# endif /* ZEND_WIN32 */
|
||||
# undef NDEBUG
|
||||
# undef inline
|
||||
# define inline
|
||||
#else
|
||||
# define TRACE(fmt, ...) do { } while (0)
|
||||
#else /* DEBUG */
|
||||
|
||||
# ifdef ZEND_WIN32
|
||||
static inline int TRACE_DUMMY(const char *fmt, ...)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
# define TRACE 1 ? 0 : TRACE_DUMMY
|
||||
# else
|
||||
# define TRACE(fmt, ...) do { } while (0)
|
||||
# endif /* ZEND_WIN32 */
|
||||
|
||||
# define IFDEBUG(x) do { } while (0)
|
||||
# ifndef NDEBUG
|
||||
# define NDEBUG
|
||||
# endif
|
||||
#endif
|
||||
#endif /* DEBUG */
|
||||
#include <assert.h>
|
||||
|
||||
typedef struct {
|
||||
|
|
Loading…
Reference in New Issue