s3: libsmb: Convert node_status_query() and associated functions and callers to expec...

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 16b554b44306c97d62967c971b6367a24d230fe1..7c16ec54bdd393c3cb3217df19681146a075848a 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -330,11 +330,11 @@ static int generate_trn_id(void)
 ****************************************************************************/
 
 static struct node_status *parse_node_status(TALLOC_CTX *mem_ctx, char *p,
-                               int *num_names,
+                               size_t *num_names,
                                struct node_status_extra *extra)
 {
        struct node_status *ret;
-       int i;
+       size_t i;
 
        *num_names = CVAL(p,0);
 
@@ -907,13 +907,13 @@ static void node_status_query_done(struct tevent_req *subreq)
 
 NTSTATUS node_status_query_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                                struct node_status **pnode_status,
-                               int *pnum_names,
+                               size_t *pnum_names,
                                struct node_status_extra *extra)
 {
        struct node_status_query_state *state = tevent_req_data(
                req, struct node_status_query_state);
        struct node_status *node_status;
-       int num_names;
+       size_t num_names = 0;
        NTSTATUS status;
 
        if (tevent_req_is_nterror(req, &status)) {
@@ -933,7 +933,7 @@ NTSTATUS node_status_query_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
 NTSTATUS node_status_query(TALLOC_CTX *mem_ctx, struct nmb_name *name,
                           const struct sockaddr_storage *addr,
                           struct node_status **pnode_status,
-                          int *pnum_names,
+                          size_t *pnum_names,
                           struct node_status_extra *extra)
 {
        TALLOC_CTX *frame = talloc_stackframe();
@@ -1013,7 +1013,7 @@ bool name_status_find(const char *q_name,
        char addr[INET6_ADDRSTRLEN];
        struct node_status *addrs = NULL;
        struct nmb_name nname;
-       int count = 0, i;
+       size_t count = 0, i;
        bool result = false;
        NTSTATUS status;
 

diff --git a/source3/libsmb/namequery.h b/source3/libsmb/namequery.h
index e8df065c7e9925bb3410b2589a62fffa790670d0..8d22754d24870bc15d13eda6fb2e34fdd582e832 100644 (file)
--- a/source3/libsmb/namequery.h
+++ b/source3/libsmb/namequery.h
@@ -35,12 +35,12 @@ struct tevent_req *node_status_query_send(TALLOC_CTX *mem_ctx,
                                          const struct sockaddr_storage *addr);
 NTSTATUS node_status_query_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                                struct node_status **pnode_status,
-                               int *pnum_names,
+                               size_t *pnum_names,
                                struct node_status_extra *extra);
 NTSTATUS node_status_query(TALLOC_CTX *mem_ctx, struct nmb_name *name,
                           const struct sockaddr_storage *addr,
                           struct node_status **pnode_status,
-                          int *pnum_names,
+                          size_t *pnum_names,
                           struct node_status_extra *extra);
 bool name_status_find(const char *q_name,
                        int q_type,

diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 388bb9b8a6415b92c4b3aee92aebbfc553a7befc..856cc91391a05822e8a5935432fe67acac564ff5 100644 (file)
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -114,7 +114,8 @@ static bool do_node_status(const char *name,
                struct sockaddr_storage *pss)
 {
        struct nmb_name nname;
-       int count, i, j;
+       size_t count = 0;
+       size_t i, j;
        struct node_status *addrs;
        struct node_status_extra extra;
        fstring cleanname;

diff --git a/source3/winbindd/winbindd_wins_byip.c b/source3/winbindd/winbindd_wins_byip.c
index 14376b8e5add3ce0733bedc2f4d99dfed6dc1c2a..58223d9134813565620790ed1e3e8adb61c03431 100644 (file)
--- a/source3/winbindd/winbindd_wins_byip.c
+++ b/source3/winbindd/winbindd_wins_byip.c
@@ -78,7 +78,8 @@ static void winbindd_wins_byip_done(struct tevent_req *subreq)
        struct winbindd_wins_byip_state *state = tevent_req_data(
                req, struct winbindd_wins_byip_state);
        struct node_status *names;
-       int i, num_names;
+       size_t i;
+       size_t num_names = 0;
        NTSTATUS status;
 
        status = node_status_query_recv(subreq, talloc_tos(), &names,