From e0ca7357cd0bfedc5c29cb731b56279fef8da059 Mon Sep 17 00:00:00 2001 From: LRN Date: Thu, 19 Dec 2013 06:00:23 +0000 Subject: malloc -> new --- src/util/common_logging.c | 2 +- src/util/container_bloomfilter.c | 4 ++-- src/util/container_heap.c | 4 ++-- src/util/container_slist.c | 4 ++-- src/util/disk.c | 20 ++++++++++---------- src/util/os_priority.c | 4 ++-- src/util/peer.c | 2 +- src/util/server_tc.c | 2 +- src/util/signal.c | 2 +- src/util/test_client.c | 2 +- src/util/test_container_slist.c | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/util') diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 582435651..a2338f1c9 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -710,7 +710,7 @@ GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls) { struct CustomLogger *entry; - entry = GNUNET_malloc (sizeof (struct CustomLogger)); + entry = GNUNET_new (struct CustomLogger); entry->logger = logger; entry->logger_cls = logger_cls; entry->next = loggers; diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c index 645729553..9554e0ec0 100644 --- a/src/util/container_bloomfilter.c +++ b/src/util/container_bloomfilter.c @@ -494,7 +494,7 @@ GNUNET_CONTAINER_bloomfilter_load (const char *filename, size_t size, ui *= 2; size = ui; /* make sure it's a power of 2 */ - bf = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_BloomFilter)); + bf = GNUNET_new (struct GNUNET_CONTAINER_BloomFilter); /* Try to open a bloomfilter file */ if (GNUNET_YES == GNUNET_DISK_file_test (filename)) bf->fh = @@ -631,7 +631,7 @@ GNUNET_CONTAINER_bloomfilter_init (const char *data, size_t size, if ((0 == k) || (0 == size)) return NULL; - bf = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_BloomFilter)); + bf = GNUNET_new (struct GNUNET_CONTAINER_BloomFilter); bf->filename = NULL; bf->fh = NULL; bf->bitArray = GNUNET_malloc_large (size); diff --git a/src/util/container_heap.c b/src/util/container_heap.c index 0f63f957d..54da89f7a 100644 --- a/src/util/container_heap.c +++ b/src/util/container_heap.c @@ -142,7 +142,7 @@ GNUNET_CONTAINER_heap_create (enum GNUNET_CONTAINER_HeapOrder order) { struct GNUNET_CONTAINER_Heap *heap; - heap = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_Heap)); + heap = GNUNET_new (struct GNUNET_CONTAINER_Heap); heap->order = order; return heap; } @@ -351,7 +351,7 @@ GNUNET_CONTAINER_heap_insert (struct GNUNET_CONTAINER_Heap *heap, void *element, { struct GNUNET_CONTAINER_HeapNode *node; - node = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_HeapNode)); + node = GNUNET_new (struct GNUNET_CONTAINER_HeapNode); node->heap = heap; node->element = element; node->cost = cost; diff --git a/src/util/container_slist.c b/src/util/container_slist.c index 10af916c3..e75c695c5 100644 --- a/src/util/container_slist.c +++ b/src/util/container_slist.c @@ -101,7 +101,7 @@ create_elem (enum GNUNET_CONTAINER_SListDisposition disp, const void *buf, } else { - e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem)); + e = GNUNET_new (struct GNUNET_CONTAINER_SList_Elem); e->elem = (void *) buf; } e->disp = disp; @@ -190,7 +190,7 @@ GNUNET_CONTAINER_slist_append (struct GNUNET_CONTAINER_SList *dst, struct GNUNET_CONTAINER_SList * GNUNET_CONTAINER_slist_create () { - return GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList)); + return GNUNET_new (struct GNUNET_CONTAINER_SList); } diff --git a/src/util/disk.c b/src/util/disk.c index 074355c0a..aac730eec 100644 --- a/src/util/disk.c +++ b/src/util/disk.c @@ -1899,8 +1899,8 @@ GNUNET_DISK_get_handle_from_w32_handle (HANDLE osfh) * otherwise we're screwed, as selecting on non-overlapped handle * will block. */ - fh->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); - fh->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); + fh->oOverlapRead = GNUNET_new (OVERLAPPED); + fh->oOverlapWrite = GNUNET_new (OVERLAPPED); fh->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); fh->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); } @@ -2356,10 +2356,10 @@ GNUNET_DISK_pipe (int blocking_read, int blocking_write, int inherit_read, int i p->fd[0]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; p->fd[1]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; - p->fd[0]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); - p->fd[0]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); - p->fd[1]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); - p->fd[1]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); + p->fd[0]->oOverlapRead = GNUNET_new (OVERLAPPED); + p->fd[0]->oOverlapWrite = GNUNET_new (OVERLAPPED); + p->fd[1]->oOverlapRead = GNUNET_new (OVERLAPPED); + p->fd[1]->oOverlapWrite = GNUNET_new (OVERLAPPED); p->fd[0]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); p->fd[0]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); @@ -2462,8 +2462,8 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2]) if (p->fd[0]->h != INVALID_HANDLE_VALUE) { p->fd[0]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; - p->fd[0]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); - p->fd[0]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); + p->fd[0]->oOverlapRead = GNUNET_new (OVERLAPPED); + p->fd[0]->oOverlapWrite = GNUNET_new (OVERLAPPED); p->fd[0]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); p->fd[0]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); } @@ -2480,8 +2480,8 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2]) if (p->fd[1]->h != INVALID_HANDLE_VALUE) { p->fd[1]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; - p->fd[1]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); - p->fd[1]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); + p->fd[1]->oOverlapRead = GNUNET_new (OVERLAPPED); + p->fd[1]->oOverlapWrite = GNUNET_new (OVERLAPPED); p->fd[1]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); p->fd[1]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); } diff --git a/src/util/os_priority.c b/src/util/os_priority.c index ab82b7b58..2cabd214e 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c @@ -1089,7 +1089,7 @@ start_process (int pipe_control, return NULL; } - gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process)); + gnunet_proc = GNUNET_new (struct GNUNET_OS_Process); gnunet_proc->pid = proc.dwProcessId; gnunet_proc->handle = proc.hProcess; gnunet_proc->control_pipe = childpipe_write; @@ -1774,7 +1774,7 @@ GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc, void *proc_cls, return NULL; } GNUNET_DISK_pipe_close_end (opipe, GNUNET_DISK_PIPE_END_WRITE); - cmd = GNUNET_malloc (sizeof (struct GNUNET_OS_CommandHandle)); + cmd = GNUNET_new (struct GNUNET_OS_CommandHandle); cmd->timeout = GNUNET_TIME_relative_to_absolute (timeout); cmd->eip = eip; cmd->opipe = opipe; diff --git a/src/util/peer.c b/src/util/peer.c index fa376d333..3e4e1712d 100644 --- a/src/util/peer.c +++ b/src/util/peer.c @@ -127,7 +127,7 @@ GNUNET_PEER_intern (const struct GNUNET_PeerIdentity *pid) GNUNET_array_grow (table, size, size + 16); for (i = ret; i < size; i++) { - table[i] = GNUNET_malloc (sizeof (struct PeerEntry)); + table[i] = GNUNET_new (struct PeerEntry); table[i]->pid = i + 1; } } diff --git a/src/util/server_tc.c b/src/util/server_tc.c index 780b5f003..5324a6ab9 100644 --- a/src/util/server_tc.c +++ b/src/util/server_tc.c @@ -127,7 +127,7 @@ GNUNET_SERVER_transmit_context_create (struct GNUNET_SERVER_Client *client) struct GNUNET_SERVER_TransmitContext *tc; GNUNET_assert (NULL != client); - tc = GNUNET_malloc (sizeof (struct GNUNET_SERVER_TransmitContext)); + tc = GNUNET_new (struct GNUNET_SERVER_TransmitContext); GNUNET_SERVER_client_keep (client); tc->client = client; return tc; diff --git a/src/util/signal.c b/src/util/signal.c index 5cf50e8dc..b76c658c8 100644 --- a/src/util/signal.c +++ b/src/util/signal.c @@ -64,7 +64,7 @@ GNUNET_SIGNAL_handler_install (int signum, GNUNET_SIGNAL_Handler handler) struct sigaction sig; #endif - ret = GNUNET_malloc (sizeof (struct GNUNET_SIGNAL_Context)); + ret = GNUNET_new (struct GNUNET_SIGNAL_Context); ret->sig = signum; ret->method = handler; #ifndef MINGW diff --git a/src/util/test_client.c b/src/util/test_client.c index 6dfb8349a..2b44c1690 100644 --- a/src/util/test_client.c +++ b/src/util/test_client.c @@ -73,7 +73,7 @@ echo_cb (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving message from client, bouncing back\n"); GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size)); - cc = GNUNET_malloc (sizeof (struct CopyContext)); + cc = GNUNET_new (struct CopyContext); cc->client = client; cpy = GNUNET_malloc (ntohs (message->size)); memcpy (cpy, message, ntohs (message->size)); diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c index 8b4ff93d0..443d5c7c5 100644 --- a/src/util/test_container_slist.c +++ b/src/util/test_container_slist.c @@ -136,7 +136,7 @@ main (int argc, char *argv[]) for (i = 0; i < 100; i++) { - ip = GNUNET_malloc (sizeof (int)); + ip = GNUNET_new (int); *ip = i; GNUNET_CONTAINER_slist_add (l, GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC, ip, sizeof (int)); -- cgit v1.2.3