Fix the uint32/16/8 stuff in two proto.h files I missed.

Signed-off-by: Richard Sharpe <rsharpe@gmail.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed May 13 22:01:14 CEST 2015 on sn-devel-104

diff --git a/source3/nmbd/nmbd_proto.h b/source3/nmbd/nmbd_proto.h
index 23b44e2d56a8f2bb3399e7bbebb6ac19f4ef6439..812234d4e1d00029418347c1f6d7d0a1745f746b 100644 (file)
--- a/source3/nmbd/nmbd_proto.h
+++ b/source3/nmbd/nmbd_proto.h
@@ -45,7 +45,7 @@ void add_domain_names(time_t t);
 /* The following definitions come from nmbd/nmbd_become_lmb.c  */
 
 void insert_permanent_name_into_unicast( struct subnet_record *subrec,
-                                                struct nmb_name *nmbname, uint16 nb_type );
+                                                struct nmb_name *nmbname, uint16_t nb_type );
 void unbecome_local_master_browser(struct subnet_record *subrec, struct work_record *work,
                                    bool force_new_election);
 void become_local_master_browser(struct subnet_record *subrec, struct work_record *work);
@@ -137,14 +137,14 @@ void update_name_ttl( struct name_record *namerec, int ttl );
 bool add_name_to_subnet( struct subnet_record *subrec,
                        const char *name,
                        int type,
-                       uint16 nb_flags,
+                       uint16_t nb_flags,
                        int ttl,
                        enum name_source source,
                        int num_ips,
                        struct in_addr *iplist);
 void standard_success_register(struct subnet_record *subrec,
                              struct userdata_struct *userdata,
-                             struct nmb_name *nmbname, uint16 nb_flags, int ttl,
+                             struct nmb_name *nmbname, uint16_t nb_flags, int ttl,
                              struct in_addr registered_ip);
 void standard_fail_register( struct subnet_record   *subrec,
                              struct nmb_name        *nmbname );
@@ -176,7 +176,7 @@ bool query_name_from_wins_server(struct in_addr ip_to,
 /* The following definitions come from nmbd/nmbd_nameregister.c  */
 
 void register_name(struct subnet_record *subrec,
-                   const char *name, int type, uint16 nb_flags,
+                   const char *name, int type, uint16_t nb_flags,
                    register_name_success_function success_fn,
                    register_name_fail_function fail_fn,
                    struct userdata_struct *userdata);
@@ -199,8 +199,8 @@ bool node_status(struct subnet_record *subrec, struct nmb_name *nmbname,
 
 bool nmbd_init_packet_server(void);
 
-uint16 get_nb_flags(char *buf);
-void set_nb_flags(char *buf, uint16 nb_flags);
+uint16_t get_nb_flags(char *buf);
+void set_nb_flags(char *buf, uint16_t nb_flags);
 struct response_record *queue_register_name( struct subnet_record *subrec,
                           response_function resp_fn,
                           timeout_response_function timeout_fn,
@@ -208,11 +208,11 @@ struct response_record *queue_register_name( struct subnet_record *subrec,
                           register_name_fail_function fail_fn,
                           struct userdata_struct *userdata,
                           struct nmb_name *nmbname,
-                          uint16 nb_flags);
+                          uint16_t nb_flags);
 void queue_wins_refresh(struct nmb_name *nmbname,
                        response_function resp_fn,
                        timeout_response_function timeout_fn,
-                       uint16 nb_flags,
+                       uint16_t nb_flags,
                        struct in_addr refresh_ip,
                        const char *tag);
 struct response_record *queue_register_multihomed_name( struct subnet_record *subrec,
@@ -222,7 +222,7 @@ struct response_record *queue_register_multihomed_name( struct subnet_record *su
                                                        register_name_fail_function fail_fn,
                                                        struct userdata_struct *userdata,
                                                        struct nmb_name *nmbname,
-                                                       uint16 nb_flags,
+                                                       uint16_t nb_flags,
                                                        struct in_addr register_ip,
                                                        struct in_addr wins_ip);
 struct response_record *queue_release_name( struct subnet_record *subrec,
@@ -232,7 +232,7 @@ struct response_record *queue_release_name( struct subnet_record *subrec,
                                            release_name_fail_function fail_fn,
                                            struct userdata_struct *userdata,
                                            struct nmb_name *nmbname,
-                                           uint16 nb_flags,
+                                           uint16_t nb_flags,
                                            struct in_addr release_ip,
                                            struct in_addr dest_ip);
 struct response_record *queue_query_name( struct subnet_record *subrec,
@@ -289,7 +289,7 @@ struct response_record *make_response_record( struct subnet_record *subrec,
                                              fail_function fail_fn,
                                              struct userdata_struct *userdata);
 struct response_record *find_response_record(struct subnet_record **ppsubrec,
-                               uint16 id);
+                               uint16_t id);
 bool is_refresh_already_queued(struct subnet_record *subrec, struct name_record *namerec);
 
 /* The following definitions come from nmbd/nmbd_sendannounce.c  */

diff --git a/source3/torture/proto.h b/source3/torture/proto.h
index 5f1cdcc9fffc10342c1e91ab1913e6c16e1bbb1a..ab422d587398bb0768d48ca1533b543274dad6e6 100644 (file)
--- a/source3/torture/proto.h
+++ b/source3/torture/proto.h
@@ -67,7 +67,7 @@ bool smbcli_parse_unc(const char *unc_name, TALLOC_CTX *mem_ctx,
                      char **hostname, char **sharename);
 bool torture_open_connection(struct cli_state **c, int conn_index);
 bool torture_init_connection(struct cli_state **pcli);
-bool torture_cli_session_setup2(struct cli_state *cli, uint16 *new_vuid);
+bool torture_cli_session_setup2(struct cli_state *cli, uint16_t *new_vuid);
 bool torture_close_connection(struct cli_state *c);
 bool torture_ioctl_test(int dummy);
 bool torture_chkpath_test(int dummy);