Linux: Fix AFS_NORETURN violation with osi_AssertFailK
commit556772c9639ed2ab00a7951df01cb98bfb6b24bf
authorAnders Kaseorg <andersk@mit.edu>
Sat, 6 Nov 2010 07:03:19 +0000 (6 03:03 -0400)
committerDerrick Brashear <shadow@dementia.org>
Tue, 14 Dec 2010 04:54:46 +0000 (13 20:54 -0800)
tree3051cc660c628c343a7483932a7ed919d8b3d0c7
parentef445de0b09bb4f1c80e0541f9fff37a44b5d835
Linux: Fix AFS_NORETURN violation with osi_AssertFailK

Commit d86f0c44d3c5910a6b54895484dc0286eac9bc73 changed the
AFS_LINUX26_ENV implementation of osi_AssertFailK so that it returns,
contradicting its AFS_NORETURN prototype, in an effort to make the
following BUG() display the right line number.  To fix this, move the
returning implementation into its only caller, the osi_Assert macro.

This fixes possible compiler misoptimizations due to

rx_kcommon.c:255:1: warning: ‘noreturn’ function does return

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-on: http://gerrit.openafs.org/3276
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 1519144f83925d82117f31ce0872f77660f197ee)

Change-Id: I2b630a3264d04d6fbb626b7ef997da9bf081ade1
Reviewed-on: http://gerrit.openafs.org/3513
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
src/rx/rx_kcommon.c
src/rx/rx_prototypes.h