Merge pull request #25 from mcayland/fix/c99-stdbool

Update from using internal bool implementation to stdbool

Author: reinauer

detok/addfcodes.c

@@ -171,7 +171,7 @@ static void skip_whitespace(char **string_line_ptr)
 
 static bool get_next_vfc_line(void)
 {
-	bool retval = FALSE;	/*  TRUE = not at end yet  */
+	bool retval = false;	/*  TRUE = not at end yet  */
 	while (vfc_remainder < vfc_buf_end) {
 		current_vfc_line = (char *)vfc_remainder;
 		vfc_remainder = (u8 *)strchr((const char *)current_vfc_line, '\n');
@@ -185,7 +185,7 @@ static bool get_next_vfc_line(void)
 			continue;	/*  Comment  */
 		if (*current_vfc_line == '\\')
 			continue;	/*  Comment  */
-		retval = TRUE;
+		retval = true;
 		break;		/*  Found something  */
 	}
 	return (retval);
@@ -212,7 +212,7 @@ static bool get_next_vfc_line(void)
  *             "Splash" message...
  *
  **************************************************************************** */
-static bool did_not_splash = TRUE;
+static bool did_not_splash = true;
 static void vfc_splash(char *vf_file_name)
 {
 	if (did_not_splash) {
@@ -224,7 +224,7 @@ static void vfc_splash(char *vf_file_name)
 			vf_file_name);
 		printremark(strbfr);
 		free(strbfr);
-		did_not_splash = FALSE;
+		did_not_splash = false;
 	}
 }
 
