X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/5ed99d3685cc8d13f8e4c63ad449a6e4d63c8eb0..refs/heads/wip:/lib-src/hexl.c

diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index f03663ef5b..9e21ddf9de 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,5 +1,5 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001-2014 Free Software Foundation, Inc.
 
 Author: Keith Gabryelski
 (according to authors.el)
@@ -20,9 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
@@ -39,16 +37,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DEFAULT_GROUPING	0x01
 #define DEFAULT_BASE		16
 
-#undef TRUE
-#undef FALSE
-#define TRUE  (1)
-#define FALSE (0)
-
-int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
+int base = DEFAULT_BASE;
+bool un_flag = false, iso_flag = false, endian = true;
 int group_by = DEFAULT_GROUPING;
 char *progname;
 
-void usage (void) NO_RETURN;
+_Noreturn void usage (void);
 
 int
 main (int argc, char **argv)
@@ -85,7 +79,7 @@ main (int argc, char **argv)
 	}
       else if (!strcmp (*argv, "-un") || !strcmp (*argv, "-de"))
 	{
-	  un_flag = TRUE;
+	  un_flag = true;
 	  --argc; argv++;
 	}
       else if (!strcmp (*argv, "-hex"))
@@ -95,7 +89,7 @@ main (int argc, char **argv)
 	}
       else if (!strcmp (*argv, "-iso"))
 	{
-	  iso_flag = TRUE;
+	  iso_flag = true;
 	  --argc; argv++;
 	}
       else if (!strcmp (*argv, "-oct"))
@@ -105,12 +99,12 @@ main (int argc, char **argv)
 	}
       else if (!strcmp (*argv, "-big-endian"))
 	{
-	  endian = 1;
+	  endian = true;
 	  --argc; argv++;
 	}
       else if (!strcmp (*argv, "-little-endian"))
 	{
-	  endian = 0;
+	  endian = false;
 	  --argc; argv++;
 	}
       else if (!strcmp (*argv, "-group-by-8-bits"))
@@ -131,7 +125,7 @@ main (int argc, char **argv)
       else if (!strcmp (*argv, "-group-by-64-bits"))
 	{
 	  group_by = 0x07;
-	  endian = 0;
+	  endian = false;
 	  --argc; argv++;
 	}
       else