diff options
author | LRN <lrn1986@gmail.com> | 2013-12-19 06:00:23 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-12-19 06:00:23 +0000 |
commit | e0ca7357cd0bfedc5c29cb731b56279fef8da059 (patch) | |
tree | ecfd47cf59bc00e656b53fd59c58f5038e342d65 /src/util/disk.c | |
parent | 92fd84dc7ef98452f848a62677c61a2b80b5835e (diff) | |
download | gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.tar.gz gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.zip |
malloc -> new
Diffstat (limited to 'src/util/disk.c')
-rw-r--r-- | src/util/disk.c | 20 |
1 files changed, 10 insertions, 10 deletions
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) | |||
1899 | * otherwise we're screwed, as selecting on non-overlapped handle | 1899 | * otherwise we're screwed, as selecting on non-overlapped handle |
1900 | * will block. | 1900 | * will block. |
1901 | */ | 1901 | */ |
1902 | fh->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); | 1902 | fh->oOverlapRead = GNUNET_new (OVERLAPPED); |
1903 | fh->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); | 1903 | fh->oOverlapWrite = GNUNET_new (OVERLAPPED); |
1904 | fh->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); | 1904 | fh->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); |
1905 | fh->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); | 1905 | fh->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); |
1906 | } | 1906 | } |
@@ -2356,10 +2356,10 @@ GNUNET_DISK_pipe (int blocking_read, int blocking_write, int inherit_read, int i | |||
2356 | p->fd[0]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; | 2356 | p->fd[0]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; |
2357 | p->fd[1]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; | 2357 | p->fd[1]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; |
2358 | 2358 | ||
2359 | p->fd[0]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); | 2359 | p->fd[0]->oOverlapRead = GNUNET_new (OVERLAPPED); |
2360 | p->fd[0]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); | 2360 | p->fd[0]->oOverlapWrite = GNUNET_new (OVERLAPPED); |
2361 | p->fd[1]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); | 2361 | p->fd[1]->oOverlapRead = GNUNET_new (OVERLAPPED); |
2362 | p->fd[1]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); | 2362 | p->fd[1]->oOverlapWrite = GNUNET_new (OVERLAPPED); |
2363 | 2363 | ||
2364 | p->fd[0]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); | 2364 | p->fd[0]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); |
2365 | p->fd[0]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); | 2365 | 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]) | |||
2462 | if (p->fd[0]->h != INVALID_HANDLE_VALUE) | 2462 | if (p->fd[0]->h != INVALID_HANDLE_VALUE) |
2463 | { | 2463 | { |
2464 | p->fd[0]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; | 2464 | p->fd[0]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; |
2465 | p->fd[0]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); | 2465 | p->fd[0]->oOverlapRead = GNUNET_new (OVERLAPPED); |
2466 | p->fd[0]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); | 2466 | p->fd[0]->oOverlapWrite = GNUNET_new (OVERLAPPED); |
2467 | p->fd[0]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); | 2467 | p->fd[0]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); |
2468 | p->fd[0]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); | 2468 | p->fd[0]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); |
2469 | } | 2469 | } |
@@ -2480,8 +2480,8 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2]) | |||
2480 | if (p->fd[1]->h != INVALID_HANDLE_VALUE) | 2480 | if (p->fd[1]->h != INVALID_HANDLE_VALUE) |
2481 | { | 2481 | { |
2482 | p->fd[1]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; | 2482 | p->fd[1]->type = GNUNET_DISK_HANLDE_TYPE_PIPE; |
2483 | p->fd[1]->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED)); | 2483 | p->fd[1]->oOverlapRead = GNUNET_new (OVERLAPPED); |
2484 | p->fd[1]->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED)); | 2484 | p->fd[1]->oOverlapWrite = GNUNET_new (OVERLAPPED); |
2485 | p->fd[1]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); | 2485 | p->fd[1]->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); |
2486 | p->fd[1]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); | 2486 | p->fd[1]->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); |
2487 | } | 2487 | } |