From owner-freebsd-current@FreeBSD.ORG  Thu May 18 14:58:40 2006
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@FreeBSD.org
Delivered-To: freebsd-current@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B8E2916A400
	for <freebsd-current@FreeBSD.org>; Thu, 18 May 2006 14:58:40 +0000 (UTC)
	(envelope-from tataz@tataz.chchile.org)
Received: from smtp3-g19.free.fr (smtp3-g19.free.fr [212.27.42.29])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2AA9F43D48
	for <freebsd-current@FreeBSD.org>; Thu, 18 May 2006 14:58:37 +0000 (GMT)
	(envelope-from tataz@tataz.chchile.org)
Received: from tatooine.tataz.chchile.org (tataz.chchile.org [82.233.239.98])
	by smtp3-g19.free.fr (Postfix) with ESMTP id 37858491E6
	for <freebsd-current@FreeBSD.org>;
	Thu, 18 May 2006 16:58:37 +0200 (CEST)
Received: from obiwan.tataz.chchile.org (unknown [192.168.1.25])
	by tatooine.tataz.chchile.org (Postfix) with ESMTP id C15899D4AA
	for <freebsd-current@FreeBSD.org>; Thu, 18 May 2006 14:58:22 +0000 (UTC)
Received: by obiwan.tataz.chchile.org (Postfix, from userid 1000)
	id AD4A7405B; Thu, 18 May 2006 16:58:22 +0200 (CEST)
Date: Thu, 18 May 2006 16:58:22 +0200
From: Jeremie Le Hen <jeremie@le-hen.org>
To: freebsd-current@FreeBSD.org
Message-ID: <20060518145822.GK39460@obiwan.tataz.chchile.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="3siQDZowHQqNOShm"
Content-Disposition: inline
User-Agent: Mutt/1.5.11
Cc: 
Subject: Get pf compile with RESTARTABLE_PANICS
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 May 2006 14:58:40 -0000


--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--