From: Matthieu Moy Date: Sat, 26 Sep 2009 20:04:49 GMT Subject: Re: [PATCH] git branch -D: give a better error message when lockfile creation fails Message-ID: In-Reply-To: <20090926195812.GH14660@spearce.org> "Shawn O. Pearce" writes: > Miklos Vajna wrote: >> On Fri, Sep 25, 2009 at 11:31:43PM -0400, Jeff King wrote: >> > afterwards). So probably you would need to first refactor >> > unable_to_lock_index_die() to handle just printing the error without >> > dying. >> >> I removed the NORETURN macro as otherwise gcc would issue a warning, as >> it does not realise that unable_to_lock_index_die() never returns. > > Please don't. If you refactor the error message formatting into > a static function called from the two extern ones, you can still > centralize the formatting but also keep NORETURN on the method that > doesn't return. The annotation is useful and should not be removed. I guess the lint-trap would be to add a die("unable_to_lock_index() should have died already"); at the end of unable_to_lock_index_die(). -- Matthieu Moy http://www-verimag.imag.fr/~moy/