From d06634c3252e5478592c39375544dca1db1ce879 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 12 Dec 2008 10:24:38 -0800 Subject: [PATCH 1/2] Resolve shadow conflict with 'link' local --- lib/libspl/list.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libspl/list.c b/lib/libspl/list.c index e8db13a5cf..bb84b4b087 100644 --- a/lib/libspl/list.c +++ b/lib/libspl/list.c @@ -226,16 +226,16 @@ list_link_replace(list_node_t *lold, list_node_t *lnew) } void -list_link_init(list_node_t *link) +list_link_init(list_node_t *ln) { - link->list_next = NULL; - link->list_prev = NULL; + ln->list_next = NULL; + ln->list_prev = NULL; } int -list_link_active(list_node_t *link) +list_link_active(list_node_t *ln) { - return (link->list_next != NULL); + return (ln->list_next != NULL); } int From f429331a49e7862cebcf5a1eb242abf8cc715342 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 12 Dec 2008 10:27:10 -0800 Subject: [PATCH 2/2] Remove redundant build options --- config/Rules.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/config/Rules.am b/config/Rules.am index 37ec127e4c..ecf6c97871 100644 --- a/config/Rules.am +++ b/config/Rules.am @@ -1,9 +1,6 @@ -# Default build options -AM_CFLAGS = -ggdb -O2 -std=c99 -AM_CFLAGS += -Wall -Wstrict-prototypes -Wshadow -Werror - # FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: consider removing this as soon as we reasonably can. +AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror AM_CFLAGS += -Wno-switch -Wno-unused -Wno-missing-braces AM_CFLAGS += -Wno-unknown-pragmas -Wno-parentheses AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing