Description: Fix build with GCC 15
 Replaces type bool with flag and the associated defines true/false
 with vrai/faux.
Author: Ricardo Mones <mones@debian.org>
Bug-Debian: https://bugs.debian.org/1097566
Forwarded: not-needed
Last-Update: 2025-09-18
--- a/adobe.c
+++ b/adobe.c
@@ -87,19 +87,19 @@
 	unsigned long int chunks;
 	unsigned long int written_bytes;
 	long int bytes;
-	bool ret;
+	flag ret;
 
 	chunks=0;
 	ptr=buffer;
 	bytes=bytes_left;
 	written_bytes=0;
-	ret=true;
+	ret=vrai;
 	debug("8BPS parser: %ld byte(s) to parse", bytes);
 
 	/* parse 8BPS header */
 	if (bytes<26)
 	{
-		ret=false;
+		ret=faux;
 		error("8BPS parser: chunk underrun (%ld byte(s) remaining, 26 or more expected)",
 				bytes);
 	}
@@ -108,7 +108,7 @@
 		/* 8BPS marker expected */
 		if (getlong(ptr, 0)!=ADOBE_8BPS_MARKER)
 		{
-			ret=false;
+			ret=faux;
 			error("8BPS parser: expected marker not matched");
 		}
 		else
@@ -121,7 +121,7 @@
 			/* version (value 1 expected) */
 			if (getword(ptr, 0)!=0x0001)
 			{
-				ret=false;
+				ret=faux;
 				error("8BPS parser: expected version not matched (found 0x%04x, expected 0x0001)",
 						getword(ptr, 0), 0x0001);
 			}
@@ -135,7 +135,7 @@
 				/* reserved bytes (value 0 expected) */
 				if ((getlong(ptr, 0)!=0x00000000) || (getword(ptr, 4)!=0x0000))
 				{
-					ret=false;
+					ret=faux;
 					error("8BPS parser: expected reserved bytes value not matched (found 0x%08lx%04x, expected 0x000000000000)",
 							getlong(ptr, 0), getword(ptr, 4));
 				}
@@ -192,7 +192,7 @@
 						{
 							if (bytes>0)
 							{
-								ret=false;
+								ret=faux;
 								error("8BPS parser: unsupported chunk follows (%lu byte(s))",
 										bytes);
 							}
@@ -224,19 +224,19 @@
 	unsigned long int chunks;
 	long int bytes;
 	unsigned long int written_bytes;
-	bool ret;
+	flag ret;
 
 	chunks=0;
 	ptr=buffer;
 	bytes=bytes_left;
 	written_bytes=0;
-	ret=true;
+	ret=vrai;
 	debug("8BIM parser: %ld byte(s), version: %u", bytes, photoshop_version);
 
 	/* parse ff0 chunk */
 	if (bytes<16)
 	{
-		ret=false;
+		ret=faux;
 		error("FFO parser: chunk underrun (%ld byte(s) remaining, 16 or more expected)",
 				bytes);
 	}
@@ -246,7 +246,7 @@
 		if (getbyte(ptr, 0)==ADOBE_FFO_MARKER)
 		{
 			unsigned char version;
-			bool copyrighted;
+			flag copyrighted;
 			unsigned long int length;
 
 			debug("8BIM parser: FFO tag found");
@@ -257,7 +257,7 @@
 				warning("FFO parser: possibly unsupported FFO version %u (expected: 1)", version);
 
 			/* copyrighted */
-			copyrighted=(bool)getbyte(ptr, 2);
+			copyrighted=(flag)getbyte(ptr, 2);
 			debug("FFO parser: copyrighted flag is %sset", copyrighted?"":"not");
 
 			if (prefs.rewrite)
@@ -280,12 +280,12 @@
 			/* left for further sublevel parser */
 
 			/* more IPTC datasets */
-			iptc_parse(ptr, bytes, false, &res);
+			iptc_parse(ptr, bytes, faux, &res);
 			ret=res.ret;
 		}
 		else
 		{
-			ret=false;
+			ret=faux;
 			error("FFO parser: expected marker not matched");
 		}
 	}
@@ -308,13 +308,13 @@
 	unsigned short int resource;
 	long int bytes;
 	short int str_len;
-	bool ret;
+	flag ret;
 
 	chunks=0;
 	ptr=buffer;
 	bytes=bytes_left;
 	written_bytes=0;
-	ret=true;
+	ret=vrai;
 	debug("8BIM parser: %ld byte(s), version: %u", bytes, photoshop_version);
 
 	/* parse 8BIM chunk(s) */
