From 61ffa08f4c95e29d301de9fbabd6e71c2dbc1056 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 27 Aug 2007 18:10:19 +0000 Subject: r24712: No longer expose the 'BOOL' data type in any interfaces. (This used to be commit 1ce32673d960c8b05b6c1b1b99e1976a402417ae) --- source4/libcli/cldap/cldap.h | 2 +- source4/libcli/composite/composite.h | 2 +- source4/libcli/ldap/ldap.h | 4 ++-- source4/libcli/ldap/ldap_client.h | 2 +- source4/libcli/nbt/libnbt.h | 20 ++++++++++---------- source4/libcli/raw/interfaces.h | 14 +++++++------- source4/libcli/raw/libcliraw.h | 2 +- source4/libcli/raw/signing.h | 8 ++++---- source4/libcli/smb2/smb2.h | 4 ++-- source4/libcli/smb_composite/smb_composite.h | 4 ++-- source4/libcli/util/asn_1.h | 2 +- source4/libcli/wrepl/winsrepl.h | 12 ++++++------ 12 files changed, 38 insertions(+), 38 deletions(-) (limited to 'source4/libcli') diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h index 2e88571ee8..e957ccea19 100644 --- a/source4/libcli/cldap/cldap.h +++ b/source4/libcli/cldap/cldap.h @@ -47,7 +47,7 @@ struct cldap_request { int timeout; int num_retries; - BOOL is_reply; + bool is_reply; /* the ldap message_id */ int message_id; diff --git a/source4/libcli/composite/composite.h b/source4/libcli/composite/composite.h index 36ca0e9293..db0ecf9af6 100644 --- a/source4/libcli/composite/composite.h +++ b/source4/libcli/composite/composite.h @@ -59,7 +59,7 @@ struct composite_context { void *private_data; } async; - BOOL used_wait; + bool used_wait; }; struct irpc_request; diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h index fd622de449..022c70e36a 100644 --- a/source4/libcli/ldap/ldap.h +++ b/source4/libcli/ldap/ldap.h @@ -143,7 +143,7 @@ struct ldap_SearchRequest { enum ldap_deref deref; uint32_t timelimit; uint32_t sizelimit; - BOOL attributesonly; + bool attributesonly; struct ldb_parse_tree *tree; int num_attributes; const char **attributes; @@ -190,7 +190,7 @@ struct ldap_DelRequest { struct ldap_ModifyDNRequest { const char *dn; const char *newrdn; - BOOL deleteolddn; + bool deleteolddn; const char *newsuperior;/* optional */ }; diff --git a/source4/libcli/ldap/ldap_client.h b/source4/libcli/ldap/ldap_client.h index 0850e8ff64..d2a12ee8b5 100644 --- a/source4/libcli/ldap/ldap_client.h +++ b/source4/libcli/ldap/ldap_client.h @@ -53,7 +53,7 @@ struct ldap_connection { struct socket_context *sock; char *host; uint16_t port; - BOOL ldaps; + bool ldaps; const char *auth_dn; const char *simple_pw; diff --git a/source4/libcli/nbt/libnbt.h b/source4/libcli/nbt/libnbt.h index 3cbbae3fb2..e383591089 100644 --- a/source4/libcli/nbt/libnbt.h +++ b/source4/libcli/nbt/libnbt.h @@ -56,7 +56,7 @@ struct nbt_name_request { int num_retries; /* whether we have received a WACK */ - BOOL received_wack; + bool received_wack; /* the timeout event */ struct timed_event *te; @@ -65,13 +65,13 @@ struct nbt_name_request { uint16_t name_trn_id; /* is it a reply? */ - BOOL is_reply; + bool is_reply; /* the encoded request */ DATA_BLOB encoded; /* shall we allow multiple replies? */ - BOOL allow_multiple_replies; + bool allow_multiple_replies; unsigned int num_replies; struct nbt_name_reply { @@ -128,8 +128,8 @@ struct nbt_name_query { struct { struct nbt_name name; const char *dest_addr; - BOOL broadcast; - BOOL wins_lookup; + bool broadcast; + bool wins_lookup; int timeout; /* in seconds */ int retries; } in; @@ -163,9 +163,9 @@ struct nbt_name_register { const char *dest_addr; const char *address; uint16_t nb_flags; - BOOL register_demand; - BOOL broadcast; - BOOL multi_homed; + bool register_demand; + bool broadcast; + bool multi_homed; uint32_t ttl; int timeout; /* in seconds */ int retries; @@ -215,7 +215,7 @@ struct nbt_name_refresh { const char *dest_addr; const char *address; uint16_t nb_flags; - BOOL broadcast; + bool broadcast; uint32_t ttl; int timeout; /* in seconds */ int retries; @@ -252,7 +252,7 @@ struct nbt_name_release { const char *dest_addr; const char *address; uint16_t nb_flags; - BOOL broadcast; + bool broadcast; int timeout; /* in seconds */ int retries; } in; diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h index 6b3ca94506..23de6c3838 100644 --- a/source4/libcli/raw/interfaces.h +++ b/source4/libcli/raw/interfaces.h @@ -608,8 +608,8 @@ union smb_fileinfo { uint64_t alloc_size; uint64_t size; uint32_t nlink; - BOOL delete_pending; - BOOL directory; + bool delete_pending; + bool directory; } out; } standard_info; @@ -976,7 +976,7 @@ union smb_setfileinfo { enum smb_setfileinfo_level level; struct { union smb_handle_or_path file; - BOOL delete_on_close; + bool delete_on_close; } in; } disposition_info; @@ -1633,7 +1633,7 @@ union smb_read { uint16_t mincnt; uint32_t maxcnt; uint16_t remaining; - BOOL read_for_execute; + bool read_for_execute; } in; struct { uint8_t *data; @@ -2035,7 +2035,7 @@ union smb_ioctl { struct { union smb_handle file; uint32_t function; - BOOL fsctl; + bool fsctl; uint8_t filter; uint32_t max_data; DATA_BLOB blob; @@ -2193,7 +2193,7 @@ union smb_notify { union smb_handle file; uint32_t buffer_size; uint32_t completion_filter; - BOOL recursive; + bool recursive; } in; struct { @@ -2581,7 +2581,7 @@ union smb_search_data { }; /* Callback function passed to the raw search interface. */ -typedef BOOL (*smbcli_search_callback)(void *private, const union smb_search_data *file); +typedef bool (*smbcli_search_callback)(void *private, const union smb_search_data *file); enum smb_search_close_level {RAW_FINDCLOSE_GENERIC, RAW_FINDCLOSE_FCLOSE, RAW_FINDCLOSE_FINDCLOSE}; diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h index 645ac46356..a11a9c9e58 100644 --- a/source4/libcli/raw/libcliraw.h +++ b/source4/libcli/raw/libcliraw.h @@ -142,7 +142,7 @@ struct smbcli_transport { struct { /* a oplock break request handler */ - BOOL (*handler)(struct smbcli_transport *transport, + bool (*handler)(struct smbcli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private); /* private data passed to the oplock handler */ void *private; diff --git a/source4/libcli/raw/signing.h b/source4/libcli/raw/signing.h index 62b06579d5..56e977ed7c 100644 --- a/source4/libcli/raw/signing.h +++ b/source4/libcli/raw/signing.h @@ -34,10 +34,10 @@ struct smb_signing_context { enum smb_signing_engine_state signing_state; DATA_BLOB mac_key; uint32_t next_seq_num; - BOOL allow_smb_signing; - BOOL doing_signing; - BOOL mandatory_signing; - BOOL seen_valid; /* Have I ever seen a validly signed packet? */ + bool allow_smb_signing; + bool doing_signing; + bool mandatory_signing; + bool seen_valid; /* Have I ever seen a validly signed packet? */ }; #endif diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h index cad9ebd38e..33876c6f7c 100644 --- a/source4/libcli/smb2/smb2.h +++ b/source4/libcli/smb2/smb2.h @@ -128,8 +128,8 @@ struct smb2_request { uint64_t seqnum; struct { - BOOL do_cancel; - BOOL can_cancel; + bool do_cancel; + bool can_cancel; uint32_t pending_id; } cancel; diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h index e560c790f7..617daaf442 100644 --- a/source4/libcli/smb_composite/smb_composite.h +++ b/source4/libcli/smb_composite/smb_composite.h @@ -89,12 +89,12 @@ struct smb_composite_connect { const char *service; const char *service_type; struct cli_credentials *credentials; - BOOL fallback_to_anonymous; + bool fallback_to_anonymous; const char *workgroup; } in; struct { struct smbcli_tree *tree; - BOOL anonymous_fallback_done; + bool anonymous_fallback_done; } out; }; diff --git a/source4/libcli/util/asn_1.h b/source4/libcli/util/asn_1.h index 6c70423e96..612a8a932f 100644 --- a/source4/libcli/util/asn_1.h +++ b/source4/libcli/util/asn_1.h @@ -31,7 +31,7 @@ struct asn1_data { size_t length; off_t ofs; struct nesting *nesting; - BOOL has_error; + bool has_error; }; #define ASN1_APPLICATION(x) ((x)+0x60) diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index b8473d1021..3265024407 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -45,15 +45,15 @@ struct wrepl_socket { uint32_t timeout_count; /* remember is the socket is dead */ - BOOL dead; + bool dead; /* remember if we need to free the wrepl_socket at the end of wrepl_socket_dead() */ - BOOL free_skipped; + bool free_skipped; }; struct wrepl_send_ctrl { - BOOL send_only; - BOOL disconnect_after_send; + bool send_only; + bool disconnect_after_send; }; enum wrepl_request_state { @@ -71,7 +71,7 @@ struct wrepl_request { struct wrepl_socket *wrepl_socket; enum wrepl_request_state state; - BOOL trigger; + bool trigger; NTSTATUS status; struct timed_event *te; @@ -141,7 +141,7 @@ struct wrepl_pull_names { enum wrepl_name_type type; enum wrepl_name_state state; enum wrepl_name_node node; - BOOL is_static; + bool is_static; uint32_t raw_flags; uint64_t version_id; const char *owner; -- cgit