From 1b4bee7a82f774cc01699817e5efcebc095540e2 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Fri, 10 Feb 2006 01:25:48 +0100 Subject: [PATCH 1/3] DOM: Change struct dom_string length member from size_t to unsigned int Requested-by: Miciah --- src/dom/string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dom/string.h b/src/dom/string.h index 4e04e9d86..830d7701b 100644 --- a/src/dom/string.h +++ b/src/dom/string.h @@ -10,7 +10,7 @@ * and it needs to be possible to adapt the string library to that. --jonas */ struct dom_string { - size_t length; + unsigned int length; unsigned char *string; }; From 5860a44b7d76a43ae0aea10bdae3b1decd19fbee Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Fri, 10 Feb 2006 21:27:25 +0100 Subject: [PATCH 2/3] Fix compilation under gcc 4.x. Backported from gentoo portage. --- src/main/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/event.c b/src/main/event.c index 41cd037db..5b8bab760 100644 --- a/src/main/event.c +++ b/src/main/event.c @@ -149,7 +149,7 @@ get_event_name(int id) return events[id].name; } -static inline void +static void trigger_event_va(int id, va_list ap_init) { int i; From baf7b0e91da55376968e99f42bf62f7091a2a4b4 Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Fri, 10 Feb 2006 21:28:50 +0100 Subject: [PATCH 3/3] Fix segfaults caused by ruby scripting (gentoo bug #121247). Backported from gentoo portage tree. --- src/scripting/ruby/hooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripting/ruby/hooks.c b/src/scripting/ruby/hooks.c index b4eb32eb0..9ac13d083 100644 --- a/src/scripting/ruby/hooks.c +++ b/src/scripting/ruby/hooks.c @@ -160,7 +160,7 @@ script_hook_pre_format_html(va_list ap, void *data) args[0] = rb_str_new2(url); /* FIXME: Use html_len */ - args[1] = rb_str_new(fragment->data, fragment->length); + args[1] = rb_str_new2(fragment->data); result = erb_protected_method_call("pre_format_html_hook", 2, args, &error); if (error) {