From: Ondrej Oprala <ooprala@redhat.com>
Date: Fri, 8 Nov 2013 16:13:13 +0000 (+0100)
Subject: hexdump: add __attribute__ ((__noreturn__)) to bad*() functions
X-Git-Tag: v2.25-rc1~698
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1be6ed6adea4ba45c478d4ff40469ed6b62ee090;p=thirdparty%2Futil-linux.git

hexdump: add __attribute__ ((__noreturn__)) to bad*() functions

Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
---

diff --git a/text-utils/hexdump-parse.c b/text-utils/hexdump-parse.c
index 291c620f90..ed94bb8393 100644
--- a/text-utils/hexdump-parse.c
+++ b/text-utils/hexdump-parse.c
@@ -47,10 +47,26 @@
 #include "strutils.h"
 
 static void escape(char *p1);
-static void badcnt(const char *s);
-static void badsfmt(void);
-static void badfmt(const char *fmt);
-static void badconv(const char *ch);
+
+static void __attribute__ ((__noreturn__)) badcnt(const char *s)
+{
+        errx(EXIT_FAILURE, _("bad byte count for conversion character %s"), s);
+}
+
+static void __attribute__ ((__noreturn__)) badsfmt(void)
+{
+        errx(EXIT_FAILURE, _("%%s requires a precision or a byte count"));
+}
+
+static void __attribute__ ((__noreturn__)) badfmt(const char *fmt)
+{
+        errx(EXIT_FAILURE, _("bad format {%s}"), fmt);
+}
+
+static void __attribute__ ((__noreturn__)) badconv(const char *ch)
+{
+        errx(EXIT_FAILURE, _("bad conversion character %%%s"), ch);
+}
 
 #define first_letter(s,f) strchr(f, *(s))
 
@@ -474,23 +490,3 @@ static void escape(char *p1)
 		++p1; ++p2;
 	}
 }
-
-static void badcnt(const char *s)
-{
-        errx(EXIT_FAILURE, _("bad byte count for conversion character %s"), s);
-}
-
-static void badsfmt(void)
-{
-        errx(EXIT_FAILURE, _("%%s requires a precision or a byte count"));
-}
-
-static void badfmt(const char *fmt)
-{
-        errx(EXIT_FAILURE, _("bad format {%s}"), fmt);
-}
-
-static void badconv(const char *ch)
-{
-        errx(EXIT_FAILURE, _("bad conversion character %%%s"), ch);
-}