Date: Thu, 18 May 2006 16:58:22 +0200 From: Jeremie Le Hen <jeremie@le-hen.org> To: freebsd-current@FreeBSD.org Subject: Get pf compile with RESTARTABLE_PANICS Message-ID: <20060518145822.GK39460@obiwan.tataz.chchile.org>
next in thread | raw e-mail | index | archive | help
--3siQDZowHQqNOShm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi,
the following error occurs when RESTARTABLE_PANICS is defined in the
kernel config file (panic() no longer has the __noreturn__ attribute) :
% /usr/src/sys/contrib/pf/net/pf.c: In function `pf_find_state_recurse':
% /usr/src/sys/contrib/pf/net/pf.c:668: warning: control reaches end of non-void function
The attached patch makes pf compile correctly.
Regards,
--
Jeremie Le Hen
< jeremie at le-hen dot org >< ttz at chchile dot org >
--3siQDZowHQqNOShm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="pf_RESTARTABLE_PANICS.patch"
Index: sys/contrib/pf/net/pf.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/pf/net/pf.c,v
retrieving revision 1.40
diff -u -p -r1.40 pf.c
--- sys/contrib/pf/net/pf.c 25 Dec 2005 23:52:00 -0000 1.40
+++ sys/contrib/pf/net/pf.c 18 May 2006 14:54:03 -0000
@@ -664,6 +664,7 @@ pf_find_state_recurse(struct pfi_kif *ki
return (NULL);
default:
panic("pf_find_state_recurse");
+ return (NULL);
}
}
@@ -702,6 +703,7 @@ pf_find_state_all(struct pf_state *key,
return (ss);
default:
panic("pf_find_state_all");
+ return (NULL);
}
}
--3siQDZowHQqNOShm--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060518145822.GK39460>