diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-12-03 06:24:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:18 -0500 |
| commit | 58c326809a816703dc516c3022c9c4dbb9d09445 (patch) | |
| tree | 3900a7b59edf075e09459e0bf5f85097396bd9aa /source4/libcli/namequery.c | |
| parent | c9932a3a92dd7b8696e4e145c7d7e2c080b46ffb (diff) | |
| download | samba-58c326809a816703dc516c3022c9c4dbb9d09445.tar.gz samba-58c326809a816703dc516c3022c9c4dbb9d09445.tar.bz2 samba-58c326809a816703dc516c3022c9c4dbb9d09445.zip | |
r4052: fixed a bunch of code to use the type safe _p allocation macros
(This used to be commit 80d15fa3402a9d1183467463f6b21c0b674bc442)
Diffstat (limited to 'source4/libcli/namequery.c')
| -rw-r--r-- | source4/libcli/namequery.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source4/libcli/namequery.c b/source4/libcli/namequery.c index 85270c1001..66154ef8f6 100644 --- a/source4/libcli/namequery.c +++ b/source4/libcli/namequery.c @@ -63,7 +63,7 @@ static struct node_status *parse_node_status(char *p, int *num_names) if (*num_names == 0) return NULL; - ret = (struct node_status *)malloc(sizeof(struct node_status)* (*num_names)); + ret = malloc_array_p(struct node_status, *num_names); if (!ret) return NULL; p++; @@ -619,7 +619,7 @@ static BOOL resolve_hosts(const char *name, if (((hp = sys_gethostbyname(name)) != NULL) && (hp->h_addr != NULL)) { struct ipv4_addr return_ip; putip((char *)&return_ip,(char *)hp->h_addr); - *return_iplist = (struct ipv4_addr *)malloc(sizeof(struct ipv4_addr)); + *return_iplist = malloc_p(struct ipv4_addr); if(*return_iplist == NULL) { DEBUG(3,("resolve_hosts: malloc fail !\n")); return False; @@ -657,7 +657,7 @@ static BOOL internal_resolve_name(TALLOC_CTX *mem_ctx, const char *name, int nam DEBUG(10, ("internal_resolve_name: looking up %s#%x\n", name, name_type)); if (allzeros || allones || is_address) { - *return_iplist = (struct ipv4_addr *)malloc(sizeof(struct ipv4_addr)); + *return_iplist = malloc_p(struct ipv4_addr); if(*return_iplist == NULL) { DEBUG(3,("internal_resolve_name: malloc fail !\n")); return False; @@ -731,8 +731,7 @@ static BOOL internal_resolve_name(TALLOC_CTX *mem_ctx, const char *name, int nam controllers including the PDC in iplist[1..n]. Iterating over the iplist when the PDC is down will cause two sets of timeouts. */ - if (*return_count && (nodupes_iplist = (struct ipv4_addr *) - malloc(sizeof(struct ipv4_addr) * (*return_count)))) { + if (*return_count && (nodupes_iplist = malloc_array_p(struct ipv4_addr, *return_count))) { int nodupes_count = 0; /* Iterate over return_iplist looking for duplicates */ @@ -1156,7 +1155,7 @@ BOOL get_dc_list(TALLOC_CTX *mem_ctx, const char *domain, struct ipv4_addr **ip_ if ( (num_addresses == 0) && !done_auto_lookup ) return internal_resolve_name(mem_ctx, domain, 0x1C, ip_list, count); - return_iplist = (struct ipv4_addr *)malloc(num_addresses * sizeof(struct ipv4_addr)); + return_iplist = malloc_array_p(struct ipv4_addr, num_addresses); if (return_iplist == NULL) { DEBUG(3,("get_dc_list: malloc fail !\n")); |