samba: pass down size_t instead of int to add_string_to_array().

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Mon Nov 17 19:53:22 CET 2014 on sn-devel-104

The last 3 patches address
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10942
cleanup add_string_to_array and usage

diff --git a/libcli/ldap/ldap_message.h b/libcli/ldap/ldap_message.h
index eb7e6206b1594a3e71b54b48304d4861d8475330..b41f7f5497b984f5ce192bc6ef6c7175dbf84785 100644 (file)
--- a/libcli/ldap/ldap_message.h
+++ b/libcli/ldap/ldap_message.h
@@ -104,7 +104,7 @@ struct ldap_SearchRequest {
        uint32_t sizelimit;
        bool attributesonly;
        struct ldb_parse_tree *tree;
-       int num_attributes;
+       size_t num_attributes;
        const char * const *attributes;
 };
 

diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index df84475754ddb3195d480a099cdeb9f7f5117f7f..56d019db5f7846c44d75365bc4897a34df37be33 100644 (file)
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -524,7 +524,7 @@ static NTSTATUS gp_glob_ext_list(TALLOC_CTX *mem_ctx,
                name[PTR_DIFF(p, dirent->d_name)] = 0;
 
                if (!add_string_to_array(mem_ctx, name, ext_list,
-                                        (int *)ext_list_len)) {
+                                        ext_list_len)) {
                        closedir(dir);
                        return NT_STATUS_NO_MEMORY;
                }

diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c
index 0cc0240bcc29b9d855c6af37659496a81751b19b..7a190bd2c4755460fbe2f156fe3e3d43682f34da 100644 (file)
--- a/source3/lib/eventlog/eventlog.c
+++ b/source3/lib/eventlog/eventlog.c
@@ -581,7 +581,7 @@ bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, struct eventlog_Record_tdb
                }
        } else if ( 0 == strncmp( start, "STR", stop - start ) ) {
                size_t tmp_len;
-               int num_of_strings;
+               size_t num_of_strings;
                /* skip past initial ":" */
                stop++;
                /* now skip any other leading whitespace */

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 8d104c2f595175b54e339ed59e077ffba4ca6d1a..b9adc9d9184428d4dd330671c25a45df18821b62 100644 (file)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -3300,7 +3300,7 @@ ADS_STATUS ads_get_joinable_ous(ADS_STRUCT *ads,
 
                if (!add_string_to_array(mem_ctx, dn,
                                         (const char ***)ous,
-                                        (int *)num_ous)) {
+                                        num_ous)) {
                        TALLOC_FREE(dn);
                        ads_msgfree(ads, res);
                        return ADS_ERROR(LDAP_NO_MEMORY);

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index aa7b5cb83e948ea5c579f3362c6b3659ce662675..9a34e9423d325981c3f5f2ea46522e9f37903f72 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -421,7 +421,7 @@ static ADS_STATUS libnet_join_set_machine_spn(TALLOC_CTX *mem_ctx,
        ok = ads_element_in_array(spn_array, num_spns, spn);
        if (!ok) {
                ok = add_string_to_array(spn_array, spn,
-                                        &spn_array, (int *)&num_spns);
+                                        &spn_array, &num_spns);
                if (!ok) {
                        return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
                }
@@ -446,7 +446,7 @@ static ADS_STATUS libnet_join_set_machine_spn(TALLOC_CTX *mem_ctx,
                ok = ads_element_in_array(spn_array, num_spns, spn);
                if (!ok) {
                        ok = add_string_to_array(spn_array, spn,
-                                                &spn_array, (int *)&num_spns);
+                                                &spn_array, &num_spns);
                        if (!ok) {
                                return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
                        }

diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index 46f42d532083d40448d0ec7cb5595385b78b777c..6b0028bdb32ccf6d30ba63fe35eb6a29105d73fe 100644 (file)
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -3335,7 +3335,7 @@ static NTSTATUS init_lsa_right_set(TALLOC_CTX *mem_ctx,
        uint32 i;
        const char *privname;
        const char **privname_array = NULL;
-       int num_priv = 0;
+       size_t num_priv = 0;
 
        for (i=0; i<privileges->count; i++) {
                if (privileges->set[i].luid.high) {

diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index e5ca47406494403d3c86a771ddb7a592a9440e4d..c903ae857d010b228c88bdd50989522a1067b5a7 100644 (file)
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -397,7 +397,7 @@ NTSTATUS _netr_NetrEnumerateTrustedDomains(struct pipes_struct *p,
        NTSTATUS status;
        NTSTATUS result = NT_STATUS_OK;
        DATA_BLOB blob;
-       int num_domains = 0;
+       size_t num_domains = 0;
        const char **trusted_domains = NULL;
        struct lsa_DomainList domain_list;
        struct dcerpc_binding_handle *h = NULL;

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 3812153b5bc5029c4a63aea647c24304d8d33e1d..c4512124490ea384e65c1355cad911358eb90f8a 100644 (file)
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -4897,7 +4897,8 @@ static WERROR string_array_from_driver_info(TALLOC_CTX *mem_ctx,
                                                  const char *arch,
                                                  int version)
 {
-       int i, num_strings = 0;
+       int i;
+       size_t num_strings = 0;
        const char **array = NULL;
 
        if (string_array == NULL) {

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 5c499d46383171a04dd3177c332d6af5b6084bc5..3f83abfb2b7e999090b3cf65c2afad98e6eb4ce3 100644 (file)
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -1659,7 +1659,7 @@ static bool init_drv_info_3_members(TALLOC_CTX *mem_ctx, struct spoolss_AddDrive
                                     char *args)
 {
        char    *str, *str2;
-       int count = 0;
+       size_t count = 0;
        char *saveptr = NULL;
        struct spoolss_StringArray *deps;
        const char **file_array = NULL;
@@ -2636,7 +2636,8 @@ static WERROR cmd_spoolss_setprinterdata(struct rpc_pipe_client *cli,
                data.binary = strhex_to_data_blob(mem_ctx, argv[4]);
                break;
        case REG_MULTI_SZ: {
-               int i, num_strings;
+               int i;
+               size_t num_strings;
                const char **strings = NULL;
 
                num_strings = 0;

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 8bbc886855336b4f2e38b597b9c5a5f269cf7bc4..ee4b4822049f50d53f460268fb992af8b7340f4a 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1443,7 +1443,7 @@ static bool find_new_dc(TALLOC_CTX *mem_ctx,
        int num_dcs = 0;
 
        const char **dcnames = NULL;
-       int num_dcnames = 0;
+       size_t num_dcnames = 0;
 
        struct sockaddr_storage *addrs = NULL;
        int num_addrs = 0;

diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 432e9d5350956e20d7ed6c71a8ce7d12f721236a..6b9666b4e85656f0de40b5cef7a411a10967a0d2 100644 (file)
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -2623,7 +2623,7 @@ static bool rap_get_servername(struct torture_context *tctx,
 static bool find_printers(struct torture_context *tctx,
                          struct dcerpc_pipe *p,
                          const char ***printers,
-                         int *num_printers)
+                         size_t *num_printers)
 {
        struct srvsvc_NetShareEnum r;
        struct srvsvc_NetShareInfoCtr info_ctr;
@@ -2760,7 +2760,7 @@ static bool torture_samba3_rpc_spoolss(struct torture_context *torture)
        struct dcerpc_binding_handle *b;
        struct policy_handle server_handle, printer_handle;
        const char **printers;
-       int num_printers;
+       size_t num_printers;
        struct spoolss_UserLevel1 userlevel1;
        char *servername;
 

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index cdfa2b8a8a7ca61f2fa996125c21b8b5680e0619..e7e98a5a27a5ca33e37adfef1e3d2c59c5de7cb5 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -6938,7 +6938,7 @@ static bool test_GroupList(struct dcerpc_binding_handle *b,
        uint32_t returned_size;
        union samr_DispInfo info;
 
-       int num_names = 0;
+       size_t num_names = 0;
        const char **names = NULL;
 
        bool builtin_domain = dom_sid_compare(domain_sid,

diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 5bf64afa2617e8874bb33fdbe8ebe61b48597664..09272004ef3dfe81af4fff4023a4ee53b9f718ac 100644 (file)
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -530,7 +530,7 @@ static bool test_NetrEnumerateComputerNames_level(struct torture_context *tctx,
                                                  struct dcerpc_pipe *p,
                                                  uint16_t level,
                                                  const char ***names,
-                                                 int *num_names)
+                                                 size_t *num_names)
 {
        NTSTATUS status;
        struct wkssvc_NetrEnumerateComputerNames r;
@@ -666,7 +666,7 @@ static bool test_NetrAddAlternateComputerName(struct torture_context *tctx,
        NTSTATUS status;
        struct wkssvc_NetrAddAlternateComputerName r;
        const char **names = NULL;
-       int num_names = 0;
+       size_t num_names = 0;
        int i;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
@@ -708,7 +708,7 @@ static bool test_NetrRemoveAlternateComputerName(struct torture_context *tctx,
        NTSTATUS status;
        struct wkssvc_NetrRemoveAlternateComputerName r;
        const char **names = NULL;
-       int num_names = 0;
+       size_t num_names = 0;
        int i;
        struct dcerpc_binding_handle *b = p->binding_handle;
 
@@ -781,7 +781,7 @@ static bool test_NetrSetPrimaryComputername(struct torture_context *tctx,
        */
 
        const char **names_o = NULL, **names = NULL;
-       int num_names_o = 0, num_names = 0;
+       size_t num_names_o = 0, num_names = 0;
 
        torture_comment(tctx, "Testing NetrSetPrimaryComputername\n");
 
@@ -887,7 +887,7 @@ static bool test_NetrRenameMachineInDomain2(struct torture_context *tctx,
                                            struct dcerpc_pipe *p)
 {
        const char **names_o = NULL, **names = NULL;
-       int num_names_o = 0, num_names = 0;
+       size_t num_names_o = 0, num_names = 0;
 
        torture_comment(tctx, "Testing NetrRenameMachineInDomain2\n");