Make BOOL unsigned; fix resulting latent bugs

diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index 9221ae2da1cef06a4ef917db6fffc054e0af8bcb..54032362c1775b66380f492ce187299d5fe82203 100644 (file)
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -195,7 +195,7 @@ int     received_time          = 0;
 int     recipients_count       = 0;
 recipient_item *recipients_list = NULL;
 int     recipients_list_max    = 0;
 int     recipients_count       = 0;
 recipient_item *recipients_list = NULL;
 int     recipients_list_max    = 0;

-int     running_in_test_harness=FALSE;
+BOOL    running_in_test_harness=FALSE;

 
 uschar *sender_address         = NULL;
 uschar *sender_fullhost        = NULL;
 
 uschar *sender_address         = NULL;
 uschar *sender_fullhost        = NULL;

diff --git a/src/src/exim_lock.c b/src/src/exim_lock.c
index 158ec6836aafd8a79149449d6261bfacd791bd7b..541e80f3f2a25bf4d6a2fdbcae5ef1f4a99124ea 100644 (file)
--- a/src/src/exim_lock.c
+++ b/src/src/exim_lock.c
@@ -38,7 +38,7 @@ in sys/file.h. */
 #endif
 
 
 #endif
 
 

-typedef int BOOL;
+typedef unsigned BOOL;

 #define FALSE 0
 #define TRUE  1
 
 #define FALSE 0
 #define TRUE  1
 

diff --git a/src/src/functions.h b/src/src/functions.h
index 8745a399cb2311a9f901f6a256993bfbeb04e75c..85a7e81eb3044e0adc303ffdef2e0e968f829993 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -206,7 +206,7 @@ extern void    host_build_hostlist(host_item **, const uschar *, BOOL);
 extern ip_address_item *host_build_ifacelist(const uschar *, uschar *);
 extern void    host_build_log_info(void);
 extern void    host_build_sender_fullhost(void);
 extern ip_address_item *host_build_ifacelist(const uschar *, uschar *);
 extern void    host_build_log_info(void);
 extern void    host_build_sender_fullhost(void);

-extern BOOL    host_find_byname(host_item *, const uschar *, int,
+extern int     host_find_byname(host_item *, const uschar *, int,

                                const uschar **, BOOL);
 extern int     host_find_bydns(host_item *, const uschar *, int, uschar *, uschar *,
                  uschar *, const dnssec_domains *, const uschar **, BOOL *);
                                const uschar **, BOOL);
 extern int     host_find_bydns(host_item *, const uschar *, int, uschar *, uschar *,
                  uschar *, const dnssec_domains *, const uschar **, BOOL *);

diff --git a/src/src/globals.h b/src/src/globals.h
index 0faf713bfbc7ee4fa3c97d66759561971c6b8317..34a11e604579a3cf1031b62c73418be8ca09e9fb 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -426,7 +426,7 @@ extern BOOL    drop_cr;                /* For broken local MUAs */
 extern uschar *dsn_from;               /* From: string for DSNs */
 
 extern BOOL    enable_dollar_recipients; /* Make $recipients available */
 extern uschar *dsn_from;               /* From: string for DSNs */
 
 extern BOOL    enable_dollar_recipients; /* Make $recipients available */

-extern int     envelope_to_remove;     /* Remove envelope_to_headers */
+extern BOOL    envelope_to_remove;     /* Remove envelope_to_headers */

 extern int     errno_quota;            /* Quota errno in this OS */
 extern int     error_handling;         /* Error handling style */
 extern uschar *errors_copy;            /* For taking copies of errors */
 extern int     errno_quota;            /* Quota errno in this OS */
 extern int     error_handling;         /* Error handling style */
 extern uschar *errors_copy;            /* For taking copies of errors */


@@ -714,7 +714,7 @@ extern uschar *recipient_verify_failure; /* What went wrong */
 extern BOOL    recipients_discarded;   /* By an ACL */
 extern int     recipients_list_max;    /* Maximum number fitting in list */
 extern int     recipients_max;         /* Max permitted */
 extern BOOL    recipients_discarded;   /* By an ACL */
 extern int     recipients_list_max;    /* Maximum number fitting in list */
 extern int     recipients_max;         /* Max permitted */

-extern int     recipients_max_reject;  /* If TRUE, reject whole message */
+extern BOOL    recipients_max_reject;  /* If TRUE, reject whole message */

 extern const pcre *regex_AUTH;         /* For recognizing AUTH settings */
 extern const pcre  *regex_check_dns_names; /* For DNS name checking */
 extern const pcre  *regex_From;        /* For recognizing "From_" lines */
 extern const pcre *regex_AUTH;         /* For recognizing AUTH settings */
 extern const pcre  *regex_check_dns_names; /* For DNS name checking */
 extern const pcre  *regex_From;        /* For recognizing "From_" lines */

diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index dd88101844384127108e1de066d538e43a8eb4e6..b288a32cbcb8e47c6cb54489a3b52a153f5c022d 100644 (file)
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -49,7 +49,7 @@ the standard header files, so we use "uschar". Solaris has u_char in
 sys/types.h. This is just a typing convenience, of course. */
 
 typedef unsigned char uschar;
 sys/types.h. This is just a typing convenience, of course. */
 
 typedef unsigned char uschar;

-typedef int BOOL;
+typedef unsigned BOOL;

 /* We also have SIGNAL_BOOL, which requires signal.h be included, so is defined
 elsewhere */
 
 /* We also have SIGNAL_BOOL, which requires signal.h be included, so is defined
 elsewhere */
 

diff --git a/src/src/routers/rf_functions.h b/src/src/routers/rf_functions.h
index 1344faadf02b386efff993619e87685403b609b2..f310d5a4226b375ca9a6af611233259c307f6a82 100644 (file)
--- a/src/src/routers/rf_functions.h
+++ b/src/src/routers/rf_functions.h
@@ -14,7 +14,7 @@ extern void rf_add_generated(router_instance *, address_item **,
 extern void rf_change_domain(address_item *, const uschar *, BOOL, address_item **);
 extern uschar *rf_expand_data(address_item *, uschar *, int *);
 extern int  rf_get_errors_address(address_item *, router_instance *,
 extern void rf_change_domain(address_item *, const uschar *, BOOL, address_item **);
 extern uschar *rf_expand_data(address_item *, uschar *, int *);
 extern int  rf_get_errors_address(address_item *, router_instance *,

-              BOOL, uschar **);
+              int, uschar **);

 extern int  rf_get_munge_headers(address_item *, router_instance *,
               header_line **, uschar **);
 extern BOOL rf_get_transport(uschar *, transport_instance **,  address_item *,
 extern int  rf_get_munge_headers(address_item *, router_instance *,
               header_line **, uschar **);
 extern BOOL rf_get_transport(uschar *, transport_instance **,  address_item *,