Fix C++ warnings

(This used to be commit 01a5c3ea4bf18d99ca1c35e8c38367046e4c867b)

diff --git a/source3/client/client.c b/source3/client/client.c
index bbe5572a2dfba197b7bdb13822ee4cc1ace1ae9b..1e2f96cbf221ac6d3378008687c202c2aa6ea62f 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4060,7 +4060,7 @@ static char **remote_completion(const char *text, int len)
        info.samelen = info.len = len-i-1;
 
        if (i > 0) {
-               info.dirmask = SMB_MALLOC(i+2);
+               info.dirmask = SMB_MALLOC_ARRAY(char, i+2);
                if (!info.dirmask) {
                        goto cleanup;
                }

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index f124821e62a1743a8288d6685dc459beb00e4a76..e0c40b52ed269bf95dd24a89923ab4ba5dc95641 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -592,7 +592,7 @@ bool cli_dfs_get_referral(TALLOC_CTX *ctx,
        *num_refs = 0;
        *refs = NULL;
 
-       param = SMB_MALLOC(2+pathlen+2);
+       param = SMB_MALLOC_ARRAY(char, 2+pathlen+2);
        if (!param) {
                return false;
        }

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 70b4fe7cb312a1712b6cff2c683c4c831c41210d..001a42d4b9a244c32c119840f0555eaa55eddaa8 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -37,8 +37,8 @@ static bool cli_link_internal(struct cli_state *cli, const char *oldname, const
        size_t oldlen = 2*(strlen(oldname)+1);
        size_t newlen = 2*(strlen(newname)+1);
 
-       param = SMB_MALLOC(6+newlen+2);
-       data = SMB_MALLOC(oldlen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+newlen+2);
+       data = SMB_MALLOC_ARRAY(char, oldlen+2);
        if (!param || !data) {
                return false;
        }
@@ -191,7 +191,7 @@ bool cli_unix_getfacl(struct cli_state *cli, const char *name, size_t *prb_size,
        char *rparam=NULL, *rdata=NULL;
        char *p;
 
-       param = SMB_MALLOC(6+nlen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
        if (!param) {
                return false;
        }
@@ -251,7 +251,7 @@ bool cli_unix_stat(struct cli_state *cli, const char *name, SMB_STRUCT_STAT *sbu
 
        ZERO_STRUCTP(sbuf);
 
-       param = SMB_MALLOC(6+nlen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
        if (!param) {
                return false;
        }
@@ -352,7 +352,7 @@ static bool cli_unix_chmod_chown_internal(struct cli_state *cli, const char *fna
        char *rparam=NULL, *rdata=NULL;
        char *p;
 
-       param = SMB_MALLOC(6+nlen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
        if (!param) {
                return false;
        }
@@ -1662,7 +1662,7 @@ bool cli_set_ea_path(struct cli_state *cli, const char *path, const char *ea_nam
        char *p;
        bool ret;
 
-       param = SMB_MALLOC(6+srclen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+srclen+2);
        if (!param) {
                return false;
        }
@@ -1835,7 +1835,7 @@ bool cli_get_ea_list_path(struct cli_state *cli, const char *path,
        size_t srclen = 2*(strlen(path)+1);
        bool ret;
 
-       param = SMB_MALLOC(6+srclen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+srclen+2);
        if (!param) {
                return false;
        }
@@ -1940,7 +1940,7 @@ static int cli_posix_open_internal(struct cli_state *cli, const char *fname, int
        uint32 wire_flags = open_flags_to_wire(flags);
        size_t srclen = 2*(strlen(fname)+1);
 
-       param = SMB_MALLOC(6+srclen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+srclen+2);
        if (!param) {
                return false;
        }
@@ -2025,7 +2025,7 @@ static bool cli_posix_unlink_internal(struct cli_state *cli, const char *fname,
        char *p;
        size_t srclen = 2*(strlen(fname)+1);
 
-       param = SMB_MALLOC(6+srclen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+srclen+2);
        if (!param) {
                return false;
        }

diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index fc47f94aa1e580d28e8faa0aca9a144668a46275..2e4c360507f610c3af851d7261f7d2b95b7f0bdd 100644 (file)
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -255,7 +255,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
                        break;
                }
 
-               param = SMB_MALLOC(12+nlen+last_name_raw.length+2);
+               param = SMB_MALLOC_ARRAY(char, 12+nlen+last_name_raw.length+2);
                if (!param) {
                        break;
                }

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index c10900cf43a720815c63645d94335175317e8a96..410b7cb13832e4908ec217416daf0fd5801bfb63 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -471,7 +471,7 @@ bool cli_qpathinfo(struct cli_state *cli,
        char *p;
        size_t nlen = 2*(strlen(fname)+1);
 
-       param = SMB_MALLOC(6+nlen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
        if (!param) {
                return false;
        }
@@ -560,7 +560,7 @@ bool cli_setpathinfo(struct cli_state *cli, const char *fname,
        char *p;
        size_t nlen = 2*(strlen(fname)+1);
 
-       param = SMB_MALLOC(6+nlen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
        if (!param) {
                return false;
        }
@@ -660,7 +660,7 @@ bool cli_qpathinfo2(struct cli_state *cli, const char *fname,
        char *p;
        size_t nlen = 2*(strlen(fname)+1);
 
-       param = SMB_MALLOC(6+nlen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
        if (!param) {
                return false;
        }
@@ -989,7 +989,7 @@ NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstrin
        unsigned int len;
        size_t nlen = 2*(strlen(fname)+1);
 
-       param = SMB_MALLOC(6+nlen+2);
+       param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
        if (!param) {
                return NT_STATUS_NO_MEMORY;
        }