mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 16:45:24 +00:00
Code Issues Releases Wiki Activity

sizeof style

Browse Source
This commit is contained in:
Andreas Gustafsson
2001-11-12 19:05:39 +00:00
parent e3e94dd137
commit f3ca27e9fe
23 changed files with 187 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/dns/adb.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: adb.c,v 1.190 2001/11/07 22:40:33 gson Exp $ */
/* $Id: adb.c,v 1.191 2001/11/12 19:05:10 gson Exp $ */
/*
* Implementation notes
@@ -1515,7 +1515,7 @@ new_adbfind(dns_adb_t *adb) {
return (NULL);
}
ISC_EVENT_INIT(&h->event, sizeof (isc_event_t), 0, 0, 0, NULL, NULL,
ISC_EVENT_INIT(&h->event, sizeof(isc_event_t), 0, 0, 0, NULL, NULL,
NULL, NULL, h);
h->magic = DNS_ADBFIND_MAGIC;
@@ -2168,7 +2168,7 @@ destroy(dns_adb_t *adb) {
DESTROYLOCK(&adb->lock);
DESTROYLOCK(&adb->mplock);
isc_mem_putanddetach(&adb->mctx, adb, sizeof (dns_adb_t));
isc_mem_putanddetach(&adb->mctx, adb, sizeof(dns_adb_t));
}
@@ -2190,7 +2190,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_timermgr_t *timermgr,
REQUIRE(taskmgr != NULL);
REQUIRE(newadb != NULL && *newadb == NULL);
adb = isc_mem_get(mem, sizeof (dns_adb_t));
adb = isc_mem_get(mem, sizeof(dns_adb_t));
if (adb == NULL)
return (ISC_R_NOMEMORY);
@@ -2216,7 +2216,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_timermgr_t *timermgr,
adb->timermgr = timermgr;
adb->taskmgr = taskmgr;
adb->next_cleanbucket = 0;
ISC_EVENT_INIT(&adb->cevent, sizeof adb->cevent, 0, NULL,
ISC_EVENT_INIT(&adb->cevent, sizeof(adb->cevent), 0, NULL,
DNS_EVENT_ADBCONTROL, shutdown_task, adb,
adb, NULL, NULL);
adb->cevent_sent = ISC_FALSE;
@@ -2265,7 +2265,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_timermgr_t *timermgr,
* Memory pools
*/
#define MPINIT(t, p, n) do { \
result = isc_mempool_create(mem, sizeof (t), &(p)); \
result = isc_mempool_create(mem, sizeof(t), &(p)); \
if (result != ISC_R_SUCCESS) \
goto fail3; \
isc_mempool_setfreemax((p), FREE_ITEMS); \
@@ -2349,7 +2349,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_timermgr_t *timermgr,
fail0c:
DESTROYLOCK(&adb->lock);
fail0b:
isc_mem_putanddetach(&adb->mctx, adb, sizeof (dns_adb_t));
isc_mem_putanddetach(&adb->mctx, adb, sizeof(dns_adb_t));
return (result);
}
@@ -3009,7 +3009,7 @@ dump_entry(FILE *f, dns_adbentry_t *entry, isc_boolean_t debug)
isc_netaddr_t netaddr;
isc_netaddr_fromsockaddr(&netaddr, &entry->sockaddr);
isc_netaddr_format(&netaddr, addrbuf, sizeof addrbuf);
isc_netaddr_format(&netaddr, addrbuf, sizeof(addrbuf));
if (debug)
fprintf(f, ";\t%p: refcnt %u flags %08x \n",
@@ -3048,11 +3048,11 @@ dns_adb_dumpfind(dns_adbfind_t *find, FILE *f) {
switch (sa->type.sa.sa_family) {
case AF_INET:
tmpp = inet_ntop(AF_INET, &sa->type.sin.sin_addr,
tmp, sizeof tmp);
tmp, sizeof(tmp));
break;
case AF_INET6:
tmpp = inet_ntop(AF_INET6, &sa->type.sin6.sin6_addr,
tmp, sizeof tmp);
tmp, sizeof(tmp));
break;
default:
tmpp = "UnkFamily";

18
lib/dns/byaddr.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: byaddr.c,v 1.29 2001/06/04 19:32:57 tale Exp $ */
/* $Id: byaddr.c,v 1.30 2001/11/12 19:05:12 gson Exp $ */
#include <config.h>
@@ -140,7 +140,7 @@ copy_ptr_targets(dns_byaddr_t *byaddr, dns_rdataset_t *rdataset) {
result = dns_rdata_tostruct(&rdata, &ptr, NULL);
if (result != ISC_R_SUCCESS)
return (result);
name = isc_mem_get(byaddr->mctx, sizeof *name);
name = isc_mem_get(byaddr->mctx, sizeof(*name));
if (name == NULL) {
dns_rdata_freestruct(&ptr);
return (ISC_R_NOMEMORY);
@@ -149,7 +149,7 @@ copy_ptr_targets(dns_byaddr_t *byaddr, dns_rdataset_t *rdataset) {
result = dns_name_dup(&ptr.ptr, byaddr->mctx, name);
dns_rdata_freestruct(&ptr);
if (result != ISC_R_SUCCESS) {
isc_mem_put(byaddr->mctx, name, sizeof *name);
isc_mem_put(byaddr->mctx, name, sizeof(*name));
return (ISC_R_NOMEMORY);
}
ISC_LIST_APPEND(byaddr->event->names, name, link);
@@ -201,7 +201,7 @@ bevent_destroy(isc_event_t *event) {
next_name = ISC_LIST_NEXT(name, link);
ISC_LIST_UNLINK(bevent->names, name, link);
dns_name_free(name, mctx);
isc_mem_put(mctx, name, sizeof *name);
isc_mem_put(mctx, name, sizeof(*name));
}
isc_mem_put(mctx, event, event->ev_size);
}
@@ -215,18 +215,18 @@ dns_byaddr_create(isc_mem_t *mctx, isc_netaddr_t *address, dns_view_t *view,
dns_byaddr_t *byaddr;
isc_event_t *ievent;
byaddr = isc_mem_get(mctx, sizeof *byaddr);
byaddr = isc_mem_get(mctx, sizeof(*byaddr));
if (byaddr == NULL)
return (ISC_R_NOMEMORY);
byaddr->mctx = mctx;
byaddr->options = options;
byaddr->event = isc_mem_get(mctx, sizeof *byaddr->event);
byaddr->event = isc_mem_get(mctx, sizeof(*byaddr->event));
if (byaddr->event == NULL) {
result = ISC_R_NOMEMORY;
goto cleanup_byaddr;
}
ISC_EVENT_INIT(byaddr->event, sizeof *byaddr->event, 0, NULL,
ISC_EVENT_INIT(byaddr->event, sizeof(*byaddr->event), 0, NULL,
DNS_EVENT_BYADDRDONE, action, arg, byaddr,
bevent_destroy, mctx);
byaddr->event->result = ISC_R_FAILURE;
@@ -272,7 +272,7 @@ dns_byaddr_create(isc_mem_t *mctx, isc_netaddr_t *address, dns_view_t *view,
isc_task_detach(&byaddr->task);
cleanup_byaddr:
isc_mem_put(mctx, byaddr, sizeof *byaddr);
isc_mem_put(mctx, byaddr, sizeof(*byaddr));
return (result);
}
@@ -305,7 +305,7 @@ dns_byaddr_destroy(dns_byaddr_t **byaddrp) {
DESTROYLOCK(&byaddr->lock);
byaddr->magic = 0;
isc_mem_put(byaddr->mctx, byaddr, sizeof *byaddr);
isc_mem_put(byaddr->mctx, byaddr, sizeof(*byaddr));
*byaddrp = NULL;
}

8
lib/dns/cache.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cache.c,v 1.49 2001/10/23 01:21:44 marka Exp $ */
/* $Id: cache.c,v 1.50 2001/11/12 19:05:13 gson Exp $ */
#include <config.h>
@@ -167,7 +167,7 @@ dns_cache_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
REQUIRE(*cachep == NULL);
REQUIRE(mctx != NULL);
cache = isc_mem_get(mctx, sizeof *cache);
cache = isc_mem_get(mctx, sizeof(*cache));
if (cache == NULL)
return (ISC_R_NOMEMORY);
@@ -253,7 +253,7 @@ dns_cache_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
cleanup_lock:
DESTROYLOCK(&cache->lock);
cleanup_mem:
isc_mem_put(mctx, cache, sizeof *cache);
isc_mem_put(mctx, cache, sizeof(*cache));
isc_mem_detach(&mctx);
return (result);
}
@@ -305,7 +305,7 @@ cache_free(dns_cache_t *cache) {
DESTROYLOCK(&cache->filelock);
cache->magic = 0;
mctx = cache->mctx;
isc_mem_put(cache->mctx, cache, sizeof *cache);
isc_mem_put(cache->mctx, cache, sizeof(*cache));
isc_mem_detach(&mctx);
}

12
lib/dns/dispatch.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dispatch.c,v 1.102 2001/09/20 16:48:20 gson Exp $ */
/* $Id: dispatch.c,v 1.103 2001/11/12 19:05:14 gson Exp $ */
#include <config.h>
@@ -243,7 +243,7 @@ request_log(dns_dispatch_t *disp, dns_dispentry_t *resp,
va_end(ap);
if (VALID_RESPONSE(resp)) {
isc_sockaddr_format(&resp->host, peerbuf, sizeof peerbuf);
isc_sockaddr_format(&resp->host, peerbuf, sizeof(peerbuf));
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DISPATCH,
DNS_LOGMODULE_DISPATCH, level,
"dispatch %p response %p %s: %s", disp, resp,
@@ -266,7 +266,7 @@ reseed_lfsr(isc_lfsr_t *lfsr, void *arg)
REQUIRE(VALID_DISPATCHMGR(mgr));
if (mgr->entropy != NULL) {
result = isc_entropy_getdata(mgr->entropy, &val, sizeof val,
result = isc_entropy_getdata(mgr->entropy, &val, sizeof(val),
NULL, 0);
INSIST(result == ISC_R_SUCCESS);
lfsr->count = (val & 0x1f) + 32;
@@ -1375,7 +1375,7 @@ dispatch_allocate(dns_dispatchmgr_t *mgr, unsigned int maxrequests,
ISC_LINK_INIT(disp, link);
disp->refcount = 1;
disp->recv_pending = 0;
memset(&disp->local, 0, sizeof disp->local);
memset(&disp->local, 0, sizeof(disp->local));
disp->shutting_down = 0;
disp->shutdown_out = 0;
disp->connected = 0;
@@ -1986,7 +1986,7 @@ do_cancel(dns_dispatch_t *disp, dns_dispentry_t *resp) {
* Send the shutdown failsafe event to this resp.
*/
ev = disp->failsafe_ev;
ISC_EVENT_INIT(ev, sizeof (*ev), 0, NULL, DNS_EVENT_DISPATCH,
ISC_EVENT_INIT(ev, sizeof(*ev), 0, NULL, DNS_EVENT_DISPATCH,
resp->action, resp->arg, resp, NULL, NULL);
ev->result = disp->shutdown_why;
ev->buffer.base = NULL;
@@ -2108,7 +2108,7 @@ dns_dispatchmgr_dump(dns_dispatchmgr_t *mgr) {
disp = ISC_LIST_HEAD(mgr->list);
while (disp != NULL) {
isc_sockaddr_format(&disp->local, foo, sizeof foo);
isc_sockaddr_format(&disp->local, foo, sizeof(foo));
printf("\tdispatch %p, addr %s\n", disp, foo);
disp = ISC_LIST_NEXT(disp, link);
}

16
lib/dns/gen.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: gen.c,v 1.65 2001/08/08 22:54:39 gson Exp $ */
/* $Id: gen.c,v 1.66 2001/11/12 19:05:15 gson Exp $ */
#include <config.h>
@@ -326,7 +326,7 @@ void
add(int rdclass, const char *classname, int type, const char *typename,
const char *dirname)
{
struct tt *newtt = (struct tt *)malloc(sizeof *newtt);
struct tt *newtt = (struct tt *)malloc(sizeof(*newtt));
struct tt *tt, *oldtt;
struct cc *newcc;
struct cc *cc, *oldcc;
@@ -375,7 +375,7 @@ add(int rdclass, const char *classname, int type, const char *typename,
if (rdclass == 0)
return;
newcc = (struct cc *)malloc(sizeof *newcc);
newcc = (struct cc *)malloc(sizeof(*newcc));
newcc->rdclass = rdclass;
strcpy(newcc->classname, classname);
cc = classes;
@@ -400,8 +400,8 @@ add(int rdclass, const char *classname, int type, const char *typename,
void
sd(int rdclass, const char *classname, const char *dirname, char filetype) {
char buf[sizeof "0123456789_65535.h"];
char fmt[sizeof "%10[-0-9a-z]_%d.h"];
char buf[sizeof("0123456789_65535.h")];
char fmt[sizeof("%10[-0-9a-z]_%d.h")];
int type;
char typename[11];
isc_dir_t dir;
@@ -806,7 +806,7 @@ main(int argc, char **argv) {
} else if (structs) {
if (prefix != NULL) {
if ((fd = fopen(prefix,"r")) != NULL) {
while (fgets(buf, sizeof buf, fd) != NULL)
while (fgets(buf, sizeof(buf), fd) != NULL)
fputs(buf, stdout);
fclose(fd);
}
@@ -815,14 +815,14 @@ main(int argc, char **argv) {
sprintf(buf, "%s/%s_%d.h",
tt->dirname, tt->typename, tt->type);
if ((fd = fopen(buf,"r")) != NULL) {
while (fgets(buf, sizeof buf, fd) != NULL)
while (fgets(buf, sizeof(buf), fd) != NULL)
fputs(buf, stdout);
fclose(fd);
}
}
if (suffix != NULL) {
if ((fd = fopen(suffix,"r")) != NULL) {
while (fgets(buf, sizeof buf, fd) != NULL)
while (fgets(buf, sizeof(buf), fd) != NULL)
fputs(buf, stdout);
fclose(fd);
}

12
lib/dns/keytable.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: keytable.c,v 1.26 2001/06/04 19:33:03 tale Exp $ */
/* $Id: keytable.c,v 1.27 2001/11/12 19:05:16 gson Exp $ */
#include <config.h>
@@ -77,7 +77,7 @@ dns_keytable_create(isc_mem_t *mctx, dns_keytable_t **keytablep) {
REQUIRE(keytablep != NULL && *keytablep == NULL);
keytable = isc_mem_get(mctx, sizeof *keytable);
keytable = isc_mem_get(mctx, sizeof(*keytable));
if (keytable == NULL)
return (ISC_R_NOMEMORY);
@@ -119,7 +119,7 @@ dns_keytable_create(isc_mem_t *mctx, dns_keytable_t **keytablep) {
dns_rbt_destroy(&keytable->table);
cleanup_keytable:
isc_mem_put(mctx, keytable, sizeof *keytable);
isc_mem_put(mctx, keytable, sizeof(*keytable));
return (result);
}
@@ -175,7 +175,7 @@ dns_keytable_detach(dns_keytable_t **keytablep) {
isc_rwlock_destroy(&keytable->rwlock);
DESTROYLOCK(&keytable->lock);
keytable->magic = 0;
isc_mem_put(keytable->mctx, keytable, sizeof *keytable);
isc_mem_put(keytable->mctx, keytable, sizeof(*keytable));
}
*keytablep = NULL;
@@ -197,7 +197,7 @@ dns_keytable_add(dns_keytable_t *keytable, dst_key_t **keyp) {
keyname = dst_key_name(*keyp);
knode = isc_mem_get(keytable->mctx, sizeof *knode);
knode = isc_mem_get(keytable->mctx, sizeof(*knode));
if (knode == NULL)
return (ISC_R_NOMEMORY);
@@ -219,7 +219,7 @@ dns_keytable_add(dns_keytable_t *keytable, dst_key_t **keyp) {
RWUNLOCK(&keytable->rwlock, isc_rwlocktype_write);
if (knode != NULL)
isc_mem_put(keytable->mctx, knode, sizeof *knode);
isc_mem_put(keytable->mctx, knode, sizeof(*knode));
return (result);
}

10
lib/dns/lookup.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lookup.c,v 1.9 2001/02/05 19:47:03 bwelling Exp $ */
/* $Id: lookup.c,v 1.10 2001/11/12 19:05:17 gson Exp $ */
#include <config.h>
@@ -385,14 +385,14 @@ dns_lookup_create(isc_mem_t *mctx, dns_name_t *name, dns_rdatatype_t type,
dns_lookup_t *lookup;
isc_event_t *ievent;
lookup = isc_mem_get(mctx, sizeof *lookup);
lookup = isc_mem_get(mctx, sizeof(*lookup));
if (lookup == NULL)
return (ISC_R_NOMEMORY);
lookup->mctx = mctx;
lookup->options = options;
ievent = isc_event_allocate(mctx, lookup, DNS_EVENT_LOOKUPDONE,
action, arg, sizeof *lookup->event);
action, arg, sizeof(*lookup->event));
if (ievent == NULL) {
result = ISC_R_NOMEMORY;
goto cleanup_lookup;
@@ -447,7 +447,7 @@ dns_lookup_create(isc_mem_t *mctx, dns_name_t *name, dns_rdatatype_t type,
isc_task_detach(&lookup->task);
cleanup_lookup:
isc_mem_put(mctx, lookup, sizeof *lookup);
isc_mem_put(mctx, lookup, sizeof(*lookup));
return (result);
}
@@ -486,7 +486,7 @@ dns_lookup_destroy(dns_lookup_t **lookupp) {
DESTROYLOCK(&lookup->lock);
lookup->magic = 0;
isc_mem_put(lookup->mctx, lookup, sizeof *lookup);
isc_mem_put(lookup->mctx, lookup, sizeof(*lookup));
*lookupp = NULL;
}

24
lib/dns/master.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: master.c,v 1.127 2001/09/30 04:31:26 marka Exp $ */
/* $Id: master.c,v 1.128 2001/11/12 19:05:20 gson Exp $ */
#include <config.h>
@@ -351,7 +351,7 @@ incctx_destroy(isc_mem_t *mctx, dns_incctx_t *ictx) {
parent = ictx->parent;
ictx->parent = NULL;
isc_mem_put(mctx, ictx, sizeof *ictx);
isc_mem_put(mctx, ictx, sizeof(*ictx));
if (parent != NULL) {
ictx = parent;
@@ -389,7 +389,7 @@ incctx_create(isc_mem_t *mctx, dns_name_t *origin, dns_incctx_t **ictxp) {
isc_region_t r;
int i;
ictx = isc_mem_get(mctx, sizeof *ictx);
ictx = isc_mem_get(mctx, sizeof(*ictx));
if (ictx == NULL)
return (ISC_R_NOMEMORY);
@@ -445,7 +445,7 @@ loadctx_create(isc_mem_t *mctx, unsigned int options, dns_name_t *top,
return (ISC_R_NOMEMORY);
result = isc_mutex_init(&lctx->lock);
if (result != ISC_R_SUCCESS) {
isc_mem_put(mctx, lctx, sizeof *lctx);
isc_mem_put(mctx, lctx, sizeof(*lctx));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() failed: %s",
isc_result_totext(result));
@@ -461,7 +461,7 @@ loadctx_create(isc_mem_t *mctx, unsigned int options, dns_name_t *top,
result = isc_lex_create(mctx, TOKENSIZ, &lctx->lex);
if (result != ISC_R_SUCCESS)
goto cleanup_inc;
memset(specials, 0, sizeof specials);
memset(specials, 0, sizeof(specials));
specials['('] = 1;
specials[')'] = 1;
specials['"'] = 1;
@@ -1609,9 +1609,9 @@ load(dns_loadctx_t *lctx) {
ISC_LIST_UNLINK(glue_list, this, link);
if (rdatalist != NULL)
isc_mem_put(mctx, rdatalist,
rdatalist_size * sizeof *rdatalist);
rdatalist_size * sizeof(*rdatalist));
if (rdata != NULL)
isc_mem_put(mctx, rdata, rdata_size * sizeof *rdata);
isc_mem_put(mctx, rdata, rdata_size * sizeof(*rdata));
if (target_mem != NULL)
isc_mem_put(mctx, target_mem, target_size);
if (include_file != NULL)
@@ -1877,7 +1877,7 @@ grow_rdatalist(int new_len, dns_rdatalist_t *old, int old_len,
ISC_LIST(dns_rdatalist_t) save;
dns_rdatalist_t *this;
new = isc_mem_get(mctx, new_len * sizeof *new);
new = isc_mem_get(mctx, new_len * sizeof(*new));
if (new == NULL)
return (NULL);
@@ -1909,7 +1909,7 @@ grow_rdatalist(int new_len, dns_rdatalist_t *old, int old_len,
INSIST(rdlcount == old_len);
if (old != NULL)
isc_mem_put(mctx, old, old_len * sizeof *old);
isc_mem_put(mctx, old, old_len * sizeof(*old));
return (new);
}
@@ -1928,10 +1928,10 @@ grow_rdata(int new_len, dns_rdata_t *old, int old_len,
dns_rdatalist_t *this;
dns_rdata_t *rdata;
new = isc_mem_get(mctx, new_len * sizeof *new);
new = isc_mem_get(mctx, new_len * sizeof(*new));
if (new == NULL)
return (NULL);
memset(new, 0, new_len * sizeof *new);
memset(new, 0, new_len * sizeof(*new));
/*
* Copy current relinking.
@@ -1972,7 +1972,7 @@ grow_rdata(int new_len, dns_rdata_t *old, int old_len,
}
INSIST(rdcount == old_len);
if (old != NULL)
isc_mem_put(mctx, old, old_len * sizeof *old);
isc_mem_put(mctx, old, old_len * sizeof(*old));
return (new);
}

4
lib/dns/masterdump.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: masterdump.c,v 1.61 2001/10/25 23:18:05 gson Exp $ */
/* $Id: masterdump.c,v 1.62 2001/11/12 19:05:21 gson Exp $ */
#include <config.h>
@@ -424,7 +424,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
INDENT_TO(ttl_column);
length = sprintf(ttlbuf, "%u", rdataset->ttl);
INSIST(length <= sizeof ttlbuf);
INSIST(length <= sizeof(ttlbuf));
isc_buffer_availableregion(target, &r);
if (r.length < length)
return (ISC_R_NOSPACE);

4
lib/dns/message.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: message.c,v 1.195 2001/10/01 18:54:01 gson Exp $ */
/* $Id: message.c,v 1.196 2001/11/12 19:05:22 gson Exp $ */
/***
*** Imports
@@ -2941,7 +2941,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg,
isc_result_t
dns_message_totext(dns_message_t *msg, const dns_master_style_t *style,
dns_messagetextflag_t flags, isc_buffer_t *target) {
char buf[sizeof "1234567890"];
char buf[sizeof("1234567890")];
isc_result_t result;
REQUIRE(DNS_MESSAGE_VALID(msg));

4
lib/dns/name.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: name.c,v 1.127 2001/06/28 21:34:11 gson Exp $ */
/* $Id: name.c,v 1.128 2001/11/12 19:05:24 gson Exp $ */
#include <config.h>
@@ -2174,7 +2174,7 @@ compact(dns_name_t *name, unsigned char *offsets) {
*/
again:
memset(tail, 0, sizeof tail);
memset(tail, 0, sizeof(tail));
INSIST(name->labels != 0);
n = name->labels - 1;

12
lib/dns/peer.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: peer.c,v 1.15 2001/11/09 04:21:55 marka Exp $ */
/* $Id: peer.c,v 1.16 2001/11/12 19:05:26 gson Exp $ */
#include <config.h>
@@ -50,7 +50,7 @@ dns_peerlist_new(isc_mem_t *mem, dns_peerlist_t **list) {
REQUIRE(list != NULL);
l = isc_mem_get(mem, sizeof *l);
l = isc_mem_get(mem, sizeof(*l));
if (l == NULL) {
return (ISC_R_NOMEMORY);
}
@@ -125,7 +125,7 @@ dns_peerlist_delete(dns_peerlist_t **list) {
}
l->magic = 0;
isc_mem_put(l->mem, l, sizeof *l);
isc_mem_put(l->mem, l, sizeof(*l));
*list = NULL;
@@ -189,7 +189,7 @@ dns_peer_new(isc_mem_t *mem, isc_netaddr_t *addr, dns_peer_t **peerptr) {
REQUIRE(peerptr != NULL);
peer = isc_mem_get(mem, sizeof *peer);
peer = isc_mem_get(mem, sizeof(*peer));
if (peer == NULL) {
return (ISC_R_NOMEMORY);
}
@@ -205,7 +205,7 @@ dns_peer_new(isc_mem_t *mem, isc_netaddr_t *addr, dns_peer_t **peerptr) {
peer->key = NULL;
peer->refs = 1;
memset(&peer->bitflags, 0x0, sizeof peer->bitflags);
memset(&peer->bitflags, 0x0, sizeof(peer->bitflags));
ISC_LINK_INIT(peer, next);
@@ -272,7 +272,7 @@ dns_peer_delete(dns_peer_t **peer) {
isc_mem_put(mem, p->key, sizeof(dns_name_t));
}
isc_mem_put(mem, p, sizeof *p);
isc_mem_put(mem, p, sizeof(*p));
*peer = NULL;

62
lib/dns/rbtdb.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rbtdb.c,v 1.171 2001/10/27 00:27:54 gson Exp $ */
/* $Id: rbtdb.c,v 1.172 2001/11/12 19:05:27 gson Exp $ */
/*
* Principal Author: Bob Halley
@@ -367,7 +367,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb) {
if (rbtdb->current_version != NULL)
isc_mem_put(rbtdb->common.mctx, rbtdb->current_version,
sizeof (rbtdb_version_t));
sizeof(rbtdb_version_t));
if (dns_name_dynamic(&rbtdb->common.origin))
dns_name_free(&rbtdb->common.origin, rbtdb->common.mctx);
if (rbtdb->tree != NULL)
@@ -375,7 +375,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb) {
for (i = 0; i < rbtdb->node_lock_count; i++)
DESTROYLOCK(&rbtdb->node_locks[i].lock);
isc_mem_put(rbtdb->common.mctx, rbtdb->node_locks,
rbtdb->node_lock_count * sizeof (rbtdb_nodelock_t));
rbtdb->node_lock_count * sizeof(rbtdb_nodelock_t));
isc_rwlock_destroy(&rbtdb->tree_lock);
isc_refcount_destroy(&rbtdb->references);
DESTROYLOCK(&rbtdb->lock);
@@ -383,7 +383,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb) {
rbtdb->common.impmagic = 0;
ondest = rbtdb->common.ondest;
mctx = rbtdb->common.mctx;
isc_mem_put(mctx, rbtdb, sizeof *rbtdb);
isc_mem_put(mctx, rbtdb, sizeof(*rbtdb));
isc_mem_detach(&mctx);
isc_ondestroy_notify(&ondest, rbtdb);
}
@@ -450,7 +450,7 @@ allocate_version(isc_mem_t *mctx, rbtdb_serial_t serial,
{
rbtdb_version_t *version;
version = isc_mem_get(mctx, sizeof *version);
version = isc_mem_get(mctx, sizeof(*version));
if (version == NULL)
return (NULL);
version->serial = serial;
@@ -521,7 +521,7 @@ add_changed(dns_rbtdb_t *rbtdb, rbtdb_version_t *version,
* Caller must be holding the node lock.
*/
changed = isc_mem_get(rbtdb->common.mctx, sizeof *changed);
changed = isc_mem_get(rbtdb->common.mctx, sizeof(*changed));
LOCK(&rbtdb->lock);
@@ -547,10 +547,10 @@ free_rdataset(isc_mem_t *mctx, rdatasetheader_t *rdataset) {
unsigned int size;
if ((rdataset->attributes & RDATASET_ATTR_NONEXISTENT) != 0)
size = sizeof *rdataset;
size = sizeof(*rdataset);
else
size = dns_rdataslab_size((unsigned char *)rdataset,
sizeof *rdataset);
sizeof(*rdataset));
isc_mem_put(mctx, rdataset, size);
}
@@ -1029,7 +1029,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
if (cleanup_version != NULL)
isc_mem_put(rbtdb->common.mctx, cleanup_version,
sizeof *cleanup_version);
sizeof(*cleanup_version));
if (!EMPTY(cleanup_list)) {
for (changed = HEAD(cleanup_list);
@@ -1053,7 +1053,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
UNLOCK(lock);
isc_mem_put(rbtdb->common.mctx, changed,
sizeof *changed);
sizeof(*changed));
}
}
@@ -1416,7 +1416,7 @@ valid_glue(rbtdb_search_t *search, dns_name_t *name, rbtdb_rdatatype_t type,
}
header = search->zonecut_rdataset;
raw = (unsigned char *)header + sizeof *header;
raw = (unsigned char *)header + sizeof(*header);
count = raw[0] * 256 + raw[1];
raw += 2;
@@ -3014,7 +3014,7 @@ createiterator(dns_db_t *db, isc_boolean_t relative_names,
REQUIRE(VALID_RBTDB(rbtdb));
rbtdbiter = isc_mem_get(rbtdb->common.mctx, sizeof *rbtdbiter);
rbtdbiter = isc_mem_get(rbtdb->common.mctx, sizeof(*rbtdbiter));
if (rbtdbiter == NULL)
return (ISC_R_NOMEMORY);
@@ -3214,7 +3214,7 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
REQUIRE(VALID_RBTDB(rbtdb));
iterator = isc_mem_get(rbtdb->common.mctx, sizeof *iterator);
iterator = isc_mem_get(rbtdb->common.mctx, sizeof(*iterator));
if (iterator == NULL)
return (ISC_R_NOMEMORY);
@@ -3525,7 +3525,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
result = dns_rdataslab_merge(
(unsigned char *)header,
(unsigned char *)newheader,
(unsigned int)(sizeof *newheader),
(unsigned int)(sizeof(*newheader)),
rbtdb->common.mctx,
rbtdb->common.rdclass,
(dns_rdatatype_t)header->type,
@@ -3667,7 +3667,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
result = dns_rdataslab_fromrdataset(rdataset, rbtdb->common.mctx,
&region,
sizeof (rdatasetheader_t));
sizeof(rdatasetheader_t));
if (result != ISC_R_SUCCESS)
return (result);
@@ -3730,7 +3730,7 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
result = dns_rdataslab_fromrdataset(rdataset, rbtdb->common.mctx,
&region,
sizeof (rdatasetheader_t));
sizeof(rdatasetheader_t));
if (result != ISC_R_SUCCESS)
return (result);
newheader = (rdatasetheader_t *)region.base;
@@ -3778,7 +3778,7 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
result = dns_rdataslab_subtract(
(unsigned char *)header,
(unsigned char *)newheader,
(unsigned int)(sizeof *newheader),
(unsigned int)(sizeof(*newheader)),
rbtdb->common.mctx,
rbtdb->common.rdclass,
(dns_rdatatype_t)header->type,
@@ -3799,7 +3799,7 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
*/
free_rdataset(rbtdb->common.mctx, newheader);
newheader = isc_mem_get(rbtdb->common.mctx,
sizeof *newheader);
sizeof(*newheader));
if (newheader == NULL) {
result = ISC_R_NOMEMORY;
goto unlock;
@@ -3866,7 +3866,7 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
if (type == dns_rdatatype_sig && covers == 0)
return (ISC_R_NOTIMPLEMENTED);
newheader = isc_mem_get(rbtdb->common.mctx, sizeof *newheader);
newheader = isc_mem_get(rbtdb->common.mctx, sizeof(*newheader));
if (newheader == NULL)
return (ISC_R_NOMEMORY);
newheader->ttl = 0;
@@ -3940,7 +3940,7 @@ loading_addrdataset(void *arg, dns_name_t *name, dns_rdataset_t *rdataset) {
result = dns_rdataslab_fromrdataset(rdataset, rbtdb->common.mctx,
&region,
sizeof (rdatasetheader_t));
sizeof(rdatasetheader_t));
if (result != ISC_R_SUCCESS)
return (result);
newheader = (rdatasetheader_t *)region.base;
@@ -3971,7 +3971,7 @@ beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp, dns_dbload_t **dbloadp) {
REQUIRE(VALID_RBTDB(rbtdb));
loadctx = isc_mem_get(rbtdb->common.mctx, sizeof *loadctx);
loadctx = isc_mem_get(rbtdb->common.mctx, sizeof(*loadctx));
if (loadctx == NULL)
return (ISC_R_NOMEMORY);
@@ -4066,7 +4066,7 @@ endload(dns_db_t *db, dns_dbload_t **dbloadp) {
*dbloadp = NULL;
isc_mem_put(rbtdb->common.mctx, loadctx, sizeof *loadctx);
isc_mem_put(rbtdb->common.mctx, loadctx, sizeof(*loadctx));
return (ISC_R_SUCCESS);
}
@@ -4211,10 +4211,10 @@ dns_rbtdb_create
UNUSED(argv);
UNUSED(driverarg);
rbtdb = isc_mem_get(mctx, sizeof *rbtdb);
rbtdb = isc_mem_get(mctx, sizeof(*rbtdb));
if (rbtdb == NULL)
return (ISC_R_NOMEMORY);
memset(rbtdb, '\0', sizeof *rbtdb);
memset(rbtdb, '\0', sizeof(*rbtdb));
dns_name_init(&rbtdb->common.origin, NULL);
rbtdb->common.attributes = 0;
if (type == dns_dbtype_cache) {
@@ -4230,7 +4230,7 @@ dns_rbtdb_create
result = isc_mutex_init(&rbtdb->lock);
if (result != ISC_R_SUCCESS) {
isc_mem_put(mctx, rbtdb, sizeof *rbtdb);
isc_mem_put(mctx, rbtdb, sizeof(*rbtdb));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() failed: %s",
isc_result_totext(result));
@@ -4240,7 +4240,7 @@ dns_rbtdb_create
result = isc_rwlock_init(&rbtdb->tree_lock, 0, 0);
if (result != ISC_R_SUCCESS) {
DESTROYLOCK(&rbtdb->lock);
isc_mem_put(mctx, rbtdb, sizeof *rbtdb);
isc_mem_put(mctx, rbtdb, sizeof(*rbtdb));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_rwlock_init() failed: %s",
isc_result_totext(result));
@@ -4252,7 +4252,7 @@ dns_rbtdb_create
if (rbtdb->node_lock_count == 0)
rbtdb->node_lock_count = DEFAULT_NODE_LOCK_COUNT;
rbtdb->node_locks = isc_mem_get(mctx, rbtdb->node_lock_count *
sizeof (rbtdb_nodelock_t));
sizeof(rbtdb_nodelock_t));
for (i = 0; i < (int)(rbtdb->node_lock_count); i++) {
result = isc_mutex_init(&rbtdb->node_locks[i].lock);
if (result != ISC_R_SUCCESS) {
@@ -4263,10 +4263,10 @@ dns_rbtdb_create
}
isc_mem_put(mctx, rbtdb->node_locks,
rbtdb->node_lock_count *
sizeof (rbtdb_nodelock_t));
sizeof(rbtdb_nodelock_t));
isc_rwlock_destroy(&rbtdb->tree_lock);
DESTROYLOCK(&rbtdb->lock);
isc_mem_put(mctx, rbtdb, sizeof *rbtdb);
isc_mem_put(mctx, rbtdb, sizeof(*rbtdb));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() failed: %s",
isc_result_totext(result));
@@ -4480,7 +4480,7 @@ rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) {
&rbtiterator->common.version, ISC_FALSE);
detachnode(rbtiterator->common.db, &rbtiterator->common.node);
isc_mem_put(rbtiterator->common.db->mctx, rbtiterator,
sizeof *rbtiterator);
sizeof(*rbtiterator));
*iteratorp = NULL;
}
@@ -4746,7 +4746,7 @@ dbiterator_destroy(dns_dbiterator_t **iteratorp) {
dns_db_detach(&rbtdbiter->common.db);
dns_rbtnodechain_reset(&rbtdbiter->chain);
isc_mem_put(rbtdb->common.mctx, rbtdbiter, sizeof *rbtdbiter);
isc_mem_put(rbtdb->common.mctx, rbtdbiter, sizeof(*rbtdbiter));
*iteratorp = NULL;
}

10
lib/dns/rdata.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdata.c,v 1.152 2001/10/03 00:51:38 gson Exp $ */
/* $Id: rdata.c,v 1.153 2001/11/12 19:05:28 gson Exp $ */
#include <config.h>
#include <ctype.h>
@@ -759,7 +759,7 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
{
isc_result_t result = ISC_R_NOTIMPLEMENTED;
isc_boolean_t use_default = ISC_FALSE;
char buf[sizeof "65536"];
char buf[sizeof("65536")];
isc_region_t sr;
REQUIRE(rdata != NULL);
@@ -1008,7 +1008,7 @@ dns_mnemonic_totext(unsigned int value, isc_buffer_t *target,
struct tbl *table)
{
int i = 0;
char buf[sizeof "4294967296"];
char buf[sizeof("4294967296")];
while (table[i].name != NULL) {
if (table[i].value == value) {
return (str_totext(table[i].name, target));
@@ -1160,7 +1160,7 @@ dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) {
isc_result_t
dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target) {
char buf[sizeof "TYPE65536"];
char buf[sizeof("TYPE65536")];
if (type > 255) {
sprintf(buf, "TYPE%u", type);
@@ -1917,7 +1917,7 @@ static isc_result_t
btoa_totext(unsigned char *inbuf, int inbuflen, isc_buffer_t *target) {
int inc;
struct state statebuf, *state = &statebuf;
char buf[sizeof "x 2000000000 ffffffff ffffffff ffffffff"];
char buf[sizeof("x 2000000000 ffffffff ffffffff ffffffff")];
Ceor = Csum = Crot = word = bcount = 0;
for (inc = 0; inc < inbuflen; inbuf++, inc++)

8
lib/dns/request.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: request.c,v 1.68 2001/10/23 23:10:14 gson Exp $ */
/* $Id: request.c,v 1.69 2001/11/12 19:05:29 gson Exp $ */
#include <config.h>
@@ -403,7 +403,7 @@ mgr_destroy(dns_requestmgr_t *requestmgr) {
dns_dispatch_detach(&requestmgr->dispatchv6);
requestmgr->magic = 0;
mctx = requestmgr->mctx;
isc_mem_put(mctx, requestmgr, sizeof *requestmgr);
isc_mem_put(mctx, requestmgr, sizeof(*requestmgr));
isc_mem_detach(&mctx);
}
@@ -685,7 +685,7 @@ dns_request_createraw2(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf,
request->event = (dns_requestevent_t *)
isc_event_allocate(mctx, task, DNS_EVENT_REQUESTDONE,
action, arg, sizeof (dns_requestevent_t));
action, arg, sizeof(dns_requestevent_t));
if (request->event == NULL) {
result = ISC_R_NOMEMORY;
goto cleanup;
@@ -857,7 +857,7 @@ dns_request_createvia2(dns_requestmgr_t *requestmgr, dns_message_t *message,
request->event = (dns_requestevent_t *)
isc_event_allocate(mctx, task, DNS_EVENT_REQUESTDONE,
action, arg, sizeof (dns_requestevent_t));
action, arg, sizeof(dns_requestevent_t));
if (request->event == NULL) {
result = ISC_R_NOMEMORY;
goto cleanup;

42
lib/dns/resolver.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: resolver.c,v 1.229 2001/11/12 18:48:50 gson Exp $ */
/* $Id: resolver.c,v 1.230 2001/11/12 19:05:31 gson Exp $ */
#include <config.h>
@@ -700,7 +700,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
dns_message_reset(fctx->rmessage, DNS_MESSAGE_INTENTPARSE);
query = isc_mem_get(res->mctx, sizeof *query);
query = isc_mem_get(res->mctx, sizeof(*query));
if (query == NULL) {
result = ISC_R_NOMEMORY;
goto stop_idle_timer;
@@ -825,7 +825,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
cleanup_query:
query->magic = 0;
isc_mem_put(res->mctx, query, sizeof *query);
isc_mem_put(res->mctx, query, sizeof(*query));
stop_idle_timer:
fctx_stopidletimer(fctx);
@@ -1310,7 +1310,7 @@ add_bad(fetchctx_t *fctx, isc_sockaddr_t *address) {
FCTXTRACE("add_bad");
sa = isc_mem_get(fctx->res->mctx, sizeof *sa);
sa = isc_mem_get(fctx->res->mctx, sizeof(*sa));
if (sa == NULL)
return;
*sa = *address;
@@ -1671,7 +1671,7 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr)
return;
isc_netaddr_fromsockaddr(&na, sa);
isc_netaddr_format(&na, buf, sizeof buf);
isc_netaddr_format(&na, buf, sizeof(buf));
FCTXTRACE2(msg, buf);
}
@@ -1820,7 +1820,7 @@ fctx_destroy(fetchctx_t *fctx) {
sa = next_sa) {
next_sa = ISC_LIST_NEXT(sa, link);
ISC_LIST_UNLINK(fctx->bad, sa, link);
isc_mem_put(res->mctx, sa, sizeof *sa);
isc_mem_put(res->mctx, sa, sizeof(*sa));
}
isc_timer_detach(&fctx->timer);
@@ -1833,7 +1833,7 @@ fctx_destroy(fetchctx_t *fctx) {
dns_name_free(&fctx->name, res->mctx);
dns_db_detach(&fctx->cache);
dns_adb_detach(&fctx->adb);
isc_mem_put(res->mctx, fctx, sizeof *fctx);
isc_mem_put(res->mctx, fctx, sizeof(*fctx));
LOCK(&res->lock);
res->nfctx--;
@@ -2067,7 +2067,7 @@ fctx_join(fetchctx_t *fctx, isc_task_t *task, isc_taskaction_t action,
event = (dns_fetchevent_t *)
isc_event_allocate(fctx->res->mctx, clone,
DNS_EVENT_FETCHDONE,
action, arg, sizeof *event);
action, arg, sizeof(*event));
if (event == NULL) {
isc_task_detach(&clone);
return (ISC_R_NOMEMORY);
@@ -2114,7 +2114,7 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
*/
REQUIRE(fctxp != NULL && *fctxp == NULL);
fctx = isc_mem_get(res->mctx, sizeof *fctx);
fctx = isc_mem_get(res->mctx, sizeof(*fctx));
if (fctx == NULL)
return (ISC_R_NOMEMORY);
FCTXTRACE("create");
@@ -2291,7 +2291,7 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
dns_name_free(&fctx->name, res->mctx);
cleanup_fetch:
isc_mem_put(res->mctx, fctx, sizeof *fctx);
isc_mem_put(res->mctx, fctx, sizeof(*fctx));
return (result);
}
@@ -4553,13 +4553,13 @@ destroy(dns_resolver_t *res) {
DESTROYLOCK(&res->buckets[i].lock);
}
isc_mem_put(res->mctx, res->buckets,
res->nbuckets * sizeof (fctxbucket_t));
res->nbuckets * sizeof(fctxbucket_t));
if (res->dispatchv4 != NULL)
dns_dispatch_detach(&res->dispatchv4);
if (res->dispatchv6 != NULL)
dns_dispatch_detach(&res->dispatchv6);
res->magic = 0;
isc_mem_put(res->mctx, res, sizeof *res);
isc_mem_put(res->mctx, res, sizeof(*res));
}
static void
@@ -4622,7 +4622,7 @@ dns_resolver_create(dns_view_t *view,
REQUIRE(dispatchmgr != NULL);
REQUIRE(dispatchv4 != NULL || dispatchv6 != NULL);
res = isc_mem_get(view->mctx, sizeof *res);
res = isc_mem_get(view->mctx, sizeof(*res));
if (res == NULL)
return (ISC_R_NOMEMORY);
RTRACE("create");
@@ -4639,7 +4639,7 @@ dns_resolver_create(dns_view_t *view,
res->nbuckets = ntasks;
res->activebuckets = ntasks;
res->buckets = isc_mem_get(view->mctx,
ntasks * sizeof (fctxbucket_t));
ntasks * sizeof(fctxbucket_t));
if (res->buckets == NULL) {
result = ISC_R_NOMEMORY;
goto cleanup_res;
@@ -4699,10 +4699,10 @@ dns_resolver_create(dns_view_t *view,
isc_task_detach(&res->buckets[i].task);
}
isc_mem_put(view->mctx, res->buckets,
res->nbuckets * sizeof (fctxbucket_t));
res->nbuckets * sizeof(fctxbucket_t));
cleanup_res:
isc_mem_put(view->mctx, res, sizeof *res);
isc_mem_put(view->mctx, res, sizeof(*res));
return (result);
}
@@ -4737,7 +4737,7 @@ prime_done(isc_task_t *task, isc_event_t *event) {
dns_rdataset_disassociate(fevent->rdataset);
INSIST(fevent->sigrdataset == NULL);
isc_mem_put(res->mctx, fevent->rdataset, sizeof *fevent->rdataset);
isc_mem_put(res->mctx, fevent->rdataset, sizeof(*fevent->rdataset));
isc_event_free(&event);
dns_resolver_destroyfetch(&fetch);
@@ -4776,7 +4776,7 @@ dns_resolver_prime(dns_resolver_t *res) {
* do nothing.
*/
RTRACE("priming");
rdataset = isc_mem_get(res->mctx, sizeof *rdataset);
rdataset = isc_mem_get(res->mctx, sizeof(*rdataset));
if (rdataset == NULL) {
LOCK(&res->lock);
INSIST(res->priming);
@@ -5004,7 +5004,7 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name,
/*
* XXXRTH use a mempool?
*/
fetch = isc_mem_get(res->mctx, sizeof *fetch);
fetch = isc_mem_get(res->mctx, sizeof(*fetch));
if (fetch == NULL)
return (ISC_R_NOMEMORY);
@@ -5073,7 +5073,7 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name,
FTRACE("created");
*fetchp = fetch;
} else
isc_mem_put(res->mctx, fetch, sizeof *fetch);
isc_mem_put(res->mctx, fetch, sizeof(*fetch));
return (result);
}
@@ -5183,7 +5183,7 @@ dns_resolver_destroyfetch(dns_fetch_t **fetchp) {
UNLOCK(&res->buckets[bucketnum].lock);
isc_mem_put(res->mctx, fetch, sizeof *fetch);
isc_mem_put(res->mctx, fetch, sizeof(*fetch));
*fetchp = NULL;
if (bucket_empty)

4
lib/dns/sdb.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sdb.c,v 1.36 2001/10/13 01:37:58 gson Exp $ */
/* $Id: sdb.c,v 1.37 2001/11/12 19:05:32 gson Exp $ */
#include <config.h>
@@ -459,7 +459,7 @@ dns_sdb_putsoa(dns_sdblookup_t *lookup, const char *mname, const char *rname,
REQUIRE(mname != NULL);
REQUIRE(rname != NULL);
n = snprintf(str, sizeof str, "%s %s %u %u %u %u %u",
n = snprintf(str, sizeof(str), "%s %s %u %u %u %u %u",
mname, rname, serial,
SDB_DEFAULT_REFRESH, SDB_DEFAULT_RETRY,
SDB_DEFAULT_EXPIRE, SDB_DEFAULT_MINIMUM);

4
lib/dns/time.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: time.c,v 1.19 2001/09/21 00:11:29 bwelling Exp $ */
/* $Id: time.c,v 1.20 2001/11/12 19:05:33 gson Exp $ */
#include <config.h>
@@ -35,7 +35,7 @@ static int days[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
isc_result_t
dns_time64_totext(isc_int64_t t, isc_buffer_t *target) {
struct tm tm;
char buf[sizeof "YYYYMMDDHHMMSS"];
char buf[sizeof("YYYYMMDDHHMMSS")];
int secs;
unsigned int l;
isc_region_t region;

4
lib/dns/ttl.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: ttl.c,v 1.21 2001/01/09 21:51:41 bwelling Exp $ */
/* $Id: ttl.c,v 1.22 2001/11/12 19:05:34 gson Exp $ */
#include <config.h>
@@ -60,7 +60,7 @@ ttlfmt(unsigned int t, const char *s, isc_boolean_t verbose,
else
len = snprintf(tmp, sizeof(tmp), "%u%c", t, s[0]);
INSIST(len + 1 <= sizeof tmp);
INSIST(len + 1 <= sizeof(tmp));
isc_buffer_availableregion(target, &region);
if (len > region.length)
return (ISC_R_NOSPACE);

20
lib/dns/validator.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: validator.c,v 1.94 2001/09/19 21:25:45 gson Exp $ */
/* $Id: validator.c,v 1.95 2001/11/12 19:05:35 gson Exp $ */
#include <config.h>
@@ -985,9 +985,9 @@ validate(dns_validator_t *val, isc_boolean_t resume) {
dns_rdataset_current(event->sigrdataset, &rdata);
if (val->siginfo != NULL)
isc_mem_put(val->view->mctx, val->siginfo,
sizeof *val->siginfo);
sizeof(*val->siginfo));
val->siginfo = isc_mem_get(val->view->mctx,
sizeof *val->siginfo);
sizeof(*val->siginfo));
if (val->siginfo == NULL)
return (ISC_R_NOMEMORY);
dns_rdata_tostruct(&rdata, val->siginfo, NULL);
@@ -1312,14 +1312,14 @@ proveunsecure(dns_validator_t *val, isc_boolean_t resume) {
goto out;
}
fname = isc_mem_get(val->view->mctx, sizeof *fname);
fname = isc_mem_get(val->view->mctx, sizeof(*fname));
if (fname == NULL)
return (ISC_R_NOMEMORY);
dns_name_init(fname, NULL);
result = dns_name_dup(tname, val->view->mctx, fname);
if (result != ISC_R_SUCCESS) {
isc_mem_put(val->view->mctx, fname,
sizeof *fname);
sizeof(*fname));
result = ISC_R_NOMEMORY;
goto out;
}
@@ -1468,7 +1468,7 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
tclone = NULL;
result = ISC_R_FAILURE;
val = isc_mem_get(view->mctx, sizeof *val);
val = isc_mem_get(view->mctx, sizeof(*val));
if (val == NULL)
return (ISC_R_NOMEMORY);
val->view = NULL;
@@ -1477,7 +1477,7 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
isc_event_allocate(view->mctx, task,
DNS_EVENT_VALIDATORSTART,
validator_start, NULL,
sizeof (dns_validatorevent_t));
sizeof(dns_validatorevent_t));
if (event == NULL) {
result = ISC_R_NOMEMORY;
goto cleanup_val;
@@ -1526,7 +1526,7 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
cleanup_val:
dns_view_weakdetach(&val->view);
isc_mem_put(view->mctx, val, sizeof *val);
isc_mem_put(view->mctx, val, sizeof(*val));
return (result);
}
@@ -1572,11 +1572,11 @@ destroy(dns_validator_t *val) {
dns_validator_destroy(&val->authvalidator);
mctx = val->view->mctx;
if (val->siginfo != NULL)
isc_mem_put(mctx, val->siginfo, sizeof *val->siginfo);
isc_mem_put(mctx, val->siginfo, sizeof(*val->siginfo));
DESTROYLOCK(&val->lock);
dns_view_weakdetach(&val->view);
val->magic = 0;
isc_mem_put(mctx, val, sizeof *val);
isc_mem_put(mctx, val, sizeof(*val));
}
void

14
lib/dns/view.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: view.c,v 1.106 2001/11/07 04:25:17 marka Exp $ */
/* $Id: view.c,v 1.107 2001/11/12 19:05:36 gson Exp $ */
#include <config.h>
@@ -63,7 +63,7 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
REQUIRE(name != NULL);
REQUIRE(viewp != NULL && *viewp == NULL);
view = isc_mem_get(mctx, sizeof *view);
view = isc_mem_get(mctx, sizeof(*view));
if (view == NULL)
return (ISC_R_NOMEMORY);
view->name = isc_mem_strdup(mctx, name);
@@ -168,13 +168,13 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
goto cleanup_peerlist;
ISC_LINK_INIT(view, link);
ISC_EVENT_INIT(&view->resevent, sizeof view->resevent, 0, NULL,
ISC_EVENT_INIT(&view->resevent, sizeof(view->resevent), 0, NULL,
DNS_EVENT_VIEWRESSHUTDOWN, resolver_shutdown,
view, NULL, NULL, NULL);
ISC_EVENT_INIT(&view->adbevent, sizeof view->adbevent, 0, NULL,
ISC_EVENT_INIT(&view->adbevent, sizeof(view->adbevent), 0, NULL,
DNS_EVENT_VIEWADBSHUTDOWN, adb_shutdown,
view, NULL, NULL, NULL);
ISC_EVENT_INIT(&view->reqevent, sizeof view->reqevent, 0, NULL,
ISC_EVENT_INIT(&view->reqevent, sizeof(view->reqevent), 0, NULL,
DNS_EVENT_VIEWREQSHUTDOWN, req_shutdown,
view, NULL, NULL, NULL);
view->magic = DNS_VIEW_MAGIC;
@@ -208,7 +208,7 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
isc_mem_free(mctx, view->name);
cleanup_view:
isc_mem_put(mctx, view, sizeof *view);
isc_mem_put(mctx, view, sizeof(*view));
return (result);
}
@@ -261,7 +261,7 @@ destroy(dns_view_t *view) {
DESTROYLOCK(&view->lock);
isc_refcount_destroy(&view->references);
isc_mem_free(view->mctx, view->name);
isc_mem_put(view->mctx, view, sizeof *view);
isc_mem_put(view->mctx, view, sizeof(*view));
}
/*

54
lib/dns/zone.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.c,v 1.351 2001/11/09 04:21:54 marka Exp $ */
/* $Id: zone.c,v 1.352 2001/11/12 19:05:38 gson Exp $ */
#include <config.h>
@@ -447,13 +447,13 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
REQUIRE(zonep != NULL && *zonep == NULL);
REQUIRE(mctx != NULL);
zone = isc_mem_get(mctx, sizeof *zone);
zone = isc_mem_get(mctx, sizeof(*zone));
if (zone == NULL)
return (ISC_R_NOMEMORY);
result = isc_mutex_init(&zone->lock);
if (result != ISC_R_SUCCESS) {
isc_mem_put(mctx, zone, sizeof *zone);
isc_mem_put(mctx, zone, sizeof(*zone));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() failed: %s",
isc_result_totext(result));
@@ -613,7 +613,7 @@ zone_free(dns_zone_t *zone) {
isc_refcount_destroy(&zone->erefs);
zone->magic = 0;
mctx = zone->mctx;
isc_mem_put(mctx, zone, sizeof *zone);
isc_mem_put(mctx, zone, sizeof(*zone));
isc_mem_detach(&mctx);
}
@@ -679,7 +679,7 @@ zone_freedbargs(dns_zone_t *zone) {
for (i = 0; i < zone->db_argc; i++)
isc_mem_free(zone->mctx, zone->db_argv[i]);
isc_mem_put(zone->mctx, zone->db_argv,
zone->db_argc * sizeof *zone->db_argv);
zone->db_argc * sizeof(*zone->db_argv));
}
zone->db_argc = 0;
zone->db_argv = NULL;
@@ -699,7 +699,7 @@ dns_zone_setdbtype(dns_zone_t *zone,
LOCK_ZONE(zone);
/* Set up a new database argument list. */
new = isc_mem_get(zone->mctx, dbargc * sizeof *new);
new = isc_mem_get(zone->mctx, dbargc * sizeof(*new));
if (new == NULL)
goto nomem;
for (i = 0; i < dbargc; i++)
@@ -724,7 +724,7 @@ dns_zone_setdbtype(dns_zone_t *zone,
if (zone->db_argv[i] != NULL)
isc_mem_free(zone->mctx, new[i]);
isc_mem_put(zone->mctx, new,
dbargc * sizeof *new);
dbargc * sizeof(*new));
}
}
result = ISC_R_NOMEMORY;
@@ -823,7 +823,7 @@ default_journal(dns_zone_t *zone) {
if (zone->masterfile != NULL) {
/* Calculate string length including '\0'. */
int len = strlen(zone->masterfile) + sizeof ".jnl";
int len = strlen(zone->masterfile) + sizeof(".jnl");
journal = isc_mem_allocate(zone->mctx, len);
if (journal == NULL)
return (ISC_R_NOMEMORY);
@@ -1755,19 +1755,19 @@ dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *notify,
LOCK_ZONE(zone);
if (zone->notify != NULL) {
isc_mem_put(zone->mctx, zone->notify,
zone->notifycnt * sizeof *new);
zone->notifycnt * sizeof(*new));
zone->notify = NULL;
zone->notifycnt = 0;
}
if (notify == NULL)
goto unlock;
new = isc_mem_get(zone->mctx, count * sizeof *new);
new = isc_mem_get(zone->mctx, count * sizeof(*new));
if (new == NULL) {
UNLOCK_ZONE(zone);
return (ISC_R_NOMEMORY);
}
memcpy(new, notify, count * sizeof *new);
memcpy(new, notify, count * sizeof(*new));
zone->notify = new;
zone->notifycnt = count;
@@ -1804,7 +1804,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone, isc_sockaddr_t *masters,
LOCK_ZONE(zone);
if (zone->masters != NULL) {
isc_mem_put(zone->mctx, zone->masters,
zone->masterscnt * sizeof *new);
zone->masterscnt * sizeof(*new));
zone->masters = NULL;
}
if (zone->masterkeynames != NULL) {
@@ -1839,7 +1839,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone, isc_sockaddr_t *masters,
result = ISC_R_NOMEMORY;
goto unlock;
}
memcpy(new, masters, count * sizeof *new);
memcpy(new, masters, count * sizeof(*new));
zone->masters = new;
zone->masterscnt = count;
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NOMASTERS);
@@ -1853,7 +1853,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone, isc_sockaddr_t *masters,
if (newname == NULL) {
result = ISC_R_NOMEMORY;
isc_mem_put(zone->mctx, zone->masters,
count * sizeof *new);
count * sizeof(*new));
goto unlock;
}
for (i = 0; i < count; i++)
@@ -1875,9 +1875,9 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone, isc_sockaddr_t *masters,
newname[i],
zone->mctx);
isc_mem_put(zone->mctx, zone->masters,
count * sizeof *new);
count * sizeof(*new));
isc_mem_put(zone->mctx, newname,
count * sizeof *newname);
count * sizeof(*newname));
goto unlock;
}
}
@@ -2482,7 +2482,7 @@ notify_destroy(dns_notify_t *notify, isc_boolean_t locked) {
if (dns_name_dynamic(&notify->ns))
dns_name_free(&notify->ns, notify->mctx);
mctx = notify->mctx;
isc_mem_put(notify->mctx, notify, sizeof *notify);
isc_mem_put(notify->mctx, notify, sizeof(*notify));
isc_mem_detach(&mctx);
}
@@ -2492,7 +2492,7 @@ notify_create(isc_mem_t *mctx, unsigned int flags, dns_notify_t **notifyp) {
REQUIRE(notifyp != NULL && *notifyp == NULL);
notify = isc_mem_get(mctx, sizeof *notify);
notify = isc_mem_get(mctx, sizeof(*notify));
if (notify == NULL)
return (ISC_R_NOMEMORY);
@@ -3668,7 +3668,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
LOCK_ZONE(zone);
if (stub == NULL) {
stub = isc_mem_get(zone->mctx, sizeof *stub);
stub = isc_mem_get(zone->mctx, sizeof(*stub));
if (stub == NULL)
goto cleanup;
stub->magic = STUB_MAGIC;
@@ -4499,7 +4499,7 @@ notify_log(dns_zone_t *zone, int level, const char *fmt, ...) {
zone_tostr(zone, namebuf, sizeof(namebuf));
va_start(ap, fmt);
vsnprintf(message, sizeof message, fmt, ap);
vsnprintf(message, sizeof(message), fmt, ap);
va_end(ap);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_NOTIFY, DNS_LOGMODULE_ZONE,
level, "zone %s: %s", namebuf, message);
@@ -4517,7 +4517,7 @@ dns_zone_log(dns_zone_t *zone, int level, const char *fmt, ...) {
zone_tostr(zone, namebuf, sizeof(namebuf));
va_start(ap, fmt);
vsnprintf(message, sizeof message, fmt, ap);
vsnprintf(message, sizeof(message), fmt, ap);
va_end(ap);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_ZONE,
level, "zone %s: %s", namebuf, message);
@@ -4538,7 +4538,7 @@ zone_debuglog(dns_zone_t *zone, const char *me, int debuglevel,
zone_tostr(zone, namebuf, sizeof(namebuf));
va_start(ap, fmt);
vsnprintf(message, sizeof message, fmt, ap);
vsnprintf(message, sizeof(message), fmt, ap);
va_end(ap);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_ZONE,
level, "%s: zone %s: %s", me, namebuf, message);
@@ -4990,7 +4990,7 @@ zone_loaddone(void *arg, isc_result_t result) {
if (load->zone->lctx != NULL)
dns_loadctx_detach(&load->zone->lctx);
dns_zone_idetach(&load->zone);
isc_mem_putanddetach(&load->mctx, load, sizeof (*load));
isc_mem_putanddetach(&load->mctx, load, sizeof(*load));
}
void
@@ -5192,7 +5192,7 @@ forward_destroy(dns_forward_t *forward) {
isc_buffer_free(&forward->msgbuf);
if (forward->zone != NULL)
dns_zone_idetach(&forward->zone);
isc_mem_putanddetach(&forward->mctx, forward, sizeof (*forward));
isc_mem_putanddetach(&forward->mctx, forward, sizeof(*forward));
}
static isc_result_t
@@ -5420,7 +5420,7 @@ dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
isc_result_t result;
isc_interval_t interval;
zmgr = isc_mem_get(mctx, sizeof *zmgr);
zmgr = isc_mem_get(mctx, sizeof(*zmgr));
if (zmgr == NULL)
return (ISC_R_NOMEMORY);
zmgr->mctx = NULL;
@@ -5497,7 +5497,7 @@ dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
free_rwlock:
isc_rwlock_destroy(&zmgr->rwlock);
free_mem:
isc_mem_put(zmgr->mctx, zmgr, sizeof *zmgr);
isc_mem_put(zmgr->mctx, zmgr, sizeof(*zmgr));
isc_mem_detach(&mctx);
return (result);
}
@@ -5663,7 +5663,7 @@ zonemgr_free(dns_zonemgr_t *zmgr) {
isc_rwlock_destroy(&zmgr->rwlock);
mctx = zmgr->mctx;
isc_mem_put(zmgr->mctx, zmgr, sizeof *zmgr);
isc_mem_put(zmgr->mctx, zmgr, sizeof(*zmgr));
isc_mem_detach(&mctx);
}

8
lib/dns/zt.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zt.c,v 1.33 2001/06/04 19:33:19 tale Exp $ */
/* $Id: zt.c,v 1.34 2001/11/12 19:05:39 gson Exp $ */
#include <config.h>
@@ -58,7 +58,7 @@ dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_zt_t **ztp) {
REQUIRE(ztp != NULL && *ztp == NULL);
zt = isc_mem_get(mctx, sizeof *zt);
zt = isc_mem_get(mctx, sizeof(*zt));
if (zt == NULL)
return (ISC_R_NOMEMORY);
@@ -88,7 +88,7 @@ dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_zt_t **ztp) {
dns_rbt_destroy(&zt->table);
cleanup_zt:
isc_mem_put(mctx, zt, sizeof *zt);
isc_mem_put(mctx, zt, sizeof(*zt));
return (result);
}
@@ -204,7 +204,7 @@ zt_flushanddetach(dns_zt_t **ztp, isc_boolean_t need_flush) {
dns_rbt_destroy(&zt->table);
isc_rwlock_destroy(&zt->rwlock);
zt->magic = 0;
isc_mem_put(zt->mctx, zt, sizeof *zt);
isc_mem_put(zt->mctx, zt, sizeof(*zt));
}
*ztp = NULL;