@@ -322,7 +322,7 @@
 	{
 		if (bytes<4)
 		{
-			ret=false;
+			ret=faux;
 			error("8BIM parser: chunk underrun (%ld byte(s) remaining, 4 or more expected)",
 					bytes);
 			break;
@@ -331,7 +331,7 @@
 		/* 8BIM marker expected */
 		if (getlong(ptr, 0)==ADOBE_8BIM_MARKER)
 		{
-			bool parsed;
+			flag parsed;
 
 			debug("8BIM parser: 8BIM tag found");
 			if (prefs.rewrite)
@@ -341,7 +341,7 @@
 
 			if (bytes<2)
 			{
-				ret=false;
+				ret=faux;
 				error("8BIM parser: Photoshop generic chunk underrun (%ld byte(s) remaining, 2 or more expected)",
 						bytes);
 				break;
@@ -358,7 +358,7 @@
 
 			if (bytes<6)
 			{
-				ret=false;
+				ret=faux;
 				error("8BIM parser: chunk underrun (%ld byte(s) remaining, 6 or more expected)",
 						bytes);
 				break;
@@ -388,9 +388,9 @@
 			{
 				/* parse ITPC datasets */
 				debug("8BIM parser: IPTC signature found, invoking sublevel IPTC parser");
-				iptc_parse(ptr, data_len, false, &res);
+				iptc_parse(ptr, data_len, faux, &res);
 				ret=res.ret;
-				parsed=true;
+				parsed=vrai;
 			}
 			else
 			{
@@ -415,7 +415,7 @@
 				/* rewrite the whole chunk (not eaten here) */
 				res.parsed_bytes=0;
 				res.written_bytes=0;
-				parsed=false;
+				parsed=faux;
 			}
 
 			if (prefs.rewrite)
@@ -451,7 +451,7 @@
 				if (res.parsed_bytes>(unsigned long int)bytes)
 				{
 					/* raise an error (for the caller to know) but continue */
-					ret=false;
+					ret=faux;
 					error("8BIM parser: 8BIM chunk size inconsistency (%lu byte(s), %lu expected)",
 							res.parsed_bytes, bytes);
 				}
@@ -500,7 +500,7 @@
 		}
 		else
 		{
-			ret=false;
+			ret=faux;
 			error("8BIM parser: expected marker not matched");
 			break;
 		}
--- a/exif.c
+++ b/exif.c
@@ -222,7 +222,7 @@
 	unsigned short int ifd_number;
 	long int bytes;
 	
-	bool ret;
+	flag ret;
 
 	/* exif parsing is still embryonic */
 	return;
@@ -232,13 +232,13 @@
 	written_bytes=0;
 	ifd_number=0;
 	ifd_max=0;
-	ret=true;
+	ret=vrai;
 	debug("Exif parser: %ld byte(s) to parse", bytes);
 
 	/* parse Exif header */
 	if (bytes<15)
 	{
-		ret=false;
+		ret=faux;
 		error("Exif parser: chunk underrun (%ld byte(s) remaining, 15 or more expected)",
 				bytes);
 	}
@@ -250,12 +250,12 @@
 		if (strcmp((char*)getraw(ptr, 0, (unsigned char*)exif_marker, 6),
 									EXIF_MARKER_STRING)!=0)
 		{
-			ret=false;
+			ret=faux;
 			error("Exif parser: expected marker not matched");
 		}
 		else
 		{
-			bool little_endian;
+			flag little_endian;
 
 			if (prefs.rewrite)
 				written_bytes+=dump_rewrite(ptr, 6);
@@ -265,18 +265,18 @@
 			/* decode the Image File Header */
 			if (getlong(ptr, 0)==TIFF_BIG_ENDIAN_MARKER_STRING)
 			{
-				little_endian=false;
+				little_endian=faux;
 				debug("Exif parser: TIFF (big endian) marker found");
 			}
 			else
 			if (getlong(ptr, 0)==TIFF_LITTLE_ENDIAN_MARKER_STRING)
 			{
-				little_endian=true;
+				little_endian=vrai;
 				debug("Exif parser: TIFF (little endian) marker found");
 			}
 			else
 			{
-				ret=false;
+				ret=faux;
 				error("Exif parser: expected TIFF marker not matched");
 			}
 
@@ -301,7 +301,7 @@
 				
 				if (offset<8)
 				{
-					ret=false;
+					ret=faux;
 					error("Exif parser: unexpected initial IFD%lu offset (got %lu, expected >=8)",
 							ifd_number, offset);
 				}
@@ -353,7 +353,7 @@
 					{
 						if (bytes<12)
 						{
-							ret=false;
+							ret=faux;
 							error("Exif parser: IFD%u entry underrun (%lu byte(s) left, 12 expected)",
 									ifd_number, bytes, 12);
 							if (prefs.rewrite)
@@ -452,7 +452,7 @@
 					}
 					if (bytes<0)
 					{
-						ret=false;
+						ret=faux;
 						error("Exif parser: dataset underrun (overflow of %lu byte(s))",
 							abs(bytes));
 					}
--- a/iptc.c
+++ b/iptc.c
@@ -151,7 +151,7 @@
 
 /* IPTC-NAA IM4.1 */
 /* attempts to recognize all IPTC codes, and display data of known ones */
-void iptc_parse(unsigned char* buffer, const long int bytes_left, const bool iptc_expected,
+void iptc_parse(unsigned char* buffer, const long int bytes_left, const flag iptc_expected,
 		struct parser_result* result)
 {
 	struct iptc_code_descr* code_descr;
@@ -169,16 +169,16 @@
 	unsigned char record;
 	unsigned char last_record;
 	unsigned char tag;
-	bool ret;
-	bool saw_warning_missing_record_version[256];
-	bool saw_warning_duplicate_record_version[256];
+	flag ret;
+	flag saw_warning_missing_record_version[256];
+	flag saw_warning_duplicate_record_version[256];
 
 	iptc_datasets=0;
 	ptr=buffer;
 	bytes=bytes_left;
 	written_bytes=0;
 	missing=0;
-	ret=true;
+	ret=vrai;
 	debug("IPTC parser: %ld byte(s) to parse", bytes);
 
 	/* reset table of encountered datasets (to manage repeatable ones) */
@@ -193,8 +193,8 @@
 	}
 	else
 		iptc_datasets_history=NULL;
-	memset(saw_warning_missing_record_version, false, 256*sizeof(bool));
-	memset(saw_warning_duplicate_record_version, false, 256*sizeof(bool));
+	memset(saw_warning_missing_record_version, faux, 256*sizeof(flag));
+	memset(saw_warning_duplicate_record_version, faux, 256*sizeof(flag));
 
 	/* records must be encountered following a numerical value order */
 	last_record=0;
@@ -203,7 +203,7 @@
 	{
 		if (bytes<5)
 		{
-			ret=false;
+			ret=faux;
 			error("IPTC parser: record underrun (%ld byte(s) remaining, 5 or more expected)",
 					bytes);
 			break;
@@ -213,7 +213,7 @@
 		tag=getbyte(ptr, 0);
 		if ((tag!=IPTC_MARKER) && iptc_expected)
 		{
-			ret=false;
+			ret=faux;
 			error("IPTC parser: expected tag marker not matched");
 			break;
 		}
@@ -249,7 +249,7 @@
 				if (	!saw_warning_duplicate_record_version[record]
 					&&	(iptc_datasets_history[code]>0))
 				{
-					saw_warning_duplicate_record_version[record]=true;
+					saw_warning_duplicate_record_version[record]=vrai;
 					warning("IPTC parser: more than one record version found (code: 0x%04x)",
 							code);
 				}
@@ -260,7 +260,7 @@
 				if (	!saw_warning_missing_record_version[record]
 					&&	(iptc_datasets_history[code&0xff00]==0))
 				{
-					saw_warning_missing_record_version[record]=true;
+					saw_warning_missing_record_version[record]=vrai;
 					warning("IPTC parser: no record version found yet for code 0x%04x (expected code: 0x%04x)",
 							code, code&0xff00);
 				}
@@ -338,7 +338,7 @@
 			{
 				/* don't fix missing bytes, report an error */
 				missing=0;
-				ret=false;
+				ret=faux;
 			}
 			if (bytes==0)
 			{
@@ -372,7 +372,7 @@
 
 		/* filter edit: insertion of chunks whose code is lesser than current code */
 		if (prefs.rewrite && (prefs.filter_mode&FILTER_EDIT))
-			written_bytes+=iptc_edit_insert_chunks(false, code, iptc_datasets_history);
+			written_bytes+=iptc_edit_insert_chunks(faux, code, iptc_datasets_history);
 
 		/* conditional rewrite of the full dataset (incl. tag and header)
 		   in include/exclude filter mode or in filter edit mode if the current
@@ -406,7 +406,7 @@
 		if (prefs.op==OP_DUMP_FULL)
 		{
 			printf(" ");
-			iptc_dump_value(code, code_descr, value, length, true, true);
+			iptc_dump_value(code, code_descr, value, length, vrai, vrai);
 		}
 		else
 			if (prefs.op==OP_DUMP_VALUE)
@@ -414,7 +414,7 @@
 				if (iptc_filter_match(code))
 				{
 					debug("IPTC parser: matching IPTC code 0x%04x", code);
-					iptc_dump_value(code, code_descr, value, length, false, false);
+					iptc_dump_value(code, code_descr, value, length, faux, faux);
 				}
 			}
 			else
@@ -427,7 +427,7 @@
 
 	/* filter edit: insertion of remaining chunks */
 	if (prefs.rewrite && (prefs.filter_mode&FILTER_EDIT))
-		written_bytes+=iptc_edit_insert_chunks(true, 0, iptc_datasets_history);
+		written_bytes+=iptc_edit_insert_chunks(vrai, 0, iptc_datasets_history);
 
 	if (prefs.technical)
 	{
@@ -545,7 +545,7 @@
 }
 
 void iptc_dump_value(unsigned short int code, struct iptc_code_descr* code_descr, unsigned char* value,
-			unsigned short int length, bool dump_length, bool manage_newline)
+			unsigned short int length, flag dump_length, flag manage_newline)
 {
 	if (!code_descr)
 		dump_hexa(value, length);
@@ -776,13 +776,13 @@
 	}
 }
 
-bool iptc_filter_match(unsigned int code)
+flag iptc_filter_match(unsigned int code)
 /* returns true if the IPTC chunk identified by 'code' matches any code in filter table,
    false otherwise
    when filtering (include/exclude), a matching code means that it has to be kept
    otherwise if it has to be filtered out. match is not applicable in filter edit mode */
 {
-	bool keep;
+	flag keep;
 
 	if (!(prefs.filter_mode&FILTER_EXCLUDE) && !(prefs.filter_mode&FILTER_INCLUDE))
 	{
@@ -791,29 +791,29 @@
 		   the CLI and do the check here */
 		/* debug("IPTC filter: record code 0x%04x to keep (filter mask not applicable for this filter mode)",
 				code); */
-		keep=true;
+		keep=vrai;
 	}
 	else
 	{
 		register unsigned int i;
-		bool matched;
+		flag matched;
 
 		i=0;
-		matched=false;
+		matched=faux;
 		while (i<iptc_filter_table_filters)
 		{
 			if (iptc_filter_table[i]->type==IPTC_FET_VALUE)
 			{
 				if (iptc_filter_table[i]->code==code)
 				{
-					matched=true;
+					matched=vrai;
 					break;
 				}
 			}
 			else
 				if ((iptc_filter_table[i]->code<=code) && (code<=iptc_filter_table[i]->code2))
 				{
-					matched=true;
+					matched=vrai;
 					break;
 				}
 			i++;
@@ -836,7 +836,7 @@
 	iptc_edit_list_edits=0;
 }
 
-void iptc_edit_add_edit(unsigned int code, size_t len, unsigned char* data, bool* data_in_use)
+void iptc_edit_add_edit(unsigned int code, size_t len, unsigned char* data, flag* data_in_use)
 /* add sorted, to a single-linked list.
    will be rejected:
     - records whose length doesn't match the record length restrictions
@@ -861,7 +861,7 @@
 			{
 				error("IPTC filter edit: dataset value length to add (%lu byte(s)) doesn't match the size restriction for record 0x%04x (expected exactly %lu byte(s)), record skipped",
 						len, code, code_descr->length);
-				*data_in_use=false;
+				*data_in_use=faux;
 				return;
 			}
 		}
@@ -871,7 +871,7 @@
 			{
 				error("IPTC filter edit: dataset value length to add (%lu byte(s)) doesn't match the size restriction for record 0x%04x (expected max %lu byte(s)), record skipped",
 						len, code, code_descr->length);
-				*data_in_use=false;
+				*data_in_use=faux;
 				return;
 			}
 		}
@@ -883,7 +883,7 @@
 	{
 		error("IPTC filter edit: adding extended IPTC datasets (record 0x%04x, size > 32767) is not yet supported, record skipped",
 				code, len);
-		*data_in_use=false;
+		*data_in_use=faux;
 		return;
 	}
 
@@ -893,7 +893,7 @@
 		fatal_error("IPTC filter edit: couldn't allocate space for IPTC edit value");
 
 	/* populate the edit data */
-	iptc_edit->enabled=true;
+	iptc_edit->enabled=vrai;
 	iptc_edit->code=code;
 	iptc_edit->length=len;
 	iptc_edit->data=data;
@@ -927,7 +927,7 @@
 			iptc_edit->data=NULL;
 			free(iptc_edit);
 			iptc_edit=NULL;
-			*data_in_use=false;
+			*data_in_use=faux;
 			return;
 		}
 
@@ -941,7 +941,7 @@
 	}
 
 	iptc_edit_list_edits++;
-	*data_in_use=true;
+	*data_in_use=vrai;
 }
 
 void iptc_edit_list_reset(void)
@@ -1007,7 +1007,7 @@
 	return(iptc_edit_list_edits);
 }
 
-size_t iptc_edit_insert_chunks(bool flush, unsigned int code, unsigned short int* iptc_datasets_history)
+size_t iptc_edit_insert_chunks(flag flush, unsigned int code, unsigned short int* iptc_datasets_history)
 /* process all enabled edits in list:
    if flush is false, insert all enabled edits in list
    otherwise, insert enabled chunks when their code is lesser than 'code' */
@@ -1035,7 +1035,7 @@
 				if (edit_data->enabled && (flush || (edit_data->code<code)))
 				{
 					struct iptc_code_descr* code_descr;
-					bool store_it=true;
+					flag store_it=vrai;
 
 					code_descr=iptc_match_code(edit_data->code);
 					if (code_descr)
@@ -1046,7 +1046,7 @@
 						{
 							error("iptc_edit_insert_chunks: attempting to add an IPTC record that already exist (it's not repeatable): 0x%04x, record skipped",
 									edit_data->code);
-							store_it=false;
+							store_it=faux;
 						}
 						/* check length */
 						if (code_descr->fixed_length==IPTC_DATASET_FIXED)
@@ -1055,7 +1055,7 @@
 							{
 								error("iptc_edit_insert_chunks: dataset value length to add (%lu byte(s)) doesn't match the size restriction for record 0x%04x (expected exactly %lu byte(s)), record skipped",
 										edit_data->length, code, code_descr->length);
-								store_it=false;
+								store_it=faux;
 							}
 						}
 						else
@@ -1064,7 +1064,7 @@
 							{
 								error("iptc_edit_insert_chunks: dataset value length to add (%lu byte(s)) doesn't match the size restriction for record 0x%04x (expected max %lu byte(s)), record skipped",
 										edit_data->length, code, code_descr->length);
-								store_it=false;
+								store_it=faux;
 							}
 						}
 					}
@@ -1079,7 +1079,7 @@
 					if (edit_data->length>0x7fff)
 					{
 						error("iptc_edit_insert_chunks: adding extended IPTC datasets (length > 32767) is not supported yet, record skipped");
-						store_it=false;
+						store_it=faux;
 					}
 
 					/* write chunk */
@@ -1121,7 +1121,7 @@
 								edit_data->code);
 
 					/* disable edit in list */
-					edit_data->enabled=false;
+					edit_data->enabled=faux;
 				}
 			}
 			else
--- a/jfif.c
+++ b/jfif.c
@@ -110,24 +110,24 @@
 	long int bytes;
 	unsigned short int length;
 	unsigned char tag;
-	bool ret;
-	bool saw_EOI;
-	bool saw_SOS;
+	flag ret;
+	flag saw_EOI;
+	flag saw_SOS;
 
 	jfif_chunks=0;
 	ptr=buffer;
 	bytes=bytes_left;
 	written_bytes=0;
-	ret=true;
-	saw_EOI=false;
-	saw_SOS=false;
+	ret=vrai;
+	saw_EOI=faux;
+	saw_SOS=faux;
 	debug("JFIF parser: %ld byte(s) to parse", bytes);
 
 	while ((bytes>0) && !saw_SOS && !saw_EOI)
 	{
 		if (bytes<2)
 		{
-			ret=false;
+			ret=faux;
 			error("JFIF parser: chunk underrun (%ld byte(s) remaining, 2 or more expected)",
 					bytes);
 			break;
@@ -137,7 +137,7 @@
 		tag=getbyte(ptr, 0);
 		if (tag!=JFIF_TAG)
 		{
-			ret=false;
+			ret=faux;
 			error("JFIF parser: expected tag marker not matched");
 			break;
 		}
@@ -160,7 +160,7 @@
 				break;
 
 			case JFIF_EOI:
-				saw_EOI=true;
+				saw_EOI=vrai;
 				debug("JFIF parser: EOI tag found");
 				if (prefs.rewrite)
 					written_bytes+=dump_rewrite(ptr, 1);
@@ -176,10 +176,10 @@
 				ret=jfif_skip_chunk(jfif_tag_name((const enum JFIF_MARKER)tag),
 						&ptr, &bytes, &written_bytes);
 
-				saw_SOS=true;
+				saw_SOS=vrai;
 				if (bytes<2)
 				{
-					ret=false;
+					ret=faux;
 					error("JFIF parser: SOS/image-data chunk underrun (%ld byte(s) remaining, 2 bytes expected)",
 							tag, bytes);
 					break;
@@ -222,7 +222,7 @@
 
 				if (bytes<2)
 				{
-					ret=false;
+					ret=faux;
 					error("JFIF parser: APP%d chunk underrun (%ld byte(s) remaining, 2 or more expected)",
 							tag, bytes);
 					break;
@@ -232,7 +232,7 @@
 				length=(getbyte(ptr, 0)<<8)|getbyte(ptr, 1);
 				if (bytes<length)
 				{
-					ret=false;
+					ret=faux;
 					error("JFIF parser: APP%d chunk underrun (%ld byte(s) remaining, %ld byte(s) expected)",
 							tag, bytes, length);
 					break;
@@ -270,7 +270,7 @@
 							if (strcmp((char*)getraw(ptr, 0, (unsigned char*)exif_marker, 6),
 									EXIF_MARKER_STRING)!=0)
 							{
-								ret=false;
+								ret=faux;
 								error("JFIF parser: expected Exif tag marker not matched");
 								if (prefs.rewrite && (length>0))
 									written_bytes+=dump_rewrite(ptr, length);
@@ -287,7 +287,7 @@
 								/* limit to length bytes */
 								if (res.parsed_bytes>length)
 								{
-									ret=false; /* that situation might be critical */
+									ret=faux; /* that situation might be critical */
 									length=res.parsed_bytes;
 								}
 								else
@@ -366,9 +366,9 @@
 
 						if (len>=4)
 						{
-							bool parsed;
+							flag parsed;
 
-							parsed=false;
+							parsed=faux;
 							res.parsed_bytes=0;
 							res.written_bytes=0;
 							/* parse 8BIM chunk */
@@ -376,7 +376,7 @@
 							{
 								debug("JFIF parser: 8BIM marker found, invoking sublevel 8BIM parser");
 								adobe_8bim_parse(p, len, product_version, &res);
-								parsed=true;
+								parsed=vrai;
 								ret=res.ret;
 								p+=res.parsed_bytes;
 							}
@@ -386,14 +386,14 @@
 								{
 									debug("JFIF parser: 8BPS marker found, invoking sublevel 8BPS parser");
 									adobe_8bps_parse(p, len, &res);
-									parsed=true;
+									parsed=vrai;
 									ret=res.ret;
 									p+=res.parsed_bytes;
 								}
 								else
 								{
 									debug("JFIF parser: neither 8BIM nor 8BPS marker found in APP13 chunk");
-									ret=false;
+									ret=faux;
 									error("JFIF parser: unsupported or missing Adobe contents");
 									/* all bytes from this unknown chunk will be written below */
 								}
@@ -494,7 +494,7 @@
 					marker_range_descr=jfif_marker_range_match((const enum JFIF_MARKER)tag);
 					if (!marker_range_descr)
 					{
-						ret=false;
+						ret=faux;
 						error("JFIF parser: unknown tag 0x%02x", tag);
 					}
 				}
@@ -508,7 +508,7 @@
 
 	if (!ret && (!saw_EOI && !saw_SOS))
 	{
-		ret=false;
+		ret=faux;
 		error("JFIF parser: neither found SOS nor EOI, possibly corrupted file or not a supported JPEG/JFIF file format");
 	}
 	debug("JFIF parser: %u dataset(s) inspected, total length: %lu byte(s)",
@@ -520,7 +520,7 @@
 	result->ret=ret;
 }
 
-bool jfif_skip_chunk(char* label, unsigned char** ptr, long int* bytes,
+flag jfif_skip_chunk(char* label, unsigned char** ptr, long int* bytes,
 		unsigned long int* written_bytes)
 {
 	unsigned char* p;
@@ -542,7 +542,7 @@
 	{
 		error("JFIF parser: %s chunk underrun (%ld byte(s) remaining, 2 or more expected)",
 				label, b);
-		return(false);
+		return(faux);
 	}
 
 	l=(getbyte(p, 0)<<8)|getbyte(p, 1);
@@ -550,7 +550,7 @@
 	{
 		error("JFIF parser: %s chunk underrun (%ld byte(s) remaining, %ld byte(s) expected)",
 				label, b, l);
-		return(false);
+		return(faux);
 	}
 	l-=2;	/* skip length bytes themselves */
 	b-=2;
@@ -566,7 +566,7 @@
 
 	*bytes=b;
 	*ptr=p;
-	return(true);
+	return(vrai);
 }
 
 struct jfif_marker_descr* jfif_marker_match(const enum JFIF_MARKER tag)
--- a/main.c
+++ b/main.c
@@ -264,24 +264,24 @@
 
 	/* variables init */
 	prefs.log_level=LOG_LEVEL_WARNINGS;
-	prefs.technical=false;
+	prefs.technical=faux;
 	prefs.warnings=0;
 	prefs.errors=0;
 	prefs.fixes=0;
 	prefs.wrap_dump=DEFAULT_WRAP_DUMP;
-	prefs.rewrite=false;
-	prefs.rewrite_create_backup=false;
+	prefs.rewrite=faux;
+	prefs.rewrite_create_backup=faux;
 	prefs.filter_mode=FILTER_NONE;
-	prefs.test_rewrite=false;
+	prefs.test_rewrite=faux;
 #ifdef ALWAYS_CACHE_REWRITE
-	prefs.rewrite_cached=true;
+	prefs.rewrite_cached=vrai;
 #else
-	prefs.rewrite_cached=false;
+	prefs.rewrite_cached=faux;
 #endif
-	prefs.extract_iptc=false;
-	prefs.extract_extension_append=false;
-	prefs.fix=false;
-/*	prefs.edit_overwrite=false; */
+	prefs.extract_iptc=faux;
+	prefs.extract_extension_append=faux;
+	prefs.fix=faux;
+/*	prefs.edit_overwrite=faux; */
 	context_reset();
 	input_filename=NULL;
 	output_filename=NULL;
@@ -369,7 +369,7 @@
 		}
 		else
 		if ((strcmp(arg, "--check-compliance")==0) || (strcmp(arg, "-c")==0))
-			prefs.technical=true;
+			prefs.technical=vrai;
 		else
 		if ((strcmp(arg, "--extract")==0) || (strcmp(arg, "-x")==0))
 		{
@@ -377,7 +377,7 @@
 			{
 				i++;
 				if (strcasecmp(argv[i], "iptc")==0)
-					prefs.extract_iptc=true;
+					prefs.extract_iptc=vrai;
 				else
 				{
 					error("unsupported metadata type to argument '%s'", arg);
@@ -392,7 +392,7 @@
 		}
 		else
 		if ((strcmp(arg, "--backup")==0) || (strcmp(arg, "-b")==0))
-			prefs.rewrite_create_backup=true;
+			prefs.rewrite_create_backup=vrai;
 		else
 		if ((strcmp(arg, "--target-dir")==0) || (strcmp(arg, "-d")==0))
 		{
@@ -409,7 +409,7 @@
 		}
 		else
 		if ((strcmp(arg, "--fix")==0) || (strcmp(arg, "-f")==0))
-			prefs.fix=true;
+			prefs.fix=vrai;
 		else
 		if ((strcmp(arg, "--ext")==0) || (strcmp(arg, "-t")==0))
 		{
@@ -426,7 +426,7 @@
 		}
 		else
 		if ((strcmp(arg, "--append-ext")==0) || (strcmp(arg, "-a")==0))
-			prefs.extract_extension_append=true;
+			prefs.extract_extension_append=vrai;
 		else
 		if ((strcmp(arg, "--include")==0) || (strcmp(arg, "-i")==0))
 		{
@@ -471,7 +471,7 @@
 		}
 		else
 		if (strcmp(arg, "--test")==0)
-			prefs.test_rewrite=true;
+			prefs.test_rewrite=vrai;
 		else
 		if ((strcmp(arg, "--wrap")==0) || (strcmp(arg, "-w")==0))
 		{
@@ -504,7 +504,7 @@
 		}
 /*		else
 		if ((strcmp(arg, "--overwrite")==0) || (strcmp(arg, "-o")==0))
-			prefs.edit_overwrite=true; */
+			prefs.edit_overwrite=vrai; */
 		else
 		if ((strcmp(arg, "--")==0))
 			break;
@@ -536,7 +536,7 @@
 		info("operating mode: %s", op);
 
 		if (prefs.op==OP_FILTER)
-			prefs.rewrite=true;
+			prefs.rewrite=vrai;
 
 		/* extra parameter (value) for dump-value mode */
 		if (prefs.op==OP_DUMP_VALUE)
@@ -675,7 +675,7 @@
 		iptc_filter_table_dump();
 #endif
 		/* always cache rewriting */
-		prefs.rewrite_cached=true;
+		prefs.rewrite_cached=vrai;
 	}
 	else
 		if (exclude_expression)
@@ -704,7 +704,7 @@
 #endif
 			/* force cached rewriting when some filters are set */
 			if (iptc_filters()>0)
-				prefs.rewrite_cached=true;
+				prefs.rewrite_cached=vrai;
 		}
 	if (edit_expression)
 	{
@@ -732,7 +732,7 @@
 #endif
 		/* force cached rewriting when some edits are set */
 		if (iptc_edits()>0)
-			prefs.rewrite_cached=true;
+			prefs.rewrite_cached=vrai;
 	}
 	if (prefs.op==OP_FILTER)
 	{
@@ -747,14 +747,14 @@
 
 	while (i<=filenames_count)
 	{
-		bool proceed;
+		flag proceed;
 
-		proceed=true;
+		proceed=vrai;
 
 		/* reset rewrite flag according to the current mode (it might has
 		   been discarded for previous file */
 		if (prefs.op==OP_FILTER)
-			prefs.rewrite=true;
+			prefs.rewrite=vrai;
 
 		if (prefs.extract_iptc)
 		{
@@ -876,7 +876,7 @@
 			{
 				error("output filenames clash: filtering and extraction target files are identical (%s)\nthis would lead to unpredictable results",
 						output_filename);
-				proceed=false;
+				proceed=faux;
 			}
 		}
 
@@ -904,7 +904,7 @@
 
 			result.parsed_bytes=0;
 			result.written_bytes=0;
-			result.ret=true;
+			result.ret=vrai;
 
 			if (input_length==0)
 				warning("empty file, skipped");
@@ -914,14 +914,14 @@
 			{
 				debug("GIF87 marker found");
 				info("GIF87 contents expected (unsupported)");
-				prefs.rewrite=false;
+				prefs.rewrite=faux;
 			}
 			else
 			if (strcmp((char*)getstring(buffer, 0, tmp, 5), GIF89_MARKER_STRING)==0)
 			{
 				debug("GIF89 marker found");
 				info("GIF89 contents expected (unsupported)");
-				prefs.rewrite=false;
+				prefs.rewrite=faux;
 			}
 			else
 			if (strcmp((char*)getstring(buffer, 0, tmp, 6), EXIF_MARKER_STRING)==0)
@@ -963,28 +963,28 @@
 			{
 				debug("TIFF (little endian) marker found");
 				info("TIFF (little endian) contents expected (unsupported)");
-				prefs.rewrite=false;
+				prefs.rewrite=faux;
 			}
 			else
 			if (getlong(buffer, 0)==TIFF_BIG_ENDIAN_MARKER_STRING)
 			{
 				debug("TIFF (big endian) marker found");
 				info("TIFF (big endian) contents expected (unsupported)");
-				prefs.rewrite=false;
+				prefs.rewrite=faux;
 			}
 			else
 			if (getlong(buffer, 0)==PNG_MARKER_STRING)
 			{
 				debug("PNG marker found");
 				info("PNG contents expected (unsupported)");
-				prefs.rewrite=false;
+				prefs.rewrite=faux;
 			}
 			else
 			if (strcmp((char*)getstring(buffer, 0, tmp, 4), DJVU_MARKER_STRING)==0)
 			{
 				debug("DJVU marker found");
 				info("DJVU contents expected (unsupported)");
-				prefs.rewrite=false;
+				prefs.rewrite=faux;
 			}
 			else
 			if (getword(buffer, 0)==((JFIF_TAG<<8)|JFIF_SOI))
@@ -1002,7 +1002,7 @@
 			{
 				debug("Windows Bitmap marker found");
 				info("Windows Bitmap contents expected (unsupported)");
-				prefs.rewrite=false;
+				prefs.rewrite=faux;
 			}
 			else
 			if (getbyte(buffer, 0)==IPTC_MARKER)
@@ -1011,7 +1011,7 @@
 				info("IPTC contents expected");
 				if (prefs.rewrite)
 					init_rewrite();
-				iptc_parse(buffer, input_length, true, &result);
+				iptc_parse(buffer, input_length, vrai, &result);
 				if (!result.ret)
 					debug("IPTC parser has reported error(s)");
 			}
@@ -1022,14 +1022,14 @@
 				info("Adobe FF0 contents expected");
 				if (prefs.rewrite)
 					init_rewrite();
-				adobe_ffo_parse(buffer, input_length, true, &result);
+				adobe_ffo_parse(buffer, input_length, vrai, &result);
 				if (!result.ret)
 					debug("FF0 parser has reported error(s)");
 			}
 			else
 			{
 				error("not a supported file (contents not recognized)");
-				prefs.rewrite=false;
+				prefs.rewrite=faux;
 			}
 
 			if (result.parsed_bytes>input_length)
--- a/util.c
+++ b/util.c
@@ -134,13 +134,13 @@
 	\param[in]	filename: filename to check if it exists.
 	\return		True if filename exists, otherwise returns false.
 */
-bool fexist(const char* filename)
+flag fexist(const char* filename)
 {
 	struct stat st;
 
 	if (stat(filename, &st)==0)
-		return(true);
-	return(false);
+		return(vrai);
+	return(faux);
 }
 
 /** \brief		Rename source_filename to target_filename.
@@ -180,45 +180,45 @@
 	\param[in]	filename: file to check if it's a regular file.
 	\return		True if filename is a regular file, otherwise returns false.
 */
-bool fisfile(const char* filename)
+flag fisfile(const char* filename)
 {
 	struct stat st;
 
 	if (stat(filename, &st)<0)
-		return(false);
+		return(faux);
 	if (S_ISREG(st.st_mode))
-		return(true);
-	return(false);
+		return(vrai);
+	return(faux);
 }
 
 /** \brief		Check if a file is to a link.
 	\param[in]	filename: file to check if it's a link.
 	\return		True if filename is a link, otherwise returns false.
 */
-bool fislink(const char* filename)
+flag fislink(const char* filename)
 {
 	struct stat st;
 
 	if (stat(filename, &st)<0)
-		return(false);
+		return(faux);
 	if (S_ISLNK(st.st_mode))
-		return(true);
-	return(false);
+		return(vrai);
+	return(faux);
 }
 
 /** \brief 		Check if a file is a directory.
 	\param[in]	filename: file to check if it's a directory.
 	\return		True if filename is a directory, otherwise returns false.
 */
-bool fisdir(const char* filename)
+flag fisdir(const char* filename)
 {
 	struct stat st;
 
 	if (stat(filename, &st)<0)
-		return(false);
+		return(faux);
 	if (S_ISDIR(st.st_mode))
-		return(true);
-	return(false);
+		return(vrai);
+	return(faux);
 }
 
 /**	\brief		Get a file's extension.
@@ -962,7 +962,7 @@
 
 	TODO
 */
-bool get_unsigned_value(const char* param, unsigned long int* var)
+flag get_unsigned_value(const char* param, unsigned long int* var)
 {
 	unsigned int value;
 	char* chk;
@@ -971,9 +971,9 @@
 	if (!*chk)
 	{
 		*var=value;
-		return(true);
+		return(vrai);
 	}
-	return(false);
+	return(faux);
 }
 
 /**	\brief
@@ -982,7 +982,7 @@
 
 	TODO
 */
-bool get_signed_value(const char* param, long int* var)
+flag get_signed_value(const char* param, long int* var)
 {
 	int value;
 	char* chk;
@@ -991,9 +991,9 @@
 	if (!*chk)
 	{
 		*var=value;
-		return(true);
+		return(vrai);
 	}
-	return(false);
+	return(faux);
 }
 
 /**	\brief
@@ -1002,7 +1002,7 @@
 
 	TODO
 */
-bool get_hexa_value(const char* param, unsigned long int* var)
+flag get_hexa_value(const char* param, unsigned long int* var)
 {
 	unsigned int value;
 	char* chk;
@@ -1011,9 +1011,9 @@
 	if (!*chk)
 	{
 		*var=value;
-		return(true);
+		return(vrai);
 	}
-	return(false);
+	return(faux);
 }
 
 /**	\brief
@@ -1132,7 +1132,7 @@
 
 	TODO
 */
-bool filter_parse_line(char* buffer, size_t len, unsigned long int line)
+flag filter_parse_line(char* buffer, size_t len, unsigned long int line)
 {
 	char *ptr;
 	char* p;
@@ -1372,7 +1372,7 @@
 
 	TODO
 */
-bool edit_parse_line(const char* buffer, size_t len, unsigned long int line)
+flag edit_parse_line(const char* buffer, size_t len, unsigned long int line)
 /* strdup/strlen/etc. functions can't be used there, as it's possible to get '\0' char in the
    value part of the edit expression (if it contains widechars). all length calculation
    accross the whole line of the value part must be based upon 'len'. */
@@ -1448,7 +1448,7 @@
 					char* value;
 					char* stored_value=NULL;
 					size_t stored_value_length=0;
-					bool stored_value_in_use=false;
+					flag stored_value_in_use=faux;
 
 					/* get type */
 					p[pos-1]='\0';
--- a/util.h
+++ b/util.h
@@ -135,12 +135,12 @@
 #define TIFF_BIG_ENDIAN_MARKER_STRING 0x4d4d002aUL
 #define DJVU_MARKER_STRING	"DJvu"
 
-/**	\typedef	bool
+/**	\typedef	flag
 	\brief		Invent the boolean type.
 */
-typedef short int bool;
-#define false 0
-#define true 1
+typedef short int flag;
+#define faux 0
+#define vrai 1
 
 /** \enum	OP
 	\brief	Possible operation types.
@@ -258,7 +258,7 @@
 struct prefs_struct
 {
 	enum LOG_LEVEL log_level;			/**< log level */
-	bool technical;						/**< technical flag: is set, extra checks will be made and severity level of some messages might be increased */
+	flag technical;						/**< technical flag: is set, extra checks will be made and severity level of some messages might be increased */
 	enum OP op;							/**< operation type */
 	char* context_text;					/**< current context descriptive text */
 	unsigned long int context_warnings;	/**< number of encountered warnings in current context */
@@ -268,15 +268,15 @@
 	unsigned long int errors;			/**< total number of encountered errors */
 	unsigned long int fixes;			/**< total number of fixed done */
 	unsigned short int wrap_dump;		/**< wrap dump of dataset value flag: is set, long data dump will be wrapped */
-	bool rewrite;						/**< rewrite mode flag: set according to the operation type and some other settings */
-	bool rewrite_create_backup;			/**< create backup of written files flag: if set, backup will be created for each file open in write mode */
-	bool fix;							/**< fix flag: is set, fixes will be done (if possible) when a broken structure is encountered */
+	flag rewrite;						/**< rewrite mode flag: set according to the operation type and some other settings */
+	flag rewrite_create_backup;			/**< create backup of written files flag: if set, backup will be created for each file open in write mode */
+	flag fix;							/**< fix flag: is set, fixes will be done (if possible) when a broken structure is encountered */
 	int filter_mode;					/**< filter mode flag: used when the operation type is filter */
-	bool rewrite_cached;				/**< cached write mode flag: if set, written bytes will pass thru a cache in memory */
-	bool extract_iptc;					/**< IPTC extraction flag: is set, IPTC datasets will be written to a file */
-	bool extract_extension_append;		/**< extraction: filename extension append flag: is set, extension will be appended to the input filename (when writing datasets) */
-	bool test_rewrite;					/**< test write flag: mostly provided for debug purposes: if set, files opened in write mode will not override any existing file but the temporary write file will be kept */
-/*	bool edit_overwrite; */				/**< allow overwriting existing field values when adding (edit) */
+	flag rewrite_cached;				/**< cached write mode flag: if set, written bytes will pass thru a cache in memory */
+	flag extract_iptc;					/**< IPTC extraction flag: is set, IPTC datasets will be written to a file */
+	flag extract_extension_append;		/**< extraction: filename extension append flag: is set, extension will be appended to the input filename (when writing datasets) */
+	flag test_rewrite;					/**< test write flag: mostly provided for debug purposes: if set, files opened in write mode will not override any existing file but the temporary write file will be kept */
+/*	flag edit_overwrite; */				/**< allow overwriting existing field values when adding (edit) */
 };
 
 /** \struct	parser_result
@@ -289,7 +289,7 @@
 {
 	unsigned long int parsed_bytes;		/**< (parsed bytes) bytes eaten by the parser */
 	unsigned long int written_bytes;	/**< (written bytes) bytes rewritten by the parser (following the OP mode and some other conditions) */
-	bool ret; 							/**< (parser return code) false if any critical parsing error has been found */
+	flag ret; 							/**< (parser return code) faux if any critical parsing error has been found */
 };
 
 /** \enum	EXIT_CODE
@@ -327,12 +327,12 @@
 
 /* low-level file management */
 size_t fsize(FILE*);
-bool fexist(const char*);
+flag fexist(const char*);
 int frename(const char*, const char*);
 int fremove(const char*, const char*);
-bool fisfile(const char*);
-bool fislink(const char*);
-bool fisdir(const char*);
+flag fisfile(const char*);
+flag fislink(const char*);
+flag fisdir(const char*);
 char* fextension(const char*);
 char* fbasename(const char*);
 char* ffilename(const char*);
@@ -382,20 +382,20 @@
 void post_rewrite(unsigned char*, struct parser_result*);
 
 /* type convertion */
-bool get_unsigned_value(const char*, unsigned long int*);
-bool get_hexa_value(const char*, unsigned long int*);
+flag get_unsigned_value(const char*, unsigned long int*);
+flag get_hexa_value(const char*, unsigned long int*);
 
 /* string manipulation */
 size_t strpos(const char*, const char);
 size_t strrpos(const char*, const char);
 
 /* filter exclude/include pattern loading/decoding */
-bool filter_parse_line(char*, size_t, unsigned long int);
+flag filter_parse_line(char*, size_t, unsigned long int);
 void filter_load_line(char*);
 void filter_load_file(FILE*);
 
 /* filter edit pattern loading/decoding */
-bool edit_parse_line(const char*, size_t, unsigned long int);
+flag edit_parse_line(const char*, size_t, unsigned long int);
 void edit_load_line(const char*);
 void edit_load_file(FILE*);
 
--- a/iptc.h
+++ b/iptc.h
@@ -185,7 +185,7 @@
 
 struct iptc_edit_data
 {
-	bool				enabled;
+	flag				enabled;
 	unsigned short int	code;
 	size_t				length;
 	unsigned char*		data;
@@ -197,12 +197,12 @@
 	struct iptc_edit_list_cell*	next;
 };
 
-void iptc_parse(unsigned char*, const long int, const bool, struct parser_result*);
+void iptc_parse(unsigned char*, const long int, const flag, struct parser_result*);
 void iptc_stats_table_inc(unsigned int, unsigned short int*);
 void iptc_stats_table_dec(unsigned int, unsigned short int*);
 struct iptc_code_descr* iptc_match_code(const enum IPTC_CODE);
 void iptc_dump_value(unsigned short int, struct iptc_code_descr*, unsigned char*, unsigned short int,
-			bool dump_length, bool manage_newline);
+			flag dump_length, flag manage_newline);
 void iptc_dump_list(void);
 
 void iptc_filter_table_init(void);
@@ -210,14 +210,14 @@
 void iptc_filter_add_range(unsigned int, unsigned int);
 void iptc_filter_table_reset(void);
 void iptc_filter_table_dump(void);
-bool iptc_filter_match(unsigned int);
+flag iptc_filter_match(unsigned int);
 unsigned short int iptc_filters(void);
 
 void iptc_edit_list_init(void);
-void iptc_edit_add_edit(unsigned int, size_t, unsigned char*, bool*);
+void iptc_edit_add_edit(unsigned int, size_t, unsigned char*, flag*);
 void iptc_edit_list_reset(void);
 void iptc_edit_list_dump(void);
 unsigned short int iptc_edits(void);
-size_t iptc_edit_insert_chunks(bool, unsigned int, unsigned short int*);
+size_t iptc_edit_insert_chunks(flag, unsigned int, unsigned short int*);
 
 #endif
--- a/jfif.h
+++ b/jfif.h
@@ -106,7 +106,7 @@
 
 
 void jfif_parse(unsigned char*, const unsigned long int, struct parser_result*);
-bool jfif_skip_chunk(char*, unsigned char**, long int*, unsigned long int*);
+flag jfif_skip_chunk(char*, unsigned char**, long int*, unsigned long int*);
 char* jfif_tag_name(const enum JFIF_MARKER);
 struct jfif_marker_descr* jfif_marker_match(const enum JFIF_MARKER);
 struct jfif_marker_range_descr* jfif_marker_range_match(const enum JFIF_MARKER);