Merge branch 'release'

[notmuch] / util / error_util.h

diff --git a/util/error_util.h b/util/error_util.h
index bb158220a3d8d4c8cc09e1f7e9af731135f1f160..4bb338a2abeacd1253c1287c39f8d6769e1c5405 100644 (file)
--- a/util/error_util.h
+++ b/util/error_util.h
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .

  *
  * Author: Carl Worth <cworth@cworth.org>
  */
  *
  * Author: Carl Worth <cworth@cworth.org>
  */


@@ -23,14 +23,16 @@
 
 #include <talloc.h>
 
 
 #include <talloc.h>
 

+#include "function-attributes.h"
+

 /* There's no point in continuing when we've detected that we've done
  * something wrong internally (as opposed to the user passing in a
  * bogus value).
  *
  * Note that PRINTF_ATTRIBUTE comes from talloc.h
  */
 /* There's no point in continuing when we've detected that we've done
  * something wrong internally (as opposed to the user passing in a
  * bogus value).
  *
  * Note that PRINTF_ATTRIBUTE comes from talloc.h
  */

-int
-_internal_error (const char *format, ...) PRINTF_ATTRIBUTE (1, 2);
+void
+_internal_error (const char *format, ...) PRINTF_ATTRIBUTE (1, 2) NORETURN_ATTRIBUTE;

 
 /* There's no point in continuing when we've detected that we've done
  * something wrong internally (as opposed to the user passing in a
 
 /* There's no point in continuing when we've detected that we've done
  * something wrong internally (as opposed to the user passing in a