From 2d08b0b8230cef9aadcc5adc452de0e2cfcbf006 Mon Sep 17 00:00:00 2001 From: Thomas Porzelt Date: Sat, 9 Aug 2008 01:55:07 +0200 Subject: [PATCH] small changes --- src/lighttpd.c | 2 +- src/log.c | 1 + wscript | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lighttpd.c b/src/lighttpd.c index 2014a4f..e59b77d 100644 --- a/src/lighttpd.c +++ b/src/lighttpd.c @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) { s = d / 1000000; millis = (d - s) / 1000; micros = (d - s - millis) %1000; - g_print("parsed config file in %zd seconds, %zd milliseconds, %zd microseconds\n", s, millis, micros); + g_print("parsed config file in %lu seconds, %lu milliseconds, %lu microseconds\n", s, millis, micros); g_print("option_stack: %u action_list_stack: %u (should be 0:1)\n", g_queue_get_length(ctx->option_stack), g_queue_get_length(ctx->action_list_stack)); config_parser_finish(srv, ctx_stack); diff --git a/src/log.c b/src/log.c index b309a28..aa8b972 100644 --- a/src/log.c +++ b/src/log.c @@ -227,6 +227,7 @@ log_t *log_new(server *srv, log_type_t type, GString *path) { case LOG_TYPE_PIPE: case LOG_TYPE_SYSLOG: /* TODO */ + fd = -1; assert(NULL); } diff --git a/wscript b/wscript index 5b9d18a..8373756 100644 --- a/wscript +++ b/wscript @@ -219,7 +219,7 @@ def configure(conf): conf.define("LIBRARY_DIR", opts.libdir) common_ccflags = [ - '-std=gnu99', '-Wall', '-g', '-Wshadow', '-W', '-pedantic', + '-std=gnu99', '-Wall', '-g', '-Wshadow', '-W', '-pedantic', '-pg', ] lighty_common_ccflags = [ '-fPIC', @@ -230,7 +230,7 @@ def configure(conf): conf.env['CCFLAGS_lighty'] += lighty_common_ccflags + [ '-DLI_DECLARE_EXPORTS' ] conf.env['CCFLAGS_lightymod'] += lighty_common_ccflags conf.env['plugin_PREFIX'] = '' - conf.env['LINKFLAGS_lighty'] += [ '-export-dynamic' ] + conf.env['LINKFLAGS_lighty'] += [ '-export-dynamic', '-pg' ] conf.env['LINKFLAGS_lightymod'] += [ '-module', '-export-dynamic', '-avoid-version', '-W,l-no-undefined' ] conf.env['LINKFLAGS_thread'] += [ '-pthread' ]