@@ -286,9 +286,9 @@ static void vfc_splash(char *vf_file_name)
 
 bool add_fcodes_from_list(char *vf_file_name)
 {
-	bool retval = FALSE;
+	bool retval = false;
 	int added_fc_count = 0;
-	check_tok_seq = FALSE;
+	check_tok_seq = false;
 
 	if (verbose)
 		vfc_splash(vf_file_name);
@@ -369,12 +369,12 @@ bool add_fcodes_from_list(char *vf_file_name)
 
 		/*    Check if the name is on the "Special Functions List"  */
 		{
-			bool found_spf = FALSE;
+			bool found_spf = false;
 			int indx;
 			for (indx = 0; indx < spcl_func_count; indx++) {
 				if ( strcmp( vs_fc_name, spcl_func_list[indx].name) == 0 ) {
 					char strbuf[64];
-					found_spf = TRUE;
+					found_spf = true;
 					spcl_func_list[indx].fcode = vs_fc_number;
 					link_token( &spcl_func_list[indx]);
 					added_fc_count++;
@@ -393,7 +393,7 @@ bool add_fcodes_from_list(char *vf_file_name)
 		fc_name_cpy = strdup(vs_fc_name);
 		add_token((u16) vs_fc_number, fc_name_cpy);
 		added_fc_count++;
-		retval = TRUE;
+		retval = true;
 	}
 
 	if (verbose) {
@@ -404,6 +404,6 @@ bool add_fcodes_from_list(char *vf_file_name)
 	}
 
 	close_stream();
-	check_tok_seq = TRUE;
+	check_tok_seq = true;
 	return (retval);
 }

detok/decode.c

@@ -54,11 +54,11 @@ static int indent;		/*  Current level of indentation   */
  *
  **************************************************************************** */
 
-static bool ended_okay = TRUE;	/*  FALSE if finished prematurely  */
+static bool ended_okay = true;	/*  FALSE if finished prematurely  */
 
-bool offs16 = TRUE;
+bool offs16 = true;
 unsigned int linenum;
-bool end_found = FALSE;
+bool end_found = false;
 unsigned int token_streampos;	/*  Streampos() of currently-gotten token  */
 u16 last_defined_token = 0;
 
@@ -86,7 +86,7 @@ static void pretty_print_string(void)
 	u8 len;
 	u8 *strptr;
 	int indx;
-	bool in_parens = FALSE;	/*  Are we already inside parentheses?  */
+	bool in_parens = false;	/*  Are we already inside parentheses?  */
 
 	strptr = get_string(&len);
 
@@ -104,7 +104,7 @@ static void pretty_print_string(void)
 		if (isprint(c)) {
 			if (in_parens) {
 				printf(" )");
-				in_parens = FALSE;
+				in_parens = false;
 			}
 			printf("%c", c);
 			/*  Quote-mark must escape itself  */
@@ -113,7 +113,7 @@ static void pretty_print_string(void)
 		} else {
 			if (!in_parens) {
 				printf("\"(");
-				in_parens = TRUE;
+				in_parens = true;
 			}
 			printf(" %02x", c);
 		}
@@ -308,7 +308,7 @@ static s16 decode_offset(void)
 	 *      theoretically possible, so we'll treat it as valid.
 	 *  An offset of zero is also, of course, invalid.
 	 */
-	invalid_dest = BOOLVAL((dest <= 0)
+	invalid_dest = ((dest <= 0)
 			       || (dest > stream_max)
 			       || (offs == 0));
 
@@ -399,7 +399,7 @@ static void double_length_literal(void)
 static void offset16(void)
 {
 	decode_default();
-	offs16 = TRUE;
+	offs16 = true;
 }
 
 static void decode_branch(void)
@@ -482,7 +482,7 @@ static void decode_start(void)
 
 static void decode_token(u16 token)
 {
-	bool handy_flag = TRUE;
+	bool handy_flag = true;
 	switch (token) {
 	case 0x0b5:
 		new_token();
@@ -533,7 +533,7 @@ static void decode_token(u16 token)
 		decode_two();
 		break;
 	case 0x0fd:		/* version1 */
-		handy_flag = FALSE;
+		handy_flag = false;
 	case 0x0f0:		/* start0 */
 	case 0x0f1:		/* start1 */
 	case 0x0f2:		/* start2 */
@@ -545,7 +545,7 @@ static void decode_token(u16 token)
 		break;
 	case 0:		/* end0  */
 	case 0xff:		/* end1  */
-		end_found = TRUE;
+		end_found = true;
 		decode_default();
 		break;
 
@@ -611,15 +611,15 @@ static void decode_fcode_header(void)
 {
 	long err_pos;
 	u16 token;
-	bool new_offs16 = TRUE;
+	bool new_offs16 = true;
 
 	err_pos = get_streampos();
 	indent = 0;
 	token = next_token();
 
 	switch (token) {
 	case 0x0fd:		/* version1 */
-		new_offs16 = FALSE;
+		new_offs16 = false;
 	case 0x0f0:		/* start0 */
 	case 0x0f1:		/* start1 */
 	case 0x0f2:		/* start2 */
@@ -685,7 +685,7 @@ static void decode_fcode_block(void)
 	unsigned int fc_block_start;
 	unsigned int fc_block_end;
 
-	end_found = FALSE;
+	end_found = false;
 	fc_block_start = get_streampos();
 
 	decode_fcode_header();
@@ -714,7 +714,7 @@ static void decode_fcode_block(void)
 				"Detokenization finished prematurely after %d of %d bytes.",
 				get_streampos() - fc_block_start,
 				fc_block_end - fc_block_start);
-			ended_okay = FALSE;
+			ended_okay = false;
 		}
 		printremark(temp_bufr);
 	}
@@ -750,7 +750,7 @@ static void decode_fcode_block(void)
 
 static bool another_fcode_block(void)
 {
-	bool retval = FALSE;
+	bool retval = false;
 	u16 token;
 
 	token = next_token();
@@ -762,7 +762,7 @@ static bool another_fcode_block(void)
 	case 0x0f1:		/* start1 */
 	case 0x0f2:		/* start2 */
 	case 0x0f3:		/* start4 */
-		retval = TRUE;
+		retval = true;
 		printremark
 		    ("Subsequent FCode Block detected.  Detokenizing.");
 		break;
@@ -799,7 +799,7 @@ void detokenize(void)
 			if (ended_okay) {
 				init_fcode_block();
 			}
-			ended_okay = TRUE;
+			ended_okay = true;
 
 			adjust_for_pci_header();
 

detok/detok.c

@@ -51,10 +51,10 @@
 		     "(C) Copyright 2006 coresystems GmbH"
 #define IBM_COPYR    "(C) Copyright 2005 IBM Corporation.  All Rights Reserved."
 
-bool verbose = FALSE;
-bool decode_all = FALSE;
-bool show_linenumbers = FALSE;
-bool show_offsets = FALSE;
+bool verbose = false;
+bool decode_all = false;
+bool show_linenumbers = false;
+bool show_offsets = false;
 
 /*   Param is FALSE when beginning to detokenize,
  *       TRUE preceding error-exit   */
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 	int c;
 	const char *optstring = "vhanof:?";
 	int linenumbers = 0;
-	bool add_vfcodes = FALSE;
+	bool add_vfcodes = false;
 	char *vfc_filnam = NULL;
 
 	while (1) {
@@ -119,46 +119,46 @@ int main(int argc, char **argv)
 
 		switch (c) {
 		case 'v':
-			verbose = TRUE;
+			verbose = true;
 			break;
 		case 'a':
-			decode_all = TRUE;
+			decode_all = true;
 			break;
 		case 'n':
 			linenumbers |= 1;
-			show_linenumbers = TRUE;
+			show_linenumbers = true;
 			break;
 		case 'o':
 			linenumbers |= 2;
-			show_linenumbers = TRUE;
-			show_offsets = TRUE;
+			show_linenumbers = true;
+			show_offsets = true;
 			break;
 		case 'f':
-			add_vfcodes = TRUE;
+			add_vfcodes = true;
 			vfc_filnam = optarg;
 			break;
 		case 'h':
 		case '?':
-			print_copyright(TRUE);
+			print_copyright(true);
 			usage(argv[0]);
 			return 0;
 		default:
-			print_copyright(TRUE);
+			print_copyright(true);
 			printf("%s: unknown option.\n", argv[0]);
 			usage(argv[0]);
 			return 1;
 		}
 	}
 
 	if (verbose)
-		print_copyright(FALSE);
+		print_copyright(false);
 
 	if (linenumbers > 2)
 		printremark
 		    ("Line numbers will be disabled in favour of offsets.\n");
 
 	if (optind >= argc) {
-		print_copyright(TRUE);
+		print_copyright(true);
 		printf("%s: filename missing.\n", argv[0]);
 		usage(argv[0]);
 		return 1;

detok/dictionary.c

@@ -36,7 +36,7 @@
 
 #include "detok.h"
 
-bool check_tok_seq = TRUE;
+bool check_tok_seq = true;
 static token_t *dictionary;	/*  Initialize dynamically to accommodate AIX  */
 
 static char *fcerror = "ferror";

detok/pcihdr.c

@@ -443,15 +443,15 @@ void handle_pci_filler(u8 * filler_ptr)
 	u8 *scan_ptr;
 	int filler_len;
 	char temp_buf[80];
-	bool all_zero = TRUE;
+	bool all_zero = true;
 	u8 filler_byte = *filler_ptr;
 
 	filler_len = pci_image_end - filler_ptr;
 
 	for (scan_ptr = filler_ptr;
 	     scan_ptr < pci_image_end; filler_byte = *(++scan_ptr)) {
 		if (filler_byte != 0) {
-			all_zero = FALSE;
+			all_zero = false;
 			break;
 		}
 	}

detok/stream.c

@@ -75,7 +75,7 @@ u8 *max;
  **************************************************************************** */
 u8 *indata;
 static u8 *fc_start;
-static bool pci_image_found = FALSE;
+static bool pci_image_found = false;
 
 
 int init_stream(char *name)
@@ -230,10 +230,10 @@ static u8 *get_bytes(int nbytes)
 {
 	u8 *retval = pc;
 	if (pc == max) {
-		throw_eof(FALSE);
+		throw_eof(false);
 	}
 	if (pc + nbytes > max) {
-		throw_eof(TRUE);
+		throw_eof(true);
 	}
 	pc += nbytes;
 	return retval;
@@ -251,7 +251,7 @@ static u8 *get_bytes(int nbytes)
 bool more_to_go(void)
 {
 	bool retval;
-	retval = INVERSE(pc == max);
+	retval = !(pc == max);
 	return retval;
 }
 
@@ -505,7 +505,7 @@ void adjust_for_pci_header(void)
 	int pci_header_size;
 
 	pci_header_size = handle_pci_header(pc);
-	pci_image_found = pci_header_size > 0 ? TRUE : FALSE;
+	pci_image_found = pci_header_size > 0 ? true : false;
 	pc += pci_header_size;
 	fc_start += pci_header_size;
 	last_defined_token = 0;
@@ -543,6 +543,6 @@ void adjust_for_pci_filler(void)
 		pci_filler_len = pci_image_end - pc;
 		pci_filler_ptr = get_bytes(pci_filler_len);
 		handle_pci_filler(pci_filler_ptr);
-		pci_image_found = FALSE;
+		pci_image_found = false;
 	}
 }