upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 11:32:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sizeof style

Browse source
This commit is contained in:
Andreas Gustafsson 2001-11-27 01:56:32 +00:00
parent b414eb4312
commit 91cd0f93ad
70 changed files with 361 additions and 362 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/dig/dig.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.c,v 1.171 2001/11/22 01:59:01 gson Exp $ */
/* $Id: dig.c,v 1.172 2001/11/27 01:55:12 gson Exp $ */
#include <config.h>
#include <stdlib.h>
@ -546,7 +546,7 @@ printgreeting(int argc, char **argv, dig_lookup_t *lookup) {
strlen(lookup->cmdline) - 1;
strncat(lookup->cmdline, "\n", remaining);
if (first) {
snprintf(append, sizeof (append),
snprintf(append, sizeof(append),
";; global options: %s %s\n",
short_form ? "short_form" : "",
printcmd ? "printcmd" : "");

26
bin/tests/compress_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: compress_test.c,v 1.25 2001/11/27 00:55:39 gson Exp $ */
/* $Id: compress_test.c,v 1.26 2001/11/27 01:55:13 gson Exp $ */
#include <config.h>
@ -72,42 +72,42 @@ main(int argc, char *argv[]) {
dns_name_init(&name1, NULL);
region.base = plain1;
region.length = sizeof plain1;
region.length = sizeof(plain1);
dns_name_fromregion(&name1, &region);
dns_name_init(&name2, NULL);
region.base = plain2;
region.length = sizeof plain2;
region.length = sizeof(plain2);
dns_name_fromregion(&name2, &region);
dns_name_init(&name3, NULL);
region.base = plain3;
region.length = sizeof plain3;
region.length = sizeof(plain3);
dns_name_fromregion(&name3, &region);
test(DNS_COMPRESS_NONE, &name1, &name2, &name3, plain, sizeof plain);
test(DNS_COMPRESS_NONE, &name1, &name2, &name3, plain, sizeof(plain));
test(DNS_COMPRESS_GLOBAL14, &name1, &name2, &name3, plain,
sizeof plain);
test(DNS_COMPRESS_ALL, &name1, &name2, &name3, plain, sizeof plain);
sizeof(plain));
test(DNS_COMPRESS_ALL, &name1, &name2, &name3, plain, sizeof(plain));
dns_name_init(&name1, NULL);
region.base = bit1;
region.length = sizeof bit1;
region.length = sizeof(bit1);
dns_name_fromregion(&name1, &region);
dns_name_init(&name2, NULL);
region.base = bit2;
region.length = sizeof bit2;
region.length = sizeof(bit2);
dns_name_fromregion(&name2, &region);
dns_name_init(&name3, NULL);
region.base = bit3;
region.length = sizeof bit3;
region.length = sizeof(bit3);
dns_name_fromregion(&name3, &region);
test(DNS_COMPRESS_NONE, &name1, &name2, &name3, bit, sizeof bit);
test(DNS_COMPRESS_GLOBAL14, &name1, &name2, &name3, bit, sizeof bit);
test(DNS_COMPRESS_ALL, &name1, &name2, &name3, bit, sizeof bit);
test(DNS_COMPRESS_NONE, &name1, &name2, &name3, bit, sizeof(bit));
test(DNS_COMPRESS_GLOBAL14, &name1, &name2, &name3, bit, sizeof(bit));
test(DNS_COMPRESS_ALL, &name1, &name2, &name3, bit, sizeof(bit));
return (0);
}

14
bin/tests/db_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: db_test.c,v 1.56 2001/01/09 21:40:57 bwelling Exp $ */
/* $Id: db_test.c,v 1.57 2001/11/27 01:55:15 gson Exp $ */
/*
* Principal Author: Bob Halley
@ -248,7 +248,7 @@ load(const char *filename, const char *origintext, isc_boolean_t cache) {
dbinfo *dbi;
unsigned int i;
dbi = isc_mem_get(mctx, sizeof *dbi);
dbi = isc_mem_get(mctx, sizeof(*dbi));
if (dbi == NULL)
return (ISC_R_NOMEMORY);
@ -281,7 +281,7 @@ load(const char *filename, const char *origintext, isc_boolean_t cache) {
dns_rdataclass_in,
0, NULL, &dbi->db);
if (result != ISC_R_SUCCESS) {
isc_mem_put(mctx, dbi, sizeof *dbi);
isc_mem_put(mctx, dbi, sizeof(*dbi));
return (result);
}
@ -289,7 +289,7 @@ load(const char *filename, const char *origintext, isc_boolean_t cache) {
result = dns_db_load(dbi->db, filename);
if (result != ISC_R_SUCCESS && result != DNS_R_SEENINCLUDE) {
dns_db_detach(&dbi->db);
isc_mem_put(mctx, dbi, sizeof *dbi);
isc_mem_put(mctx, dbi, sizeof(*dbi));
return (result);
}
printf("loaded\n");
@ -301,7 +301,7 @@ load(const char *filename, const char *origintext, isc_boolean_t cache) {
} else {
if (dns_dbtable_add(dbtable, dbi->db) != ISC_R_SUCCESS) {
dns_db_detach(&dbi->db);
isc_mem_put(mctx, dbi, sizeof *dbi);
isc_mem_put(mctx, dbi, sizeof(*dbi));
return (result);
}
}
@ -325,7 +325,7 @@ unload_all(void) {
}
dns_db_detach(&dbi->db);
ISC_LIST_UNLINK(dbs, dbi, link);
isc_mem_put(mctx, dbi, sizeof *dbi);
isc_mem_put(mctx, dbi, sizeof(*dbi));
}
}
@ -472,7 +472,7 @@ main(int argc, char *argv[]) {
while (!done) {
if (!quiet)
printf("\n");
if (fgets(s, sizeof s, stdin) == NULL) {
if (fgets(s, sizeof(s), stdin) == NULL) {
done = ISC_TRUE;
continue;
}

6
bin/tests/entropy_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: entropy_test.c,v 1.17 2001/11/27 00:55:41 gson Exp $ */
/* $Id: entropy_test.c,v 1.18 2001/11/27 01:55:16 gson Exp $ */
#include <config.h>
@ -108,10 +108,10 @@ main(int argc, char **argv) {
flags = 0;
flags |= ISC_ENTROPY_GOODONLY;
flags |= ISC_ENTROPY_BLOCKING;
result = isc_entropy_getdata(ent, buffer, sizeof buffer, &returned,
result = isc_entropy_getdata(ent, buffer, sizeof(buffer), &returned,
flags);
CHECK("good data only, blocking mode", result);
hex_dump("blocking mode data", buffer, sizeof buffer);
hex_dump("blocking mode data", buffer, sizeof(buffer));
{
isc_entropy_t *entcopy1 = NULL;

4
bin/tests/gxba_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: gxba_test.c,v 1.7 2001/01/09 21:41:05 bwelling Exp $ */
/* $Id: gxba_test.c,v 1.8 2001/11/27 01:55:17 gson Exp $ */
#include <config.h>
@ -46,7 +46,7 @@ print_he(struct hostent *he, int error, const char *fun, const char *name) {
i = 1;
while (*c != NULL) {
char buf[128];
inet_ntop(he->h_addrtype, *c, buf, sizeof (buf));
inet_ntop(he->h_addrtype, *c, buf, sizeof(buf));
printf("\taddress[%d] = %s\n", i, buf);
c++;
i++;

4
bin/tests/gxbn_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: gxbn_test.c,v 1.10 2001/01/09 21:41:06 bwelling Exp $ */
/* $Id: gxbn_test.c,v 1.11 2001/11/27 01:55:18 gson Exp $ */
#include <config.h>
@ -46,7 +46,7 @@ print_he(struct hostent *he, int error, const char *fun, const char *name) {
i = 1;
while (*c != NULL) {
char buf[128];
inet_ntop(he->h_addrtype, *c, buf, sizeof (buf));
inet_ntop(he->h_addrtype, *c, buf, sizeof(buf));
printf("\taddress[%d] = %s\n", i, buf);
c++;
i++;

4
bin/tests/name_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: name_test.c,v 1.33 2001/01/09 21:41:20 bwelling Exp $ */
/* $Id: name_test.c,v 1.34 2001/11/27 01:55:19 gson Exp $ */
#include <config.h>
@ -166,7 +166,7 @@ main(int argc, char *argv[]) {
dns_fixedname_init(&wname);
name = dns_fixedname_name(&wname);
dns_fixedname_init(&wname2);
while (fgets(s, sizeof s, stdin) != NULL) {
while (fgets(s, sizeof(s), stdin) != NULL) {
len = strlen(s);
if (len > 0 && s[len - 1] == '\n') {
s[len - 1] = '\0';

4
bin/tests/nxtify.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nxtify.c,v 1.19 2001/01/09 21:41:26 bwelling Exp $ */
/* $Id: nxtify.c,v 1.20 2001/11/27 01:55:20 gson Exp $ */
#include <config.h>
@ -184,7 +184,7 @@ nxtify(char *filename) {
*/
dns_db_closeversion(db, &wversion, ISC_TRUE);
len = strlen(filename);
if (len + 4 + 1 > sizeof newfilename)
if (len + 4 + 1 > sizeof(newfilename))
fatal("filename too long");
sprintf(newfilename, "%s.new", filename);
result = dns_db_dump(db, NULL, newfilename);

4
bin/tests/rdata_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rdata_test.c,v 1.36 2001/11/27 00:55:46 gson Exp $ */
/* $Id: rdata_test.c,v 1.37 2001/11/27 01:55:21 gson Exp $ */
#include <config.h>
@ -836,7 +836,7 @@ main(int argc, char *argv[]) {
}
}
memset(&dctx, '0', sizeof dctx);
memset(&dctx, '0', sizeof(dctx));
dctx.allowed = DNS_COMPRESS_ALL;
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);

6
bin/tests/serial_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: serial_test.c,v 1.10 2001/01/09 21:41:37 bwelling Exp $ */
/* $Id: serial_test.c,v 1.11 2001/11/27 01:55:22 gson Exp $ */
#include <config.h>
@ -30,8 +30,8 @@ main() {
char buf[1024];
char *s, *e;
while (fgets(buf, sizeof buf, stdin) != NULL) {
buf[sizeof buf - 1] = '\0';
while (fgets(buf, sizeof(buf), stdin) != NULL) {
buf[sizeof(buf) - 1] = '\0';
s = buf;
a = strtoul(s, &e, 0);
if (s == e)

11
bin/tests/shutdown_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: shutdown_test.c,v 1.18 2001/01/09 21:41:38 bwelling Exp $ */
/* $Id: shutdown_test.c,v 1.19 2001/11/27 01:55:23 gson Exp $ */
#include <config.h>
@ -79,7 +79,7 @@ shutdown_action(isc_task_t *task, isc_event_t *event) {
isc_timer_detach(&info->timer);
nevent = isc_event_allocate(info->mctx, info, T2_SHUTDOWNOK,
t2_shutdown, &tasks[1],
sizeof *event);
sizeof(*event));
RUNTIME_CHECK(nevent != NULL);
info->exiting = ISC_TRUE;
isc_task_sendanddetach(&info->peer, &nevent);
@ -94,8 +94,7 @@ foo_event(isc_task_t *task, isc_event_t *event) {
}
static void
tick(isc_task_t *task, isc_event_t *event)
{
tick(isc_task_t *task, isc_event_t *event) {
t_info *info = event->ev_arg;
isc_event_t *nevent;
@ -113,7 +112,7 @@ tick(isc_task_t *task, isc_event_t *event)
nevent = isc_event_allocate(info->mctx, info,
T2_SHUTDOWNDONE,
t1_shutdown, &tasks[0],
sizeof *event);
sizeof(*event));
RUNTIME_CHECK(nevent != NULL);
isc_task_send(info->peer, &nevent);
isc_task_detach(&info->peer);
@ -123,7 +122,7 @@ tick(isc_task_t *task, isc_event_t *event)
nevent = isc_event_allocate(info->mctx, info,
FOO_EVENT,
foo_event, task,
sizeof *event);
sizeof(*event));
RUNTIME_CHECK(nevent != NULL);
isc_task_sendanddetach(&task, &nevent);
}

4
bin/tests/sig0_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sig0_test.c,v 1.9 2001/03/28 02:43:44 bwelling Exp $ */
/* $Id: sig0_test.c,v 1.10 2001/11/27 01:55:24 gson Exp $ */
#include <config.h>
@ -155,7 +155,7 @@ buildquery(void) {
CHECK("dns_message_gettempname", result);
isc_buffer_init(&namesrc, nametext, strlen(nametext));
isc_buffer_add(&namesrc, strlen(nametext));
isc_buffer_init(&namedst, namedata, sizeof namedata);
isc_buffer_init(&namedst, namedata, sizeof(namedata));
dns_name_init(qname, NULL);
result = dns_name_fromtext(qname, &namesrc, dns_rootname, ISC_FALSE,
&namedst);

6
bin/tests/sock_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sock_test.c,v 1.47 2001/01/09 21:41:41 bwelling Exp $ */
/* $Id: sock_test.c,v 1.48 2001/11/27 01:55:26 gson Exp $ */
#include <config.h>
@ -82,12 +82,12 @@ my_recv(isc_task_t *task, isc_event_t *event) {
dev->n, dev->result);
if (dev->address.type.sa.sa_family == AF_INET6) {
inet_ntop(AF_INET6, &dev->address.type.sin6.sin6_addr,
host, sizeof (host));
host, sizeof(host));
printf("\tFrom: %s port %d\n", host,
ntohs(dev->address.type.sin6.sin6_port));
} else {
inet_ntop(AF_INET, &dev->address.type.sin.sin_addr,
host, sizeof (host));
host, sizeof(host));
printf("\tFrom: %s port %d\n", host,
ntohs(dev->address.type.sin.sin_port));
}

4
bin/tests/sym_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sym_test.c,v 1.22 2001/01/09 21:41:42 bwelling Exp $ */
/* $Id: sym_test.c,v 1.23 2001/11/27 01:55:27 gson Exp $ */
#include <config.h>
@ -71,7 +71,7 @@ main(int argc, char *argv[]) {
RUNTIME_CHECK(isc_symtab_create(mctx, 691, undefine_action, NULL,
case_sensitive, &st) == ISC_R_SUCCESS);
while (fgets(s, sizeof s, stdin) != NULL) {
while (fgets(s, sizeof(s), stdin) != NULL) {
len = strlen(s);
if (len > 0 && s[len - 1] == '\n') {
s[len - 1] = '\0';

32
bin/tests/task_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: task_test.c,v 1.47 2001/01/09 21:41:44 bwelling Exp $ */
/* $Id: task_test.c,v 1.48 2001/11/27 01:55:28 gson Exp $ */
#include <config.h>
@ -122,49 +122,49 @@ main(int argc, char *argv[]) {
* program.
*/
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "1",
sizeof *event);
sizeof(*event));
isc_task_send(t1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "1",
sizeof *event);
sizeof(*event));
isc_task_send(t1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "1",
sizeof *event);
sizeof(*event));
isc_task_send(t1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "1",
sizeof *event);
sizeof(*event));
isc_task_send(t1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "1",
sizeof *event);
sizeof(*event));
isc_task_send(t1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "1",
sizeof *event);
sizeof(*event));
isc_task_send(t1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "1",
sizeof *event);
sizeof(*event));
isc_task_send(t1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "1",
sizeof *event);
sizeof(*event));
isc_task_send(t1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "1",
sizeof *event);
sizeof(*event));
isc_task_send(t1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "2",
sizeof *event);
sizeof(*event));
isc_task_send(t2, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "3",
sizeof *event);
sizeof(*event));
isc_task_send(t3, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "4",
sizeof *event);
sizeof(*event));
isc_task_send(t4, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "2",
sizeof *event);
sizeof(*event));
isc_task_send(t2, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "3",
sizeof *event);
sizeof(*event));
isc_task_send(t3, &event);
event = isc_event_allocate(mctx, (void *)1, 1, my_callback, "4",
sizeof *event);
sizeof(*event));
isc_task_send(t4, &event);
isc_task_purgerange(t3,
NULL,

36
bin/tests/tasks/t_tasks.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: t_tasks.c,v 1.29 2001/08/08 22:54:33 gson Exp $ */
/* $Id: t_tasks.c,v 1.30 2001/11/27 01:55:31 gson Exp $ */
#include <config.h>
@ -216,7 +216,7 @@ t_tasks1(void) {
* program.
*/
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "1",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -225,7 +225,7 @@ t_tasks1(void) {
isc_task_send(task1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "1",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -234,7 +234,7 @@ t_tasks1(void) {
isc_task_send(task1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "1",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -243,7 +243,7 @@ t_tasks1(void) {
isc_task_send(task1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "1",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -252,7 +252,7 @@ t_tasks1(void) {
isc_task_send(task1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "1",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -261,7 +261,7 @@ t_tasks1(void) {
isc_task_send(task1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "1",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -270,7 +270,7 @@ t_tasks1(void) {
isc_task_send(task1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "1",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -279,7 +279,7 @@ t_tasks1(void) {
isc_task_send(task1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "1",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -288,7 +288,7 @@ t_tasks1(void) {
isc_task_send(task1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "1",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -297,7 +297,7 @@ t_tasks1(void) {
isc_task_send(task1, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "2",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -306,7 +306,7 @@ t_tasks1(void) {
isc_task_send(task2, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "3",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -315,7 +315,7 @@ t_tasks1(void) {
isc_task_send(task3, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "4",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -324,7 +324,7 @@ t_tasks1(void) {
isc_task_send(task4, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "2",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -333,7 +333,7 @@ t_tasks1(void) {
isc_task_send(task2, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "3",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -342,7 +342,7 @@ t_tasks1(void) {
isc_task_send(task3, &event);
event = isc_event_allocate(mctx, (void *)1, 1, t1_callback, "4",
sizeof *event);
sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -532,7 +532,7 @@ t_tasks2(void) {
}
T2_event = isc_event_allocate(T2_mctx, (void *)1, 1, t2_callback,
(void *)ntasks, sizeof *event);
(void *)ntasks, sizeof(*event));
if (T2_event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);
@ -2222,7 +2222,7 @@ t_tasks14(void) {
}
event = isc_event_allocate(mctx, NULL, 1, t14_callback,
(void *)i, sizeof *event);
(void *)i, sizeof(*event));
if (event == NULL) {
t_info("isc_event_allocate failed\n");
return(T_UNRESOLVED);

6
bin/tests/wire_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: wire_test.c,v 1.61 2001/09/29 18:23:56 gson Exp $ */
/* $Id: wire_test.c,v 1.62 2001/11/27 01:55:29 gson Exp $ */
#include <config.h>
@ -126,7 +126,7 @@ main(int argc, char *argv[]) {
f = stdin;
bp = b;
while (fgets(s, sizeof s, f) != NULL) {
while (fgets(s, sizeof(s), f) != NULL) {
rp = s;
wp = s;
len = 0;
@ -146,7 +146,7 @@ main(int argc, char *argv[]) {
printf("bad input format: %d\n", len);
exit(1);
}
if (len > (sizeof b) * 2) {
if (len > sizeof(b) * 2) {
printf("input too long\n");
exit(2);
}

6
bin/tests/zone_test.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone_test.c,v 1.26 2001/01/22 22:29:36 gson Exp $ */
/* $Id: zone_test.c,v 1.27 2001/11/27 01:55:30 gson Exp $ */
#include <config.h>
@ -179,7 +179,7 @@ query(void) {
FD_ZERO(&rfdset);
FD_SET(0, &rfdset);
select(1, &rfdset, NULL, NULL, NULL);
if (fgets(buf, sizeof buf, stdin) == NULL) {
if (fgets(buf, sizeof(buf), stdin) == NULL) {
fprintf(stdout, "\n");
break;
}
@ -254,7 +254,7 @@ main(int argc, char **argv) {
filename = isc_commandline_argument;
break;
case 'm':
memset(&addr, 0, sizeof addr);
memset(&addr, 0, sizeof(addr));
addr.type.sin.sin_family = AF_INET;
inet_pton(AF_INET, isc_commandline_argument,
&addr.type.sin.sin_addr);

6
lib/dns/rdata/any_255/tsig_250.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: tsig_250.c,v 1.52 2001/07/16 03:05:58 marka Exp $ */
/* $Id: tsig_250.c,v 1.53 2001/11/27 01:55:32 gson Exp $ */
/* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
@ -133,7 +133,7 @@ static inline isc_result_t
totext_any_tsig(ARGS_TOTEXT) {
isc_region_t sr;
isc_region_t sigr;
char buf[sizeof "281474976710655 "];
char buf[sizeof("281474976710655 ")];
char *bufp;
dns_name_t name;
dns_name_t prefix;
@ -165,7 +165,7 @@ totext_any_tsig(ARGS_TOTEXT) {
(sr.base[2] << 24) | (sr.base[3] << 16) |
(sr.base[4] << 8) | sr.base[5];
isc_region_consume(&sr, 6);
bufp = &buf[sizeof buf - 1];
bufp = &buf[sizeof(buf) - 1];
*bufp-- = 0;
*bufp-- = ' ';
do {

4
lib/dns/rdata/generic/afsdb_18.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: afsdb_18.c,v 1.39 2001/07/16 03:06:00 marka Exp $ */
/* $Id: afsdb_18.c,v 1.40 2001/11/27 01:55:34 gson Exp $ */
/* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
@ -64,7 +64,7 @@ totext_afsdb(ARGS_TOTEXT) {
dns_name_t name;
dns_name_t prefix;
isc_region_t region;
char buf[sizeof "64000 "];
char buf[sizeof("64000 ")];
isc_boolean_t sub;
unsigned int num;

4
lib/dns/rdata/generic/cert_37.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cert_37.c,v 1.40 2001/07/16 03:06:01 marka Exp $ */
/* $Id: cert_37.c,v 1.41 2001/11/27 01:55:35 gson Exp $ */
/* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
@ -71,7 +71,7 @@ fromtext_cert(ARGS_FROMTEXT) {
static inline isc_result_t
totext_cert(ARGS_TOTEXT) {
isc_region_t sr;
char buf[sizeof "64000 "];
char buf[sizeof("64000 ")];
unsigned int n;
REQUIRE(rdata->type == 37);

4
lib/dns/rdata/generic/key_25.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: key_25.c,v 1.41 2001/07/16 03:06:09 marka Exp $ */
/* $Id: key_25.c,v 1.42 2001/11/27 01:55:36 gson Exp $ */
/*
* Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@ -73,7 +73,7 @@ fromtext_key(ARGS_FROMTEXT) {
static inline isc_result_t
totext_key(ARGS_TOTEXT) {
isc_region_t sr;
char buf[sizeof "64000"];
char buf[sizeof("64000")];
unsigned int flags;
unsigned char algorithm;

4
lib/dns/rdata/generic/mx_15.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: mx_15.c,v 1.48 2001/07/16 03:06:19 marka Exp $ */
/* $Id: mx_15.c,v 1.49 2001/11/27 01:55:37 gson Exp $ */
/* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
@ -57,7 +57,7 @@ totext_mx(ARGS_TOTEXT) {
dns_name_t name;
dns_name_t prefix;
isc_boolean_t sub;
char buf[sizeof "64000"];
char buf[sizeof("64000")];
unsigned short num;
REQUIRE(rdata->type == 15);

6
lib/dns/rdata/generic/nxt_30.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nxt_30.c,v 1.50 2001/11/27 00:56:04 gson Exp $ */
/* $Id: nxt_30.c,v 1.51 2001/11/27 01:55:38 gson Exp $ */
/* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
@ -58,7 +58,7 @@ fromtext_nxt(ARGS_FROMTEXT) {
origin = (origin != NULL) ? origin : dns_rootname;
RETTOK(dns_name_fromtext(&name, &buffer, origin, downcase, target));
memset(bm, 0, sizeof bm);
memset(bm, 0, sizeof(bm));
do {
RETERR(isc_lex_getmastertoken(lexer, &token,
isc_tokentype_string, ISC_TRUE));
@ -116,7 +116,7 @@ totext_nxt(ARGS_TOTEXT) {
RETERR(dns_rdatatype_totext(t,
target));
} else {
char buf[sizeof "65535"];
char buf[sizeof("65535")];
sprintf(buf, "%u", t);
RETERR(str_totext(buf,
target));

4
lib/dns/rdata/generic/rt_21.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rt_21.c,v 1.37 2001/07/16 03:06:28 marka Exp $ */
/* $Id: rt_21.c,v 1.38 2001/11/27 01:55:39 gson Exp $ */
/* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
@ -60,7 +60,7 @@ totext_rt(ARGS_TOTEXT) {
dns_name_t name;
dns_name_t prefix;
isc_boolean_t sub;
char buf[sizeof "64000"];
char buf[sizeof("64000")];
unsigned short num;
REQUIRE(rdata->type == 21);

6
lib/dns/rdata/generic/sig_24.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sig_24.c,v 1.54 2001/07/16 03:06:29 marka Exp $ */
/* $Id: sig_24.c,v 1.55 2001/11/27 01:55:40 gson Exp $ */
/* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
@ -127,7 +127,7 @@ fromtext_sig(ARGS_FROMTEXT) {
static inline isc_result_t
totext_sig(ARGS_TOTEXT) {
isc_region_t sr;
char buf[sizeof "4294967295"];
char buf[sizeof("4294967295")];
dns_rdatatype_t covered;
unsigned long ttl;
unsigned long when;
@ -154,7 +154,7 @@ totext_sig(ARGS_TOTEXT) {
if (dns_rdatatype_isknown(covered) && covered != 0) {
RETERR(dns_rdatatype_totext(covered, target));
} else {
char buf[sizeof "65535"];
char buf[sizeof("65535")];
sprintf(buf, "%u", covered);
RETERR(str_totext(buf, target));
}

6
lib/dns/rdata/generic/soa_6.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: soa_6.c,v 1.54 2001/11/27 00:56:06 gson Exp $ */
/* $Id: soa_6.c,v 1.55 2001/11/27 01:55:42 gson Exp $ */
/* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
@ -112,13 +112,13 @@ totext_soa(ARGS_TOTEXT) {
RETERR(str_totext(tctx->linebreak, target));
for (i = 0; i < 5; i++) {
char buf[sizeof "2147483647"];
char buf[sizeof("2147483647")];
unsigned long num;
unsigned int numlen;
num = uint32_fromregion(&dregion);
isc_region_consume(&dregion, 4);
numlen = sprintf(buf, "%lu", num);
INSIST(numlen > 0 && numlen < sizeof "2147483647");
INSIST(numlen > 0 && numlen < sizeof("2147483647"));
RETERR(str_totext(buf, target));
if (multiline && comment) {
RETERR(str_totext(" ; " + numlen, target));

4
lib/dns/rdata/generic/tkey_249.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: tkey_249.c,v 1.48 2001/07/16 03:06:32 marka Exp $ */
/* $Id: tkey_249.c,v 1.49 2001/11/27 01:55:43 gson Exp $ */
/*
* Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
@ -126,7 +126,7 @@ fromtext_tkey(ARGS_FROMTEXT) {
static inline isc_result_t
totext_tkey(ARGS_TOTEXT) {
isc_region_t sr, dr;
char buf[sizeof "4294967295 "];
char buf[sizeof("4294967295 ")];
unsigned long n;
dns_name_t name;
dns_name_t prefix;

6
lib/dns/rdata/in_1/a6_38.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: a6_38.c,v 1.46 2001/07/26 21:34:00 gson Exp $ */
/* $Id: a6_38.c,v 1.47 2001/11/27 01:55:44 gson Exp $ */
/* RFC2874 */
@ -94,7 +94,7 @@ totext_in_a6(ARGS_TOTEXT) {
unsigned char prefixlen;
unsigned char octets;
unsigned char mask;
char buf[sizeof "128"];
char buf[sizeof("128")];
dns_name_t name;
dns_name_t prefix;
isc_boolean_t sub;
@ -113,7 +113,7 @@ totext_in_a6(ARGS_TOTEXT) {
if (prefixlen != 128) {
octets = prefixlen/8;
memset(addr, 0, sizeof addr);
memset(addr, 0, sizeof(addr));
memcpy(&addr[octets], sr.base, 16 - octets);
mask = 0xff >> (prefixlen % 8);
addr[octets] &= mask;

4
lib/dns/rdata/in_1/kx_36.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: kx_36.c,v 1.37 2001/07/16 03:06:43 marka Exp $ */
/* $Id: kx_36.c,v 1.38 2001/11/27 01:55:45 gson Exp $ */
/* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
@ -60,7 +60,7 @@ totext_in_kx(ARGS_TOTEXT) {
dns_name_t name;
dns_name_t prefix;
isc_boolean_t sub;
char buf[sizeof "64000"];
char buf[sizeof("64000")];
unsigned short num;
REQUIRE(rdata->type == 36);

4
lib/dns/rdata/in_1/naptr_35.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: naptr_35.c,v 1.43 2001/07/16 03:06:44 marka Exp $ */
/* $Id: naptr_35.c,v 1.44 2001/11/27 01:55:46 gson Exp $ */
/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
@ -96,7 +96,7 @@ totext_in_naptr(ARGS_TOTEXT) {
dns_name_t name;
dns_name_t prefix;
isc_boolean_t sub;
char buf[sizeof "64000"];
char buf[sizeof("64000")];
unsigned short num;
REQUIRE(rdata->type == 35);

4
lib/dns/rdata/in_1/nsap_22.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nsap_22.c,v 1.33 2001/07/16 03:06:47 marka Exp $ */
/* $Id: nsap_22.c,v 1.34 2001/11/27 01:55:48 gson Exp $ */
/* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
@ -77,7 +77,7 @@ fromtext_in_nsap(ARGS_FROMTEXT) {
static inline isc_result_t
totext_in_nsap(ARGS_TOTEXT) {
isc_region_t region;
char buf[sizeof "xx"];
char buf[sizeof("xx")];
REQUIRE(rdata->type == 22);
REQUIRE(rdata->rdclass == 1);

4
lib/dns/rdata/in_1/px_26.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: px_26.c,v 1.34 2001/07/16 03:06:48 marka Exp $ */
/* $Id: px_26.c,v 1.35 2001/11/27 01:55:49 gson Exp $ */
/* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
@ -76,7 +76,7 @@ totext_in_px(ARGS_TOTEXT) {
dns_name_t name;
dns_name_t prefix;
isc_boolean_t sub;
char buf[sizeof "64000"];
char buf[sizeof("64000")];
unsigned short num;
REQUIRE(rdata->type == 26);

4
lib/dns/rdata/in_1/srv_33.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: srv_33.c,v 1.36 2001/07/16 03:06:49 marka Exp $ */
/* $Id: srv_33.c,v 1.37 2001/11/27 01:55:50 gson Exp $ */
/* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
@ -84,7 +84,7 @@ totext_in_srv(ARGS_TOTEXT) {
dns_name_t name;
dns_name_t prefix;
isc_boolean_t sub;
char buf[sizeof "64000"];
char buf[sizeof("64000")];
unsigned short num;
REQUIRE(rdata->type == 33);

6
lib/dns/rdata/in_1/wks_11.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: wks_11.c,v 1.45 2001/11/27 00:56:07 gson Exp $ */
/* $Id: wks_11.c,v 1.46 2001/11/27 01:55:51 gson Exp $ */
/* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
@ -92,7 +92,7 @@ fromtext_in_wks(ARGS_FROMTEXT) {
RETERR(uint8_tobuffer(proto, target));
memset(bm, 0, sizeof bm);
memset(bm, 0, sizeof(bm));
do {
RETERR(isc_lex_getmastertoken(lexer, &token,
isc_tokentype_string, ISC_TRUE));
@ -139,7 +139,7 @@ static inline isc_result_t
totext_in_wks(ARGS_TOTEXT) {
isc_region_t sr;
unsigned short proto;
char buf[sizeof "65535"];
char buf[sizeof("65535")];
unsigned int i, j;
UNUSED(tctx);

4
lib/dns/sec/dst/dst_api.c
View file

@ -19,7 +19,7 @@
/*
* Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.94 2001/11/07 23:03:52 bwelling Exp $
* $Id: dst_api.c,v 1.95 2001/11/27 01:55:52 gson Exp $
*/
#include <config.h>
@ -332,7 +332,7 @@ dst_key_fromfile(dns_name_t *name, dns_keytag_t id,
CHECKALG(alg);
isc_buffer_init(&b, filename, sizeof filename);
isc_buffer_init(&b, filename, sizeof(filename));
result = buildfilename(name, id, alg, type, directory, &b);
if (result != ISC_R_SUCCESS)
return (result);

4
lib/isc/base64.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: base64.c,v 1.24 2001/11/27 00:56:08 gson Exp $ */
/* $Id: base64.c,v 1.25 2001/11/27 01:55:53 gson Exp $ */
#include <config.h>
@ -55,7 +55,7 @@ isc_base64_totext(isc_region_t *source, int wordlength,
if (wordlength < 4)
wordlength = 4;
memset(buf, 0, sizeof buf);
memset(buf, 0, sizeof(buf));
while (source->length > 2) {
buf[0] = base64[(source->base[0]>>2)&0x3f];
buf[1] = base64[((source->base[0]<<4)&0x30)|

8
lib/isc/entropy.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: entropy.c,v 1.6 2001/11/27 00:56:09 gson Exp $ */
/* $Id: entropy.c,v 1.7 2001/11/27 01:55:55 gson Exp $ */
/*
* This is the system independent part of the entropy module. It is
@ -353,9 +353,9 @@ reseed(isc_entropy_t *ent) {
if (ent->initcount == 0) {
pid = getpid();
entropypool_adddata(ent, &pid, sizeof pid, 0);
entropypool_adddata(ent, &pid, sizeof(pid), 0);
pid = getppid();
entropypool_adddata(ent, &pid, sizeof pid, 0);
entropypool_adddata(ent, &pid, sizeof(pid), 0);
}
/*
@ -369,7 +369,7 @@ reseed(isc_entropy_t *ent) {
result = isc_time_now(&t);
if (result == ISC_R_SUCCESS) {
entropypool_adddata(ent, &t, sizeof t, 0);
entropypool_adddata(ent, &t, sizeof(t), 0);
ent->initcount++;
}
}

4
lib/isc/event.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: event.c,v 1.15 2001/01/09 21:56:01 bwelling Exp $ */
/* $Id: event.c,v 1.16 2001/11/27 01:55:56 gson Exp $ */
/*
* Principal Author: Bob Halley
@ -45,7 +45,7 @@ isc_event_allocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type,
isc_event_t *event;
void *deconst_arg;
REQUIRE(size >= sizeof (struct isc_event));
REQUIRE(size >= sizeof(struct isc_event));
REQUIRE(action != NULL);
event = isc_mem_get(mctx, size);

14
lib/isc/heap.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: heap.c,v 1.28 2001/06/04 19:33:21 tale Exp $ */
/* $Id: heap.c,v 1.29 2001/11/27 01:55:57 gson Exp $ */
/*
* Heap implementation of priority queues adapted from the following:
@ -78,7 +78,7 @@ isc_heap_create(isc_mem_t *mctx, isc_heapcompare_t compare,
REQUIRE(heapp != NULL && *heapp == NULL);
REQUIRE(compare != NULL);
heap = isc_mem_get(mctx, sizeof *heap);
heap = isc_mem_get(mctx, sizeof(*heap));
if (heap == NULL)
return (ISC_R_NOMEMORY);
heap->magic = HEAP_MAGIC;
@ -108,9 +108,9 @@ isc_heap_destroy(isc_heap_t **heapp) {
if (heap->array != NULL)
isc_mem_put(heap->mctx, heap->array,
heap->size * sizeof (void *));
heap->size * sizeof(void *));
heap->magic = 0;
isc_mem_put(heap->mctx, heap, sizeof *heap);
isc_mem_put(heap->mctx, heap, sizeof(*heap));
*heapp = NULL;
}
@ -123,13 +123,13 @@ resize(isc_heap_t *heap) {
REQUIRE(VALID_HEAP(heap));
new_size = heap->size + heap->size_increment;
new_array = isc_mem_get(heap->mctx, new_size * sizeof (void *));
new_array = isc_mem_get(heap->mctx, new_size * sizeof(void *));
if (new_array == NULL)
return (ISC_FALSE);
if (heap->array != NULL) {
memcpy(new_array, heap->array, heap->size * sizeof (void *));
memcpy(new_array, heap->array, heap->size * sizeof(void *));
isc_mem_put(heap->mctx, heap->array,
heap->size * sizeof (void *));
heap->size * sizeof(void *));
}
heap->size = new_size;
heap->array = new_array;

4
lib/isc/hex.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: hex.c,v 1.9 2001/11/27 00:56:10 gson Exp $ */
/* $Id: hex.c,v 1.10 2001/11/27 01:55:58 gson Exp $ */
#include <config.h>
@ -55,7 +55,7 @@ isc_hex_totext(isc_region_t *source, int wordlength,
if (wordlength < 2)
wordlength = 2;
memset(buf, 0, sizeof buf);
memset(buf, 0, sizeof(buf));
while (source->length > 0) {
buf[0] = hex[(source->base[0] >> 4) & 0xf];
buf[1] = hex[(source->base[0]) & 0xf];

12
lib/isc/hmacmd5.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: hmacmd5.c,v 1.5 2001/01/09 21:56:05 bwelling Exp $ */
/* $Id: hmacmd5.c,v 1.6 2001/11/27 01:55:59 gson Exp $ */
/*
* This code implements the HMAC-MD5 keyed hash algorithm
@ -45,7 +45,7 @@ isc_hmacmd5_init(isc_hmacmd5_t *ctx, const unsigned char *key,
unsigned char ipad[PADLEN];
int i;
memset(ctx->key, 0, sizeof (ctx->key));
memset(ctx->key, 0, sizeof(ctx->key));
if (len > sizeof(ctx->key)) {
isc_md5_t md5ctx;
isc_md5_init(&md5ctx);
@ -55,7 +55,7 @@ isc_hmacmd5_init(isc_hmacmd5_t *ctx, const unsigned char *key,
memcpy(ctx->key, key, len);
isc_md5_init(&ctx->md5ctx);
memset(ipad, IPAD, sizeof (ipad));
memset(ipad, IPAD, sizeof(ipad));
for (i = 0; i < PADLEN; i++)
ipad[i] ^= ctx->key[i];
isc_md5_update(&ctx->md5ctx, ipad, sizeof(ipad));
@ -64,8 +64,8 @@ isc_hmacmd5_init(isc_hmacmd5_t *ctx, const unsigned char *key,
void
isc_hmacmd5_invalidate(isc_hmacmd5_t *ctx) {
isc_md5_invalidate(&ctx->md5ctx);
memset(ctx->key, 0, sizeof (ctx->key));
memset(ctx, 0, sizeof (ctx));
memset(ctx->key, 0, sizeof(ctx->key));
memset(ctx, 0, sizeof(ctx));
}
/*
@ -89,7 +89,7 @@ isc_hmacmd5_sign(isc_hmacmd5_t *ctx, unsigned char *digest) {
isc_md5_final(&ctx->md5ctx, digest);
memset(opad, OPAD, sizeof (opad));
memset(opad, OPAD, sizeof(opad));
for (i = 0; i < PADLEN; i++)
opad[i] ^= ctx->key[i];

10
lib/isc/inet_ntop.c
View file

@ -17,7 +17,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char rcsid[] =
"$Id: inet_ntop.c,v 1.12 2001/01/25 20:10:01 gson Exp $";
"$Id: inet_ntop.c,v 1.13 2001/11/27 01:56:00 gson Exp $";
#endif /* LIBC_SCCS and not lint */
#include <config.h>
@ -84,7 +84,7 @@ static const char *
inet_ntop4(const unsigned char *src, char *dst, size_t size)
{
static const char *fmt = "%u.%u.%u.%u";
char tmp[sizeof "255.255.255.255"];
char tmp[sizeof("255.255.255.255")];
if ((size_t)sprintf(tmp, fmt, src[0], src[1], src[2], src[3]) >= size)
{
@ -113,7 +113,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size)
* Keep this in mind if you think this function should have been coded
* to use pointer overlays. All the world's not a VAX.
*/
char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")], *tp;
struct { int base, len; } best, cur;
unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ];
int i;
@ -123,7 +123,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size)
* Copy the input (bytewise) array into a wordwise array.
* Find the longest run of 0x00's in src[] for :: shorthanding.
*/
memset(words, '\0', sizeof words);
memset(words, '\0', sizeof(words));
for (i = 0; i < NS_IN6ADDRSZ; i++)
words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
best.base = -1;
@ -168,7 +168,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size)
if (i == 6 && best.base == 0 &&
(best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
if (!inet_ntop4(src+12, tp,
sizeof tmp - (tp - tmp)))
sizeof(tmp) - (tp - tmp)))
return (NULL);
tp += strlen(tp);
break;

16
lib/isc/lex.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lex.c,v 1.68 2001/11/21 22:26:46 gson Exp $ */
/* $Id: lex.c,v 1.69 2001/11/27 01:56:02 gson Exp $ */
#include <config.h>
@ -94,12 +94,12 @@ isc_lex_create(isc_mem_t *mctx, size_t max_token, isc_lex_t **lexp) {
REQUIRE(lexp != NULL && *lexp == NULL);
REQUIRE(max_token > 0);
lex = isc_mem_get(mctx, sizeof *lex);
lex = isc_mem_get(mctx, sizeof(*lex));
if (lex == NULL)
return (ISC_R_NOMEMORY);
lex->data = isc_mem_get(mctx, max_token + 1);
if (lex->data == NULL) {
isc_mem_put(mctx, lex, sizeof *lex);
isc_mem_put(mctx, lex, sizeof(*lex));
return (ISC_R_NOMEMORY);
}
lex->mctx = mctx;
@ -135,7 +135,7 @@ isc_lex_destroy(isc_lex_t **lexp) {
if (lex->data != NULL)
isc_mem_put(lex->mctx, lex->data, lex->max_token + 1);
lex->magic = 0;
isc_mem_put(lex->mctx, lex, sizeof *lex);
isc_mem_put(lex->mctx, lex, sizeof(*lex));
*lexp = NULL;
}
@ -192,7 +192,7 @@ new_source(isc_lex_t *lex, isc_boolean_t is_file, isc_boolean_t need_close,
inputsource *source;
isc_result_t result;
source = isc_mem_get(lex->mctx, sizeof *source);
source = isc_mem_get(lex->mctx, sizeof(*source));
if (source == NULL)
return (ISC_R_NOMEMORY);
source->result = ISC_R_SUCCESS;
@ -202,7 +202,7 @@ new_source(isc_lex_t *lex, isc_boolean_t is_file, isc_boolean_t need_close,
source->input = input;
source->name = isc_mem_strdup(lex->mctx, name);
if (source->name == NULL) {
isc_mem_put(lex->mctx, source, sizeof *source);
isc_mem_put(lex->mctx, source, sizeof(*source));
return (ISC_R_NOMEMORY);
}
source->pushback = NULL;
@ -210,7 +210,7 @@ new_source(isc_lex_t *lex, isc_boolean_t is_file, isc_boolean_t need_close,
lex->max_token);
if (result != ISC_R_SUCCESS) {
isc_mem_free(lex->mctx, source->name);
isc_mem_put(lex->mctx, source, sizeof *source);
isc_mem_put(lex->mctx, source, sizeof(*source));
return (result);
}
source->ignored = 0;
@ -294,7 +294,7 @@ isc_lex_close(isc_lex_t *lex) {
}
isc_mem_free(lex->mctx, source->name);
isc_buffer_free(&source->pushback);
isc_mem_put(lex->mctx, source, sizeof *source);
isc_mem_put(lex->mctx, source, sizeof(*source));
return (ISC_R_SUCCESS);
}

18
lib/isc/mem.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: mem.c,v 1.107 2001/11/27 00:56:14 gson Exp $ */
/* $Id: mem.c,v 1.108 2001/11/27 01:56:03 gson Exp $ */
#include <config.h>
@ -349,7 +349,7 @@ more_basic_blocks(isc_mem_t *ctx) {
if (ctx->basic_table_count == ctx->basic_table_size) {
table_size = ctx->basic_table_size + TABLE_INCREMENT;
table = (ctx->memalloc)(ctx->arg,
table_size * sizeof (unsigned char *));
table_size * sizeof(unsigned char *));
if (table == NULL) {
ctx->memalloc_failures++;
return (ISC_FALSE);
@ -357,7 +357,7 @@ more_basic_blocks(isc_mem_t *ctx) {
if (ctx->basic_table_size != 0) {
memcpy(table, ctx->basic_table,
ctx->basic_table_size *
sizeof (unsigned char *));
sizeof(unsigned char *));
(ctx->memfree)(ctx->arg, ctx->basic_table);
}
ctx->basic_table = table;
@ -706,7 +706,7 @@ isc_mem_createx(size_t init_max_size, size_t target_size,
UNUSED(target_size);
#endif
ctx = (memalloc)(arg, sizeof *ctx);
ctx = (memalloc)(arg, sizeof(*ctx));
if (ctx == NULL)
return (ISC_R_NOMEMORY);
@ -741,25 +741,25 @@ isc_mem_createx(size_t init_max_size, size_t target_size,
#endif /* ISC_MEM_USE_INTERNAL_MALLOC */
ctx->stats = (memalloc)(arg,
(ctx->max_size+1) * sizeof (struct stats));
(ctx->max_size+1) * sizeof(struct stats));
if (ctx->stats == NULL) {
result = ISC_R_NOMEMORY;
goto error;
}
memset(ctx->stats, 0, (ctx->max_size + 1) * sizeof (struct stats));
memset(ctx->stats, 0, (ctx->max_size + 1) * sizeof(struct stats));
#if ISC_MEM_USE_INTERNAL_MALLOC
if (target_size == 0)
ctx->mem_target = DEF_MEM_TARGET;
else
ctx->mem_target = target_size;
ctx->freelists = (memalloc)(arg, ctx->max_size * sizeof (element *));
ctx->freelists = (memalloc)(arg, ctx->max_size * sizeof(element *));
if (ctx->freelists == NULL) {
result = ISC_R_NOMEMORY;
goto error;
}
memset(ctx->freelists, 0,
ctx->max_size * sizeof (element *));
ctx->max_size * sizeof(element *));
ctx->basic_blocks = NULL;
ctx->basic_table = NULL;
ctx->basic_table_count = 0;
@ -782,7 +782,7 @@ isc_mem_createx(size_t init_max_size, size_t target_size,
unsigned int i;
ctx->debuglist = (memalloc)(arg,
(ctx->max_size+1) * sizeof (debuglist_t));
(ctx->max_size+1) * sizeof(debuglist_t));
if (ctx->debuglist == NULL) {
result = ISC_R_NOMEMORY;
goto error;

16
lib/isc/netaddr.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: netaddr.c,v 1.18 2001/04/14 00:20:07 tale Exp $ */
/* $Id: netaddr.c,v 1.19 2001/11/27 01:56:04 gson Exp $ */
#include <config.h>
@ -42,7 +42,7 @@ isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) {
return (ISC_FALSE);
break;
case AF_INET6:
if (memcmp(&a->type.in6, &b->type.in6, sizeof a->type.in6)
if (memcmp(&a->type.in6, &b->type.in6, sizeof(a->type.in6))
!= 0)
return (ISC_FALSE);
break;
@ -111,13 +111,13 @@ isc_netaddr_eqprefix(const isc_netaddr_t *a, const isc_netaddr_t *b,
isc_result_t
isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) {
char abuf[sizeof "xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255"];
char abuf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255")];
unsigned int alen;
const char *r;
REQUIRE(netaddr != NULL);
r = inet_ntop(netaddr->family, &netaddr->type, abuf, sizeof abuf);
r = inet_ntop(netaddr->family, &netaddr->type, abuf, sizeof(abuf));
if (r == NULL)
return (ISC_R_FAILURE);
@ -204,14 +204,14 @@ isc_netaddr_masktoprefixlen(const isc_netaddr_t *s, unsigned int *lenp) {
void
isc_netaddr_fromin(isc_netaddr_t *netaddr, const struct in_addr *ina) {
memset(netaddr, 0, sizeof *netaddr);
memset(netaddr, 0, sizeof(*netaddr));
netaddr->family = AF_INET;
netaddr->type.in = *ina;
}
void
isc_netaddr_fromin6(isc_netaddr_t *netaddr, const struct in6_addr *ina6) {
memset(netaddr, 0, sizeof *netaddr);
memset(netaddr, 0, sizeof(*netaddr));
netaddr->family = AF_INET6;
netaddr->type.in6 = *ina6;
}
@ -234,14 +234,14 @@ isc_netaddr_fromsockaddr(isc_netaddr_t *t, const isc_sockaddr_t *s) {
void
isc_netaddr_any(isc_netaddr_t *netaddr) {
memset(netaddr, 0, sizeof *netaddr);
memset(netaddr, 0, sizeof(*netaddr));
netaddr->family = AF_INET;
netaddr->type.in.s_addr = INADDR_ANY;
}
void
isc_netaddr_any6(isc_netaddr_t *netaddr) {
memset(netaddr, 0, sizeof *netaddr);
memset(netaddr, 0, sizeof(*netaddr));
netaddr->family = AF_INET6;
netaddr->type.in6 = in6addr_any;
}

4
lib/isc/nls/msgcat.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: msgcat.c,v 1.10 2001/06/04 19:33:31 tale Exp $ */
/* $Id: msgcat.c,v 1.11 2001/11/27 01:56:12 gson Exp $ */
/*
* Principal Author: Bob Halley
@ -62,7 +62,7 @@ isc_msgcat_open(const char *name, isc_msgcat_t **msgcatp) {
REQUIRE(name != NULL);
REQUIRE(msgcatp != NULL && *msgcatp == NULL);
msgcat = malloc(sizeof *msgcat);
msgcat = malloc(sizeof(*msgcat));
if (msgcat == NULL) {
*msgcatp = NULL;
return;

4
lib/isc/result.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: result.c,v 1.57 2001/10/22 07:09:21 marka Exp $ */
/* $Id: result.c,v 1.58 2001/11/27 01:56:05 gson Exp $ */
#include <config.h>
@ -117,7 +117,7 @@ register_table(unsigned int base, unsigned int nresults, const char **text,
* We use malloc() here because we we want to be able to use
* isc_result_totext() even if there is no memory context.
*/
table = malloc(sizeof *table);
table = malloc(sizeof(*table));
if (table == NULL)
return (ISC_R_NOMEMORY);
table->base = base;

54
lib/isc/sockaddr.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sockaddr.c,v 1.50 2001/10/02 06:06:15 marka Exp $ */
/* $Id: sockaddr.c,v 1.51 2001/11/27 01:56:06 gson Exp $ */
#include <config.h>
@ -47,14 +47,14 @@ isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b) {
switch (a->type.sa.sa_family) {
case AF_INET:
if (memcmp(&a->type.sin.sin_addr, &b->type.sin.sin_addr,
sizeof a->type.sin.sin_addr) != 0)
sizeof(a->type.sin.sin_addr)) != 0)
return (ISC_FALSE);
if (a->type.sin.sin_port != b->type.sin.sin_port)
return (ISC_FALSE);
break;
case AF_INET6:
if (memcmp(&a->type.sin6.sin6_addr, &b->type.sin6.sin6_addr,
sizeof a->type.sin6.sin6_addr) != 0)
sizeof(a->type.sin6.sin6_addr)) != 0)
return (ISC_FALSE);
if (a->type.sin6.sin6_port != b->type.sin6.sin6_port)
return (ISC_FALSE);
@ -78,12 +78,12 @@ isc_sockaddr_eqaddr(const isc_sockaddr_t *a, const isc_sockaddr_t *b) {
switch (a->type.sa.sa_family) {
case AF_INET:
if (memcmp(&a->type.sin.sin_addr, &b->type.sin.sin_addr,
sizeof a->type.sin.sin_addr) != 0)
sizeof(a->type.sin.sin_addr)) != 0)
return (ISC_FALSE);
break;
case AF_INET6:
if (memcmp(&a->type.sin6.sin6_addr, &b->type.sin6.sin6_addr,
sizeof a->type.sin6.sin6_addr) != 0)
sizeof(a->type.sin6.sin6_addr)) != 0)
return (ISC_FALSE);
break;
default:
@ -107,7 +107,7 @@ isc_result_t
isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) {
isc_result_t result;
isc_netaddr_t netaddr;
char pbuf[sizeof "65000"];
char pbuf[sizeof("65000")];
unsigned int plen;
isc_region_t avail;
@ -199,7 +199,7 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
} else {
s = (const unsigned char *)&sockaddr->
type.sin6.sin6_addr;
length = sizeof sockaddr->type.sin6.sin6_addr;
length = sizeof(sockaddr->type.sin6.sin6_addr);
}
p = ntohs(sockaddr->type.sin6.sin6_port);
break;
@ -236,28 +236,28 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
void
isc_sockaddr_any(isc_sockaddr_t *sockaddr)
{
memset(sockaddr, 0, sizeof *sockaddr);
memset(sockaddr, 0, sizeof(*sockaddr));
sockaddr->type.sin.sin_family = AF_INET;
#ifdef ISC_PLATFORM_HAVESALEN
sockaddr->type.sin.sin_len = sizeof sockaddr->type.sin;
sockaddr->type.sin.sin_len = sizeof(sockaddr->type.sin);
#endif
sockaddr->type.sin.sin_addr.s_addr = INADDR_ANY;
sockaddr->type.sin.sin_port = 0;
sockaddr->length = sizeof sockaddr->type.sin;
sockaddr->length = sizeof(sockaddr->type.sin);
ISC_LINK_INIT(sockaddr, link);
}
void
isc_sockaddr_any6(isc_sockaddr_t *sockaddr)
{
memset(sockaddr, 0, sizeof *sockaddr);
memset(sockaddr, 0, sizeof(*sockaddr));
sockaddr->type.sin6.sin6_family = AF_INET6;
#ifdef ISC_PLATFORM_HAVESALEN
sockaddr->type.sin6.sin6_len = sizeof sockaddr->type.sin6;
sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
#endif
sockaddr->type.sin6.sin6_addr = in6addr_any;
sockaddr->type.sin6.sin6_port = 0;
sockaddr->length = sizeof sockaddr->type.sin6;
sockaddr->length = sizeof(sockaddr->type.sin6);
ISC_LINK_INIT(sockaddr, link);
}
@ -265,14 +265,14 @@ void
isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
in_port_t port)
{
memset(sockaddr, 0, sizeof *sockaddr);
memset(sockaddr, 0, sizeof(*sockaddr));
sockaddr->type.sin.sin_family = AF_INET;
#ifdef ISC_PLATFORM_HAVESALEN
sockaddr->type.sin.sin_len = sizeof sockaddr->type.sin;
sockaddr->type.sin.sin_len = sizeof(sockaddr->type.sin);
#endif
sockaddr->type.sin.sin_addr = *ina;
sockaddr->type.sin.sin_port = htons(port);
sockaddr->length = sizeof sockaddr->type.sin;
sockaddr->length = sizeof(sockaddr->type.sin);
ISC_LINK_INIT(sockaddr, link);
}
@ -294,14 +294,14 @@ void
isc_sockaddr_fromin6(isc_sockaddr_t *sockaddr, const struct in6_addr *ina6,
in_port_t port)
{
memset(sockaddr, 0, sizeof *sockaddr);
memset(sockaddr, 0, sizeof(*sockaddr));
sockaddr->type.sin6.sin6_family = AF_INET6;
#ifdef ISC_PLATFORM_HAVESALEN
sockaddr->type.sin6.sin6_len = sizeof sockaddr->type.sin6;
sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
#endif
sockaddr->type.sin6.sin6_addr = *ina6;
sockaddr->type.sin6.sin6_port = htons(port);
sockaddr->length = sizeof sockaddr->type.sin6;
sockaddr->length = sizeof(sockaddr->type.sin6);
ISC_LINK_INIT(sockaddr, link);
}
@ -309,16 +309,16 @@ void
isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
in_port_t port)
{
memset(sockaddr, 0, sizeof *sockaddr);
memset(sockaddr, 0, sizeof(*sockaddr));
sockaddr->type.sin6.sin6_family = AF_INET6;
#ifdef ISC_PLATFORM_HAVESALEN
sockaddr->type.sin6.sin6_len = sizeof sockaddr->type.sin6;
sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
#endif
sockaddr->type.sin6.sin6_addr.s6_addr[10] = 0xff;
sockaddr->type.sin6.sin6_addr.s6_addr[11] = 0xff;
memcpy(&sockaddr->type.sin6.sin6_addr.s6_addr[12], ina, 4);
sockaddr->type.sin6.sin6_port = htons(port);
sockaddr->length = sizeof sockaddr->type.sin6;
sockaddr->length = sizeof(sockaddr->type.sin6);
ISC_LINK_INIT(sockaddr, link);
}
@ -354,21 +354,21 @@ void
isc_sockaddr_fromnetaddr(isc_sockaddr_t *sockaddr, const isc_netaddr_t *na,
in_port_t port)
{
memset(sockaddr, 0, sizeof *sockaddr);
memset(sockaddr, 0, sizeof(*sockaddr));
sockaddr->type.sin.sin_family = na->family;
switch (na->family) {
case AF_INET:
sockaddr->length = sizeof sockaddr->type.sin;
sockaddr->length = sizeof(sockaddr->type.sin);
#ifdef ISC_PLATFORM_HAVESALEN
sockaddr->type.sin.sin_len = sizeof sockaddr->type.sin;
sockaddr->type.sin.sin_len = sizeof(sockaddr->type.sin);
#endif
sockaddr->type.sin.sin_addr = na->type.in;
sockaddr->type.sin.sin_port = htons(port);
break;
case AF_INET6:
sockaddr->length = sizeof sockaddr->type.sin6;
sockaddr->length = sizeof(sockaddr->type.sin6);
#ifdef ISC_PLATFORM_HAVESALEN
sockaddr->type.sin6.sin6_len = sizeof sockaddr->type.sin6;
sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
#endif
memcpy(&sockaddr->type.sin6.sin6_addr, &na->type.in6, 16);
sockaddr->type.sin6.sin6_port = htons(port);

18
lib/isc/symtab.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: symtab.c,v 1.24 2001/06/04 19:33:27 tale Exp $ */
/* $Id: symtab.c,v 1.25 2001/11/27 01:56:07 gson Exp $ */
#include <config.h>
@ -64,13 +64,13 @@ isc_symtab_create(isc_mem_t *mctx, unsigned int size,
REQUIRE(symtabp != NULL && *symtabp == NULL);
REQUIRE(size > 0); /* Should be prime. */
symtab = (isc_symtab_t *)isc_mem_get(mctx, sizeof *symtab);
symtab = (isc_symtab_t *)isc_mem_get(mctx, sizeof(*symtab));
if (symtab == NULL)
return (ISC_R_NOMEMORY);
symtab->table = (eltlist_t *)isc_mem_get(mctx,
size * sizeof (eltlist_t));
size * sizeof(eltlist_t));
if (symtab->table == NULL) {
isc_mem_put(mctx, symtab, sizeof *symtab);
isc_mem_put(mctx, symtab, sizeof(*symtab));
return (ISC_R_NOMEMORY);
}
for (i = 0; i < size; i++)
@ -105,13 +105,13 @@ isc_symtab_destroy(isc_symtab_t **symtabp) {
elt->type,
elt->value,
symtab->undefine_arg);
isc_mem_put(symtab->mctx, elt, sizeof *elt);
isc_mem_put(symtab->mctx, elt, sizeof(*elt));
}
}
isc_mem_put(symtab->mctx, symtab->table,
symtab->size * sizeof (eltlist_t));
symtab->size * sizeof(eltlist_t));
symtab->magic = 0;
isc_mem_put(symtab->mctx, symtab, sizeof *symtab);
isc_mem_put(symtab->mctx, symtab, sizeof(*symtab));
*symtabp = NULL;
}
@ -202,7 +202,7 @@ isc_symtab_define(isc_symtab_t *symtab, const char *key, unsigned int type,
elt->value,
symtab->undefine_arg);
} else {
elt = (elt_t *)isc_mem_get(symtab->mctx, sizeof *elt);
elt = (elt_t *)isc_mem_get(symtab->mctx, sizeof(*elt));
if (elt == NULL)
return (ISC_R_NOMEMORY);
ISC_LINK_INIT(elt, link);
@ -244,7 +244,7 @@ isc_symtab_undefine(isc_symtab_t *symtab, const char *key, unsigned int type) {
(symtab->undefine_action)(elt->key, elt->type,
elt->value, symtab->undefine_arg);
UNLINK(symtab->table[bucket], elt, link);
isc_mem_put(symtab->mctx, elt, sizeof *elt);
isc_mem_put(symtab->mctx, elt, sizeof(*elt));
return (ISC_R_SUCCESS);
}

28
lib/isc/task.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: task.c,v 1.85 2001/06/04 19:33:28 tale Exp $ */
/* $Id: task.c,v 1.86 2001/11/27 01:56:08 gson Exp $ */
/*
* Principal Author: Bob Halley
@ -164,7 +164,7 @@ task_finished(isc_task_t *task) {
DESTROYLOCK(&task->lock);
task->magic = 0;
isc_mem_put(manager->mctx, task, sizeof *task);
isc_mem_put(manager->mctx, task, sizeof(*task));
}
isc_result_t
@ -177,13 +177,13 @@ isc_task_create(isc_taskmgr_t *manager, unsigned int quantum,
REQUIRE(VALID_MANAGER(manager));
REQUIRE(taskp != NULL && *taskp == NULL);
task = isc_mem_get(manager->mctx, sizeof *task);
task = isc_mem_get(manager->mctx, sizeof(*task));
if (task == NULL)
return (ISC_R_NOMEMORY);
XTRACE("isc_task_create");
task->manager = manager;
if (isc_mutex_init(&task->lock) != ISC_R_SUCCESS) {
isc_mem_put(manager->mctx, task, sizeof *task);
isc_mem_put(manager->mctx, task, sizeof(*task));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -197,7 +197,7 @@ isc_task_create(isc_taskmgr_t *manager, unsigned int quantum,
task->quantum = quantum;
task->flags = 0;
#ifdef ISC_TASK_NAMES
memset(task->name, 0, sizeof task->name);
memset(task->name, 0, sizeof(task->name));
task->tag = NULL;
#endif
INIT_LINK(task, link);
@ -215,7 +215,7 @@ isc_task_create(isc_taskmgr_t *manager, unsigned int quantum,
if (exiting) {
DESTROYLOCK(&task->lock);
isc_mem_put(manager->mctx, task, sizeof *task);
isc_mem_put(manager->mctx, task, sizeof(*task));
return (ISC_R_SHUTTINGDOWN);
}
@ -636,7 +636,7 @@ isc_task_onshutdown(isc_task_t *task, isc_taskaction_t action, const void *arg)
ISC_TASKEVENT_SHUTDOWN,
action,
arg,
sizeof *event);
sizeof(*event));
if (event == NULL)
return (ISC_R_NOMEMORY);
@ -649,7 +649,7 @@ isc_task_onshutdown(isc_task_t *task, isc_taskaction_t action, const void *arg)
UNLOCK(&task->lock);
if (disallowed)
isc_mem_put(task->manager->mctx, event, sizeof *event);
isc_mem_put(task->manager->mctx, event, sizeof(*event));
return (result);
}
@ -1001,12 +1001,12 @@ manager_free(isc_taskmgr_t *manager) {
(void)isc_condition_destroy(&manager->exclusive_granted);
(void)isc_condition_destroy(&manager->work_available);
isc_mem_put(manager->mctx, manager->threads,
manager->workers * sizeof (isc_thread_t));
manager->workers * sizeof(isc_thread_t));
#endif /* ISC_PLATFORM_USETHREADS */
DESTROYLOCK(&manager->lock);
manager->magic = 0;
mctx = manager->mctx;
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
isc_mem_detach(&mctx);
}
@ -1037,7 +1037,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
}
#endif /* ISC_PLATFORM_USETHREADS */
manager = isc_mem_get(mctx, sizeof *manager);
manager = isc_mem_get(mctx, sizeof(*manager));
if (manager == NULL)
return (ISC_R_NOMEMORY);
manager->magic = TASK_MANAGER_MAGIC;
@ -1052,7 +1052,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
goto cleanup_mgr;
}
#ifdef ISC_PLATFORM_USETHREADS
manager->threads = isc_mem_get(mctx, workers * sizeof (isc_thread_t));
manager->threads = isc_mem_get(mctx, workers * sizeof(isc_thread_t));
if (manager->threads == NULL) {
result = ISC_R_NOMEMORY;
goto cleanup_lock;
@ -1119,12 +1119,12 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
cleanup_workavailable:
(void)isc_condition_destroy(&manager->work_available);
cleanup_threads:
isc_mem_put(mctx, manager->threads, workers * sizeof (isc_thread_t));
isc_mem_put(mctx, manager->threads, workers * sizeof(isc_thread_t));
cleanup_lock:
DESTROYLOCK(&manager->lock);
#endif
cleanup_mgr:
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
return (result);
}

4
lib/isc/taskpool.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: taskpool.c,v 1.10 2001/01/09 21:56:35 bwelling Exp $ */
/* $Id: taskpool.c,v 1.11 2001/11/27 01:56:09 gson Exp $ */
#include <config.h>
@ -46,7 +46,7 @@ isc_taskpool_create(isc_taskmgr_t *tmgr, isc_mem_t *mctx,
isc_result_t result;
INSIST(ntasks > 0);
pool = isc_mem_get(mctx, sizeof *pool);
pool = isc_mem_get(mctx, sizeof(*pool));
if (pool == NULL)
return (ISC_R_NOMEMORY);
pool->mctx = mctx;

24
lib/isc/timer.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: timer.c,v 1.65 2001/10/18 06:06:12 marka Exp $ */
/* $Id: timer.c,v 1.66 2001/11/27 01:56:11 gson Exp $ */
#include <config.h>
@ -246,7 +246,7 @@ destroy(isc_timer_t *timer) {
isc_task_detach(&timer->task);
DESTROYLOCK(&timer->lock);
timer->magic = 0;
isc_mem_put(manager->mctx, timer, sizeof *timer);
isc_mem_put(manager->mctx, timer, sizeof(*timer));
}
isc_result_t
@ -305,7 +305,7 @@ isc_timer_create(isc_timermgr_t *manager, isc_timertype_t type,
}
timer = isc_mem_get(manager->mctx, sizeof *timer);
timer = isc_mem_get(manager->mctx, sizeof(*timer));
if (timer == NULL)
return (ISC_R_NOMEMORY);
@ -339,7 +339,7 @@ isc_timer_create(isc_timermgr_t *manager, isc_timertype_t type,
timer->index = 0;
if (isc_mutex_init(&timer->lock) != ISC_R_SUCCESS) {
isc_task_detach(&timer->task);
isc_mem_put(manager->mctx, timer, sizeof *timer);
isc_mem_put(manager->mctx, timer, sizeof(*timer));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -369,7 +369,7 @@ isc_timer_create(isc_timermgr_t *manager, isc_timertype_t type,
timer->magic = 0;
DESTROYLOCK(&timer->lock);
isc_task_detach(&timer->task);
isc_mem_put(manager->mctx, timer, sizeof *timer);
isc_mem_put(manager->mctx, timer, sizeof(*timer));
return (result);
}
@ -614,7 +614,7 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) {
type,
timer->action,
timer->arg,
sizeof *event);
sizeof(*event));
if (event != NULL)
isc_task_send(timer->task, &event);
@ -736,7 +736,7 @@ isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) {
}
#endif /* ISC_PLATFORM_USETHREADS */
manager = isc_mem_get(mctx, sizeof *manager);
manager = isc_mem_get(mctx, sizeof(*manager));
if (manager == NULL)
return (ISC_R_NOMEMORY);
@ -750,12 +750,12 @@ isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) {
result = isc_heap_create(mctx, sooner, set_index, 0, &manager->heap);
if (result != ISC_R_SUCCESS) {
INSIST(result == ISC_R_NOMEMORY);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
return (ISC_R_NOMEMORY);
}
if (isc_mutex_init(&manager->lock) != ISC_R_SUCCESS) {
isc_heap_destroy(&manager->heap);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -768,7 +768,7 @@ isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) {
isc_mem_detach(&manager->mctx);
DESTROYLOCK(&manager->lock);
isc_heap_destroy(&manager->heap);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_condition_init() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -781,7 +781,7 @@ isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) {
(void)isc_condition_destroy(&manager->wakeup);
DESTROYLOCK(&manager->lock);
isc_heap_destroy(&manager->heap);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_thread_create() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -856,7 +856,7 @@ isc_timermgr_destroy(isc_timermgr_t **managerp) {
isc_heap_destroy(&manager->heap);
manager->magic = 0;
mctx = manager->mctx;
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
isc_mem_detach(&mctx);
*managerp = NULL;

6
lib/isc/unix/app.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: app.c,v 1.45 2001/11/14 22:11:58 bwelling Exp $ */
/* $Id: app.c,v 1.46 2001/11/27 01:56:13 gson Exp $ */
#include <config.h>
@ -100,7 +100,7 @@ handle_signal(int sig, void (*handler)(int)) {
struct sigaction sa;
char strbuf[ISC_STRERRORSIZE];
memset(&sa, 0, sizeof sa);
memset(&sa, 0, sizeof(sa));
sa.sa_handler = handler;
if (sigfillset(&sa.sa_mask) != 0 ||
@ -273,7 +273,7 @@ isc_app_onrun(isc_mem_t *mctx, isc_task_t *task, isc_taskaction_t action,
*/
isc_task_attach(task, &cloned_task);
event = isc_event_allocate(mctx, cloned_task, ISC_APPEVENT_SHUTDOWN,
action, arg, sizeof *event);
action, arg, sizeof(*event));
if (event == NULL) {
result = ISC_R_NOMEMORY;
goto unlock;

24
lib/isc/unix/ifiter_ioctl.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: ifiter_ioctl.c,v 1.24 2001/10/22 18:18:34 gson Exp $ */
/* $Id: ifiter_ioctl.c,v 1.25 2001/11/27 01:56:14 gson Exp $ */
/*
* Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
@ -296,7 +296,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
(void) close(iter->socket);
socket_failure:
isc_mem_put(mctx, iter, sizeof *iter);
isc_mem_put(mctx, iter, sizeof(*iter));
return (result);
}
@ -320,8 +320,8 @@ internal_current4(isc_interfaceiter_t *iter) {
ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos);
memset(&ifreq, 0, sizeof ifreq);
memcpy(&ifreq, ifrp, sizeof ifreq);
memset(&ifreq, 0, sizeof(ifreq));
memcpy(&ifreq, ifrp, sizeof(ifreq));
family = ifreq.ifr_addr.sa_family;
#ifdef ISC_PLATFORM_HAVEIPV6
@ -397,8 +397,8 @@ internal_current4(isc_interfaceiter_t *iter) {
/*
* Get the network mask.
*/
memset(&ifreq, 0, sizeof ifreq);
memcpy(&ifreq, ifrp, sizeof ifreq);
memset(&ifreq, 0, sizeof(ifreq));
memcpy(&ifreq, ifrp, sizeof(ifreq));
switch (family) {
case AF_INET:
/*
@ -443,8 +443,8 @@ internal_current6(isc_interfaceiter_t *iter) {
ifrp = (struct LIFREQ *)((char *) iter->lifc.lifc_req + iter->pos);
memset(&lifreq, 0, sizeof lifreq);
memcpy(&lifreq, ifrp, sizeof lifreq);
memset(&lifreq, 0, sizeof(lifreq));
memcpy(&lifreq, ifrp, sizeof(lifreq));
family = lifreq.lifr_addr.ss_family;
#ifdef ISC_PLATFORM_HAVEIPV6
@ -520,8 +520,8 @@ internal_current6(isc_interfaceiter_t *iter) {
/*
* Get the network mask.
*/
memset(&lifreq, 0, sizeof lifreq);
memcpy(&lifreq, ifrp, sizeof lifreq);
memset(&lifreq, 0, sizeof(lifreq));
memcpy(&lifreq, ifrp, sizeof(lifreq));
switch (family) {
case AF_INET:
/*
@ -593,7 +593,7 @@ internal_next4(isc_interfaceiter_t *iter) {
iter->pos += sizeof(ifrp->ifr_name) + ifrp->ifr_addr.sa_len;
else
#endif
iter->pos += sizeof *ifrp;
iter->pos += sizeof(*ifrp);
if (iter->pos >= (unsigned int) iter->ifc.ifc_len)
return (ISC_R_NOMORE);
@ -618,7 +618,7 @@ internal_next6(isc_interfaceiter_t *iter) {
iter->pos += sizeof(ifrp->lifr_name) + ifrp->lifr_addr.sa_len;
else
#endif
iter->pos += sizeof *ifrp;
iter->pos += sizeof(*ifrp);
if (iter->pos >= (unsigned int) iter->lifc.lifc_len)
return (ISC_R_NOMORE);

4
lib/isc/unix/ifiter_sysctl.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: ifiter_sysctl.c,v 1.15 2001/08/31 05:57:51 marka Exp $ */
/* $Id: ifiter_sysctl.c,v 1.16 2001/11/27 01:56:15 gson Exp $ */
/*
* Obtain the list of network interfaces using sysctl.
@ -136,7 +136,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
failure:
if (iter->buf != NULL)
isc_mem_put(mctx, iter->buf, iter->bufsize);
isc_mem_put(mctx, iter, sizeof *iter);
isc_mem_put(mctx, iter, sizeof(*iter));
return (result);
}

4
lib/isc/unix/interfaceiter.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: interfaceiter.c,v 1.24 2001/10/22 04:01:32 marka Exp $ */
/* $Id: interfaceiter.c,v 1.25 2001/11/27 01:56:16 gson Exp $ */
#include <config.h>
@ -151,6 +151,6 @@ isc_interfaceiter_destroy(isc_interfaceiter_t **iterp)
isc_mem_put(iter->mctx, iter->buf, iter->bufsize);
iter->magic = 0;
isc_mem_put(iter->mctx, iter, sizeof *iter);
isc_mem_put(iter->mctx, iter, sizeof(*iter));
*iterp = NULL;
}

4
lib/isc/unix/os.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: os.c,v 1.11 2001/08/16 06:19:58 marka Exp $ */
/* $Id: os.c,v 1.12 2001/11/27 01:56:17 gson Exp $ */
#include <config.h>
@ -63,7 +63,7 @@ sysctl_ncpus(void) {
int ncpu, result;
size_t len;
len = sizeof ncpu;
len = sizeof(ncpu);
result = sysctlbyname("hw.ncpu", &ncpu, &len , 0, 0);
if (result != -1)
return (ncpu);

46
lib/isc/unix/socket.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.214 2001/11/27 00:56:19 gson Exp $ */
/* $Id: socket.c,v 1.215 2001/11/27 01:56:19 gson Exp $ */
#include <config.h>
@ -321,7 +321,7 @@ socket_log(isc_socket_t *sock, isc_sockaddr_t *address,
msgcat, msgset, message,
"socket %p: %s", sock, msgbuf);
} else {
isc_sockaddr_format(address, peerbuf, sizeof peerbuf);
isc_sockaddr_format(address, peerbuf, sizeof(peerbuf));
isc_log_iwrite(isc_lctx, category, module, level,
msgcat, msgset, message,
"socket %p %s: %s", sock, peerbuf, msgbuf);
@ -585,7 +585,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
UNUSED(cmsg);
#endif
memset(msg, 0, sizeof (*msg));
memset(msg, 0, sizeof(*msg));
if (sock->type == isc_sockettype_udp) {
msg->msg_name = (void *)&dev->address.type.sa;
@ -707,7 +707,7 @@ build_msghdr_recv(isc_socket_t *sock, isc_socketevent_t *dev,
UNUSED(cmsg);
#endif
memset(msg, 0, sizeof (struct msghdr));
memset(msg, 0, sizeof(struct msghdr));
if (sock->type == isc_sockettype_udp) {
memset(&dev->address, 0, sizeof(dev->address));
@ -825,7 +825,7 @@ allocate_socketevent(isc_socket_t *sock, isc_eventtype_t eventtype,
ev = (isc_socketevent_t *)isc_event_allocate(sock->manager->mctx,
sock, eventtype,
action, arg,
sizeof (*ev));
sizeof(*ev));
if (ev == NULL)
return (NULL);
@ -1166,7 +1166,7 @@ allocate_socket(isc_socketmgr_t *manager, isc_sockettype_t type,
isc_socket_t *sock;
isc_result_t ret;
sock = isc_mem_get(manager->mctx, sizeof *sock);
sock = isc_mem_get(manager->mctx, sizeof(*sock));
if (sock == NULL)
return (ISC_R_NOMEMORY);
@ -1256,7 +1256,7 @@ free_socket(isc_socket_t **socketp) {
DESTROYLOCK(&sock->lock);
isc_mem_put(sock->manager->mctx, sock, sizeof *sock);
isc_mem_put(sock->manager->mctx, sock, sizeof(*sock));
*socketp = NULL;
}
@ -1348,7 +1348,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
#ifdef SO_BSDCOMPAT
if (setsockopt(sock->fd, SOL_SOCKET, SO_BSDCOMPAT,
(void *)&on, sizeof on) < 0) {
(void *)&on, sizeof(on)) < 0) {
isc__strerror(errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, SO_BSDCOMPAT) %s: %s",
@ -1365,7 +1365,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
#if defined(SO_TIMESTAMP)
if (setsockopt(sock->fd, SOL_SOCKET, SO_TIMESTAMP,
(void *)&on, sizeof on) < 0
(void *)&on, sizeof(on)) < 0
&& errno != ENOPROTOOPT) {
isc__strerror(errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
@ -1385,7 +1385,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
/* 2292bis */
if ((pf == AF_INET6)
&& (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
(void *)&on, sizeof (on)) < 0)) {
(void *)&on, sizeof(on)) < 0)) {
isc__strerror(errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, IPV6_RECVPKTINFO) "
@ -1400,7 +1400,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
/* 2292 */
if ((pf == AF_INET6)
&& (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_PKTINFO,
(void *)&on, sizeof (on)) < 0)) {
(void *)&on, sizeof(on)) < 0)) {
isc__strerror(errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, IPV6_PKTINFO) %s: %s",
@ -1417,7 +1417,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
if (pf == AF_INET6) {
(void)setsockopt(sock->fd, IPPROTO_IPV6,
IPV6_USE_MIN_MTU,
(void *)&on, sizeof (on));
(void *)&on, sizeof(on));
}
#endif
#endif /* ISC_PLATFORM_HAVEIPV6 */
@ -1717,7 +1717,7 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
* deamons such as BIND 8 and Apache.
*/
addrlen = sizeof dev->newsocket->address.type;
addrlen = sizeof(dev->newsocket->address.type);
memset(&dev->newsocket->address.type.sa, 0, addrlen);
fd = accept(sock->fd, &dev->newsocket->address.type.sa,
(void *)&addrlen);
@ -2175,7 +2175,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
}
#endif /* ISC_PLATFORM_USETHREADS */
manager = isc_mem_get(mctx, sizeof *manager);
manager = isc_mem_get(mctx, sizeof(*manager));
if (manager == NULL)
return (ISC_R_NOMEMORY);
@ -2184,7 +2184,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
memset(manager->fds, 0, sizeof(manager->fds));
ISC_LIST_INIT(manager->socklist);
if (isc_mutex_init(&manager->lock) != ISC_R_SUCCESS) {
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -2194,7 +2194,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
#ifdef ISC_PLATFORM_USETHREADS
if (isc_condition_init(&manager->shutdown_ok) != ISC_R_SUCCESS) {
DESTROYLOCK(&manager->lock);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_condition_init() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -2208,7 +2208,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
*/
if (pipe(manager->pipe_fds) != 0) {
DESTROYLOCK(&manager->lock);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
isc__strerror(errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"pipe() %s: %s",
@ -2247,7 +2247,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
if (isc_thread_create(watcher, manager, &manager->watcher) !=
ISC_R_SUCCESS) {
DESTROYLOCK(&manager->lock);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_thread_create() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -2351,7 +2351,7 @@ isc_socketmgr_destroy(isc_socketmgr_t **managerp) {
DESTROYLOCK(&manager->lock);
manager->magic = 0;
mctx= manager->mctx;
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
isc_mem_detach(&mctx);
@ -2742,7 +2742,7 @@ isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr) {
return (ISC_R_FAMILYMISMATCH);
}
if (setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
sizeof on) < 0) {
sizeof(on)) < 0) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d) %s", sock->fd,
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -2845,7 +2845,7 @@ isc_socket_accept(isc_socket_t *sock,
*/
dev = (isc_socket_newconnev_t *)
isc_event_allocate(manager->mctx, task, ISC_SOCKEVENT_NEWCONN,
action, arg, sizeof (*dev));
action, arg, sizeof(*dev));
if (dev == NULL) {
UNLOCK(&sock->lock);
return (ISC_R_NOMEMORY);
@ -2914,7 +2914,7 @@ isc_socket_connect(isc_socket_t *sock, isc_sockaddr_t *addr,
dev = (isc_socket_connev_t *)isc_event_allocate(manager->mctx, sock,
ISC_SOCKEVENT_CONNECT,
action, arg,
sizeof (*dev));
sizeof(*dev));
if (dev == NULL) {
UNLOCK(&sock->lock);
return (ISC_R_NOMEMORY);
@ -3152,7 +3152,7 @@ isc_socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp) {
ret = ISC_R_SUCCESS;
len = sizeof addressp->type;
len = sizeof(addressp->type);
if (getsockname(sock->fd, &addressp->type.sa, (void *)&len) < 0) {
isc__strerror(errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__, "getsockname: %s",

4
lib/isc/win32/app.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: app.c,v 1.3 2001/07/09 21:06:03 gson Exp $ */
/* $Id: app.c,v 1.4 2001/11/27 01:56:20 gson Exp $ */
#include <config.h>
@ -118,7 +118,7 @@ isc_app_onrun(isc_mem_t *mctx, isc_task_t *task, isc_taskaction_t action,
*/
isc_task_attach(task, &cloned_task);
event = isc_event_allocate(mctx, cloned_task, ISC_APPEVENT_SHUTDOWN,
action, arg, sizeof *event);
action, arg, sizeof(*event));
if (event == NULL) {
result = ISC_R_NOMEMORY;
goto unlock;

6
lib/isc/win32/interfaceiter.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: interfaceiter.c,v 1.6 2001/11/22 03:08:12 mayer Exp $ */
/* $Id: interfaceiter.c,v 1.7 2001/11/27 01:56:21 gson Exp $ */
/*
* Note that this code will need to be revisited to support IPv6 Interfaces.
@ -209,7 +209,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
(void) closesocket(iter->socket);
socket_failure:
isc_mem_put(mctx, iter, sizeof *iter);
isc_mem_put(mctx, iter, sizeof(*iter));
return (result);
}
@ -374,7 +374,7 @@ isc_interfaceiter_destroy(isc_interfaceiter_t **iterp) {
isc_mem_put(iter->mctx, iter->buf, iter->bufsize);
iter->magic = 0;
isc_mem_put(iter->mctx, iter, sizeof *iter);
isc_mem_put(iter->mctx, iter, sizeof(*iter));
*iterp = NULL;
}

46
lib/isc/win32/socket.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.10 2001/11/27 00:56:23 gson Exp $ */
/* $Id: socket.c,v 1.11 2001/11/27 01:56:22 gson Exp $ */
#define MAKE_EXTERNAL 1
@ -429,7 +429,7 @@ socket_log(isc_socket_t *sock, isc_sockaddr_t *address,
msgcat, msgset, message,
"socket %p: %s", sock, msgbuf);
} else {
isc_sockaddr_format(address, peerbuf, sizeof peerbuf);
isc_sockaddr_format(address, peerbuf, sizeof(peerbuf));
isc_log_iwrite(isc_lctx, category, module, level,
msgcat, msgset, message,
"socket %p %s: %s", sock, peerbuf, msgbuf);
@ -707,7 +707,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
UNUSED(cmsg);
#endif
memset(msg, 0, sizeof (*msg));
memset(msg, 0, sizeof(*msg));
if (sock->type == isc_sockettype_udp) {
msg->msg_name = (void *)&dev->address.type.sa;
@ -826,7 +826,7 @@ build_msghdr_recv(isc_socket_t *sock, isc_socketevent_t *dev,
UNUSED(cmsg);
#endif
memset(msg, 0, sizeof (struct msghdr));
memset(msg, 0, sizeof(struct msghdr));
if (sock->type == isc_sockettype_udp) {
memset(&dev->address, 0, sizeof(dev->address));
@ -937,7 +937,7 @@ allocate_socketevent(isc_socket_t *sock, isc_eventtype_t eventtype,
ev = (isc_socketevent_t *)isc_event_allocate(sock->manager->mctx,
sock, eventtype,
action, arg,
sizeof (*ev));
sizeof(*ev));
if (ev == NULL)
return (NULL);
@ -1283,7 +1283,7 @@ allocate_socket(isc_socketmgr_t *manager, isc_sockettype_t type,
isc_socket_t *sock;
isc_result_t ret;
sock = isc_mem_get(manager->mctx, sizeof *sock);
sock = isc_mem_get(manager->mctx, sizeof(*sock));
if (sock == NULL)
return (ISC_R_NOMEMORY);
@ -1373,7 +1373,7 @@ free_socket(isc_socket_t **socketp) {
DESTROYLOCK(&sock->lock);
isc_mem_put(sock->manager->mctx, sock, sizeof *sock);
isc_mem_put(sock->manager->mctx, sock, sizeof(*sock));
*socketp = NULL;
}
@ -1457,7 +1457,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
#ifdef SO_BSDCOMPAT
if (setsockopt(sock->fd, SOL_SOCKET, SO_BSDCOMPAT,
(void *)&on, sizeof on) < 0) {
(void *)&on, sizeof(on)) < 0) {
socket_errno = WSAGetLastError();
isc__strerror(socket_errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
@ -1475,7 +1475,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
#if defined(SO_TIMESTAMP)
if (setsockopt(sock->fd, SOL_SOCKET, SO_TIMESTAMP,
(void *)&on, sizeof on) < 0
(void *)&on, sizeof(on)) < 0
&& WSAGetLastError() != WSAENOPROTOOPT) {
isc__strerror(WSAGetLastError(), strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
@ -1495,7 +1495,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
/* 2292bis */
if ((pf == AF_INET6)
&& (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
(void *)&on, sizeof (on)) < 0)) {
(void *)&on, sizeof(on)) < 0)) {
isc__strerror(WSAGetLastError(), strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, IPV6_RECVPKTINFO) "
@ -1510,7 +1510,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
/* 2292 */
if ((pf == AF_INET6)
&& (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_PKTINFO,
(void *)&on, sizeof (on)) < 0)) {
(void *)&on, sizeof(on)) < 0)) {
isc__strerror(WSAGetLaastError(), strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, IPV6_PKTINFO) %s: %s",
@ -1527,7 +1527,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
if (pf == AF_INET6) {
(void)setsockopt(sock->fd, IPPROTO_IPV6,
IPV6_USE_MIN_MTU,
(void *)&on, sizeof (on));
(void *)&on, sizeof(on));
}
#endif
#endif /* ISC_PLATFORM_HAVEIPV6 */
@ -1822,7 +1822,7 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
* EAGAIN or EINTR, simply poke the watcher to watch this socket
* again.
*/
addrlen = sizeof dev->newsocket->address.type;
addrlen = sizeof(dev->newsocket->address.type);
memset(&dev->newsocket->address.type.sa, 0, addrlen);
fd = accept(sock->fd, &dev->newsocket->address.type.sa,
(void *)&addrlen);
@ -2284,7 +2284,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
}
#endif /* ISC_PLATFORM_USETHREADS */
manager = isc_mem_get(mctx, sizeof *manager);
manager = isc_mem_get(mctx, sizeof(*manager));
if (manager == NULL)
return (ISC_R_NOMEMORY);
@ -2293,7 +2293,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
memset(manager->fds, 0, sizeof(manager->fds));
ISC_LIST_INIT(manager->socklist);
if (isc_mutex_init(&manager->lock) != ISC_R_SUCCESS) {
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_mutex_init() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -2302,7 +2302,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
}
if (isc_condition_init(&manager->shutdown_ok) != ISC_R_SUCCESS) {
DESTROYLOCK(&manager->lock);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_condition_init() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -2316,7 +2316,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
*/
if (internal_pipe(manager->pipe_fds) != 0) {
DESTROYLOCK(&manager->lock);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
isc__strerror(errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"pipe() %s: %s",
@ -2343,7 +2343,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
if (isc_thread_create(watcher, manager, &manager->watcher) !=
ISC_R_SUCCESS) {
DESTROYLOCK(&manager->lock);
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
UNEXPECTED_ERROR(__FILE__, __LINE__,
"isc_thread_create() %s",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -2443,7 +2443,7 @@ isc_socketmgr_destroy(isc_socketmgr_t **managerp) {
DESTROYLOCK(&manager->lock);
manager->magic = 0;
mctx= manager->mctx;
isc_mem_put(mctx, manager, sizeof *manager);
isc_mem_put(mctx, manager, sizeof(*manager));
isc_mem_detach(&mctx);
@ -2834,7 +2834,7 @@ isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr) {
return (ISC_R_FAMILYMISMATCH);
}
if (setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
sizeof on) < 0) {
sizeof(on)) < 0) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d) %s", sock->fd,
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
@ -2938,7 +2938,7 @@ isc_socket_accept(isc_socket_t *sock,
*/
dev = (isc_socket_newconnev_t *)
isc_event_allocate(manager->mctx, task, ISC_SOCKEVENT_NEWCONN,
action, arg, sizeof (*dev));
action, arg, sizeof(*dev));
if (dev == NULL) {
UNLOCK(&sock->lock);
return (ISC_R_NOMEMORY);
@ -3008,7 +3008,7 @@ isc_socket_connect(isc_socket_t *sock, isc_sockaddr_t *addr,
dev = (isc_socket_connev_t *)isc_event_allocate(manager->mctx, sock,
ISC_SOCKEVENT_CONNECT,
action, arg,
sizeof (*dev));
sizeof(*dev));
if (dev == NULL) {
UNLOCK(&sock->lock);
return (ISC_R_NOMEMORY);
@ -3244,7 +3244,7 @@ isc_socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp) {
ret = ISC_R_SUCCESS;
len = sizeof addressp->type;
len = sizeof(addressp->type);
if (getsockname(sock->fd, &addressp->type.sa, (void *)&len) < 0) {
isc__strerror(WSAGetLastError(), strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__, "getsockname: %s",

6
lib/isccc/cc.c
View file

@ -16,7 +16,7 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cc.c,v 1.4 2001/04/12 20:36:53 tale Exp $ */
/* $Id: cc.c,v 1.5 2001/11/27 01:56:24 gson Exp $ */
#include <config.h>
@ -218,7 +218,7 @@ isccc_cc_towire(isccc_sexpr_t *alist, isccc_region_t *target,
unsigned char *hmd5_rstart, *signed_rstart;
isc_result_t result;
if (REGION_SIZE(*target) < 4 + sizeof auth_hmd5)
if (REGION_SIZE(*target) < 4 + sizeof(auth_hmd5))
return (ISC_R_NOSPACE);
/*
* Emit protocol version.
@ -231,7 +231,7 @@ isccc_cc_towire(isccc_sexpr_t *alist, isccc_region_t *target,
* we know what it is.
*/
hmd5_rstart = target->rstart + HMD5_OFFSET;
PUT_MEM(auth_hmd5, sizeof auth_hmd5, target->rstart);
PUT_MEM(auth_hmd5, sizeof(auth_hmd5), target->rstart);
} else
hmd5_rstart = NULL;
signed_rstart = target->rstart;

8
lib/isccc/sexpr.c
View file

@ -16,7 +16,7 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: sexpr.c,v 1.2 2001/03/27 20:08:01 bwelling Exp $ */
/* $Id: sexpr.c,v 1.3 2001/11/27 01:56:25 gson Exp $ */
#include <config.h>
@ -38,7 +38,7 @@ isccc_sexpr_cons(isccc_sexpr_t *car, isccc_sexpr_t *cdr)
{
isccc_sexpr_t *sexpr;
sexpr = malloc(sizeof *sexpr);
sexpr = malloc(sizeof(*sexpr));
if (sexpr == NULL)
return (NULL);
sexpr->type = ISCCC_SEXPRTYPE_DOTTEDPAIR;
@ -59,7 +59,7 @@ isccc_sexpr_fromstring(const char *str)
{
isccc_sexpr_t *sexpr;
sexpr = malloc(sizeof *sexpr);
sexpr = malloc(sizeof(*sexpr));
if (sexpr == NULL)
return (NULL);
sexpr->type = ISCCC_SEXPRTYPE_STRING;
@ -78,7 +78,7 @@ isccc_sexpr_frombinary(const isccc_region_t *region)
isccc_sexpr_t *sexpr;
unsigned int region_size;
sexpr = malloc(sizeof *sexpr);
sexpr = malloc(sizeof(*sexpr));
if (sexpr == NULL)
return (NULL);
sexpr->type = ISCCC_SEXPRTYPE_BINARY;

8
lib/isccc/symtab.c
View file

@ -16,7 +16,7 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: symtab.c,v 1.3 2001/06/04 19:33:39 tale Exp $ */
/* $Id: symtab.c,v 1.4 2001/11/27 01:56:26 gson Exp $ */
#include <config.h>
@ -65,10 +65,10 @@ isccc_symtab_create(unsigned int size,
REQUIRE(symtabp != NULL && *symtabp == NULL);
REQUIRE(size > 0); /* Should be prime. */
symtab = malloc(sizeof *symtab);
symtab = malloc(sizeof(*symtab));
if (symtab == NULL)
return (ISC_R_NOMEMORY);
symtab->table = malloc(size * sizeof (eltlist_t));
symtab->table = malloc(size * sizeof(eltlist_t));
if (symtab->table == NULL) {
free(symtab);
return (ISC_R_NOMEMORY);
@ -220,7 +220,7 @@ isccc_symtab_define(isccc_symtab_t *symtab, char *key, unsigned int type,
elt->value,
symtab->undefine_arg);
} else {
elt = malloc(sizeof *elt);
elt = malloc(sizeof(*elt));
if (elt == NULL)
return (ISC_R_NOMEMORY);
ISC_LINK_INIT(elt, link);

4
lib/isccfg/parser.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: parser.c,v 1.92 2001/11/13 06:57:11 marka Exp $ */
/* $Id: parser.c,v 1.93 2001/11/27 01:56:27 gson Exp $ */
#include <config.h>
@ -3681,7 +3681,7 @@ parser_complain(cfg_parser_t *pctx, isc_boolean_t is_warning,
sprintf(where, "%s:%u: ", current_file(pctx), pctx->line);
if ((unsigned int)vsprintf(message, format, args) >= sizeof message)
if ((unsigned int)vsprintf(message, format, args) >= sizeof(message))
FATAL_ERROR(__FILE__, __LINE__,
"error message would overflow");

28
lib/lwres/getipnode.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: getipnode.c,v 1.31 2001/11/27 00:56:26 gson Exp $ */
/* $Id: getipnode.c,v 1.32 2001/11/27 01:56:28 gson Exp $ */
#include <config.h>
@ -447,24 +447,24 @@ scan_interfaces(int *have_v4, int *have_v6) {
for (cp = buf;
(*have_v4 == 0 || *have_v6 == 0) && cp < cplim;
cp += cpsize) {
memcpy(&ifreq, cp, sizeof ifreq);
memcpy(&ifreq, cp, sizeof(ifreq));
#ifdef LWRES_PLATFORM_HAVESALEN
#ifdef FIX_ZERO_SA_LEN
if (ifreq.ifr_addr.sa_len == 0)
ifreq.ifr_addr.sa_len = IN6ADDRSZ;
#endif
#ifdef HAVE_MINIMUM_IFREQ
cpsize = sizeof ifreq;
if (ifreq.ifr_addr.sa_len > sizeof (struct sockaddr))
cpsize = sizeof(ifreq);
if (ifreq.ifr_addr.sa_len > sizeof(struct sockaddr))
cpsize += (int)ifreq.ifr_addr.sa_len -
(int)(sizeof(struct sockaddr));
#else
cpsize = sizeof ifreq.ifr_name + ifreq.ifr_addr.sa_len;
cpsize = sizeof(ifreq.ifr_name) + ifreq.ifr_addr.sa_len;
#endif /* HAVE_MINIMUM_IFREQ */
#elif defined SIOCGIFCONF_ADDR
cpsize = sizeof ifreq;
cpsize = sizeof(ifreq);
#else
cpsize = sizeof ifreq.ifr_name;
cpsize = sizeof(ifreq.ifr_name);
/* XXX maybe this should be a hard error? */
if (ioctl(s, SIOCGIFADDR, (char *)&ifreq) < 0)
continue;
@ -563,7 +563,7 @@ copyandmerge(struct hostent *he1, struct hostent *he2, int af, int *error_num)
return (NULL);
}
he = malloc(sizeof *he);
he = malloc(sizeof(*he));
if (he == NULL)
goto no_recovery;
@ -587,8 +587,8 @@ copyandmerge(struct hostent *he1, struct hostent *he2, int af, int *error_num)
*/
if (af == AF_INET6 && he1->h_addrtype == AF_INET) {
memcpy(*npp, in6addr_mapped,
sizeof in6addr_mapped);
memcpy(*npp + sizeof in6addr_mapped, *cpp,
sizeof(in6addr_mapped));
memcpy(*npp + sizeof(in6addr_mapped), *cpp,
INADDRSZ);
} else {
memcpy(*npp, *cpp,
@ -610,8 +610,8 @@ copyandmerge(struct hostent *he1, struct hostent *he2, int af, int *error_num)
*/
if (af == AF_INET6 && he2->h_addrtype == AF_INET) {
memcpy(*npp, in6addr_mapped,
sizeof in6addr_mapped);
memcpy(*npp + sizeof in6addr_mapped, *cpp,
sizeof(in6addr_mapped));
memcpy(*npp + sizeof(in6addr_mapped), *cpp,
INADDRSZ);
} else {
memcpy(*npp, *cpp,
@ -688,7 +688,7 @@ hostfromaddr(lwres_gnbaresponse_t *addr, int af, const void *src) {
struct hostent *he;
int i;
he = malloc(sizeof *he);
he = malloc(sizeof(*he));
if (he == NULL)
goto cleanup;
memset(he, 0, sizeof(*he));
@ -765,7 +765,7 @@ hostfromname(lwres_gabnresponse_t *name, int af) {
int i;
lwres_addr_t *addr;
he = malloc(sizeof *he);
he = malloc(sizeof(*he));
if (he == NULL)
goto cleanup;
memset(he, 0, sizeof(*he));

4
lib/lwres/herror.c
View file

@ -51,7 +51,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static const char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] =
"$Id: herror.c,v 1.10 2001/07/18 20:14:52 gson Exp $";
"$Id: herror.c,v 1.11 2001/11/27 01:56:30 gson Exp $";
#endif /* LIBC_SCCS and not lint */
#include <config.h>
@ -75,7 +75,7 @@ static const char *h_errlist[] = {
"No address associated with name", /* 4 NO_ADDRESS */
};
static int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
static int h_nerr = { sizeof(h_errlist) / sizeof (h_errlist[0]) };
/*

4
lib/lwres/lwconfig.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: lwconfig.c,v 1.34 2001/11/27 00:56:27 gson Exp $ */
/* $Id: lwconfig.c,v 1.35 2001/11/27 01:56:31 gson Exp $ */
/***
*** Module for parsing resolv.conf files.
@ -604,7 +604,7 @@ lwres_result_t
lwres_conf_print(lwres_context_t *ctx, FILE *fp) {
int i;
int af;
char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
const char *p;
lwres_conf_t *confdata;
lwres_addr_t tmpaddr;

10
lib/lwres/lwinetntop.c
View file

@ -17,7 +17,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char rcsid[] =
"$Id: lwinetntop.c,v 1.9 2001/08/08 22:54:54 gson Exp $";
"$Id: lwinetntop.c,v 1.10 2001/11/27 01:56:32 gson Exp $";
#endif /* LIBC_SCCS and not lint */
#include <config.h>
@ -82,7 +82,7 @@ lwres_net_ntop(int af, const void *src, char *dst, size_t size) {
static const char *
inet_ntop4(const unsigned char *src, char *dst, size_t size) {
static const char fmt[] = "%u.%u.%u.%u";
char tmp[sizeof "255.255.255.255"];
char tmp[sizeof("255.255.255.255")];
if ((size_t)sprintf(tmp, fmt, src[0], src[1], src[2], src[3]) >= size)
{
@ -110,7 +110,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size) {
* Keep this in mind if you think this function should have been coded
* to use pointer overlays. All the world's not a VAX.
*/
char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")], *tp;
struct { int base, len; } best, cur;
unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ];
int i;
@ -120,7 +120,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size) {
* Copy the input (bytewise) array into a wordwise array.
* Find the longest run of 0x00's in src[] for :: shorthanding.
*/
memset(words, '\0', sizeof words);
memset(words, '\0', sizeof(words));
for (i = 0; i < NS_IN6ADDRSZ; i++)
words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
best.base = -1;
@ -165,7 +165,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size) {
if (i == 6 && best.base == 0 &&
(best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
if (!inet_ntop4(src+12, tp,
sizeof tmp - (tp - tmp)))
sizeof(tmp) - (tp - tmp)))
return (NULL);
tp += strlen(tp);
break;