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/datacache | |
parent | 92fd84dc7ef98452f848a62677c61a2b80b5835e (diff) | |
download | gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.tar.gz gnunet-e0ca7357cd0bfedc5c29cb731b56279fef8da059.zip |
malloc -> new
Diffstat (limited to 'src/datacache')
-rw-r--r-- | src/datacache/datacache.c | 2 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_heap.c | 4 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_postgres.c | 4 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_sqlite.c | 4 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_template.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index c96432946..d7adb8b4d 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c | |||
@@ -153,7 +153,7 @@ GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
153 | } | 153 | } |
154 | bf_size = quota / 32; /* 8 bit per entry, 1 bit per 32 kb in DB */ | 154 | bf_size = quota / 32; /* 8 bit per entry, 1 bit per 32 kb in DB */ |
155 | 155 | ||
156 | ret = GNUNET_malloc (sizeof (struct GNUNET_DATACACHE_Handle)); | 156 | ret = GNUNET_new (struct GNUNET_DATACACHE_Handle); |
157 | 157 | ||
158 | if (GNUNET_YES != | 158 | if (GNUNET_YES != |
159 | GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "DISABLE_BF")) | 159 | GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "DISABLE_BF")) |
diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c index 85cf9487e..9689d4f05 100644 --- a/src/datacache/plugin_datacache_heap.c +++ b/src/datacache/plugin_datacache_heap.c | |||
@@ -393,12 +393,12 @@ libgnunet_plugin_datacache_heap_init (void *cls) | |||
393 | struct GNUNET_DATACACHE_PluginFunctions *api; | 393 | struct GNUNET_DATACACHE_PluginFunctions *api; |
394 | struct Plugin *plugin; | 394 | struct Plugin *plugin; |
395 | 395 | ||
396 | plugin = GNUNET_malloc (sizeof (struct Plugin)); | 396 | plugin = GNUNET_new (struct Plugin); |
397 | plugin->map = GNUNET_CONTAINER_multihashmap_create (1024, /* FIXME: base on quota! */ | 397 | plugin->map = GNUNET_CONTAINER_multihashmap_create (1024, /* FIXME: base on quota! */ |
398 | GNUNET_YES); | 398 | GNUNET_YES); |
399 | plugin->heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); | 399 | plugin->heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); |
400 | plugin->env = env; | 400 | plugin->env = env; |
401 | api = GNUNET_malloc (sizeof (struct GNUNET_DATACACHE_PluginFunctions)); | 401 | api = GNUNET_new (struct GNUNET_DATACACHE_PluginFunctions); |
402 | api->cls = plugin; | 402 | api->cls = plugin; |
403 | api->get = &heap_plugin_get; | 403 | api->get = &heap_plugin_get; |
404 | api->put = &heap_plugin_put; | 404 | api->put = &heap_plugin_put; |
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index 6d7e28021..150a9d5dc 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c | |||
@@ -374,7 +374,7 @@ libgnunet_plugin_datacache_postgres_init (void *cls) | |||
374 | struct GNUNET_DATACACHE_PluginFunctions *api; | 374 | struct GNUNET_DATACACHE_PluginFunctions *api; |
375 | struct Plugin *plugin; | 375 | struct Plugin *plugin; |
376 | 376 | ||
377 | plugin = GNUNET_malloc (sizeof (struct Plugin)); | 377 | plugin = GNUNET_new (struct Plugin); |
378 | plugin->env = env; | 378 | plugin->env = env; |
379 | 379 | ||
380 | if (GNUNET_OK != init_connection (plugin)) | 380 | if (GNUNET_OK != init_connection (plugin)) |
@@ -383,7 +383,7 @@ libgnunet_plugin_datacache_postgres_init (void *cls) | |||
383 | return NULL; | 383 | return NULL; |
384 | } | 384 | } |
385 | 385 | ||
386 | api = GNUNET_malloc (sizeof (struct GNUNET_DATACACHE_PluginFunctions)); | 386 | api = GNUNET_new (struct GNUNET_DATACACHE_PluginFunctions); |
387 | api->cls = plugin; | 387 | api->cls = plugin; |
388 | api->get = &postgres_plugin_get; | 388 | api->get = &postgres_plugin_get; |
389 | api->put = &postgres_plugin_put; | 389 | api->put = &postgres_plugin_put; |
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 1901bdedd..b7f1757ca 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c | |||
@@ -438,11 +438,11 @@ libgnunet_plugin_datacache_sqlite_init (void *cls) | |||
438 | " path BLOB DEFAULT '')"); | 438 | " path BLOB DEFAULT '')"); |
439 | SQLITE3_EXEC (dbh, "CREATE INDEX idx_hashidx ON ds090 (key,type,expire)"); | 439 | SQLITE3_EXEC (dbh, "CREATE INDEX idx_hashidx ON ds090 (key,type,expire)"); |
440 | SQLITE3_EXEC (dbh, "CREATE INDEX idx_expire ON ds090 (expire)"); | 440 | SQLITE3_EXEC (dbh, "CREATE INDEX idx_expire ON ds090 (expire)"); |
441 | plugin = GNUNET_malloc (sizeof (struct Plugin)); | 441 | plugin = GNUNET_new (struct Plugin); |
442 | plugin->env = env; | 442 | plugin->env = env; |
443 | plugin->dbh = dbh; | 443 | plugin->dbh = dbh; |
444 | plugin->fn = fn_utf8; | 444 | plugin->fn = fn_utf8; |
445 | api = GNUNET_malloc (sizeof (struct GNUNET_DATACACHE_PluginFunctions)); | 445 | api = GNUNET_new (struct GNUNET_DATACACHE_PluginFunctions); |
446 | api->cls = plugin; | 446 | api->cls = plugin; |
447 | api->get = &sqlite_plugin_get; | 447 | api->get = &sqlite_plugin_get; |
448 | api->put = &sqlite_plugin_put; | 448 | api->put = &sqlite_plugin_put; |
diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c index 306615571..205cc66c7 100644 --- a/src/datacache/plugin_datacache_template.c +++ b/src/datacache/plugin_datacache_template.c | |||
@@ -114,9 +114,9 @@ libgnunet_plugin_datacache_template_init (void *cls) | |||
114 | struct GNUNET_DATACACHE_PluginFunctions *api; | 114 | struct GNUNET_DATACACHE_PluginFunctions *api; |
115 | struct Plugin *plugin; | 115 | struct Plugin *plugin; |
116 | 116 | ||
117 | plugin = GNUNET_malloc (sizeof (struct Plugin)); | 117 | plugin = GNUNET_new (struct Plugin); |
118 | plugin->env = env; | 118 | plugin->env = env; |
119 | api = GNUNET_malloc (sizeof (struct GNUNET_DATACACHE_PluginFunctions)); | 119 | api = GNUNET_new (struct GNUNET_DATACACHE_PluginFunctions); |
120 | api->cls = plugin; | 120 | api->cls = plugin; |
121 | api->get = &template_plugin_get; | 121 | api->get = &template_plugin_get; |
122 | api->put = &template_plugin_put; | 122 | api->put = &template_plugin_put; |