Commit f9228b0673064c8b27cab0ccf47a4eb1e3cb0ae9
2024-03-02T17:11:22
alloc
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192
diff --git a/libc3/set.c.in b/libc3/set.c.in
index 335767f..571c6cd 100644
--- a/libc3/set.c.in
+++ b/libc3/set.c.in
@@ -11,8 +11,8 @@
* THIS SOFTWARE.
*/
/* Gen from set.c.in NAME=_NAME$ TYPE=_TYPE$ */
-#include <assert.h>
-#include <stdlib.h>
+#include "alloc.h"
+#include "assert.h"
#include "compare.h"
#include "_NAME$.h"
#include "set___NAME$.h"
@@ -120,12 +120,15 @@ set_get_hash_next___NAME$ (const s_set_item___NAME$ *item)
s_set___NAME$ *
set_init___NAME$ (s_set___NAME$ *set, uw max)
{
+ s_set___NAME$ tmp = {0};
assert(set);
assert(max > 0);
- set->max = max;
- set->items = calloc(max, sizeof(s_set_item___NAME$ *));
- set->count = 0;
- set->collisions = 0;
+ tmp.max = max;
+ tmp.items = alloc(max * sizeof(s_set_item___NAME$ *));
+ if (! tmp.items)
+ return NULL;
+ tmp.count = 0;
+ tmp.collisions = 0;
return set;
}
diff --git a/libc3/set__fact.c b/libc3/set__fact.c
index 20e6fc2..9b30897 100644
--- a/libc3/set__fact.c
+++ b/libc3/set__fact.c
@@ -11,8 +11,8 @@
* THIS SOFTWARE.
*/
/* Gen from set.c.in NAME=fact TYPE=s_fact */
-#include <assert.h>
-#include <stdlib.h>
+#include "alloc.h"
+#include "assert.h"
#include "compare.h"
#include "fact.h"
#include "set__fact.h"
@@ -120,12 +120,15 @@ set_get_hash_next__fact (const s_set_item__fact *item)
s_set__fact *
set_init__fact (s_set__fact *set, uw max)
{
+ s_set__fact tmp = {0};
assert(set);
assert(max > 0);
- set->max = max;
- set->items = calloc(max, sizeof(s_set_item__fact *));
- set->count = 0;
- set->collisions = 0;
+ tmp.max = max;
+ tmp.items = alloc(max * sizeof(s_set_item__fact *));
+ if (! tmp.items)
+ return NULL;
+ tmp.count = 0;
+ tmp.collisions = 0;
return set;
}
diff --git a/libc3/set__tag.c b/libc3/set__tag.c
index cc688df..18a7e35 100644
--- a/libc3/set__tag.c
+++ b/libc3/set__tag.c
@@ -11,8 +11,8 @@
* THIS SOFTWARE.
*/
/* Gen from set.c.in NAME=tag TYPE=s_tag */
-#include <assert.h>
-#include <stdlib.h>
+#include "alloc.h"
+#include "assert.h"
#include "compare.h"
#include "tag.h"
#include "set__tag.h"
@@ -120,12 +120,15 @@ set_get_hash_next__tag (const s_set_item__tag *item)
s_set__tag *
set_init__tag (s_set__tag *set, uw max)
{
+ s_set__tag tmp = {0};
assert(set);
assert(max > 0);
- set->max = max;
- set->items = calloc(max, sizeof(s_set_item__tag *));
- set->count = 0;
- set->collisions = 0;
+ tmp.max = max;
+ tmp.items = alloc(max * sizeof(s_set_item__tag *));
+ if (! tmp.items)
+ return NULL;
+ tmp.count = 0;
+ tmp.collisions = 0;
return set;
}
diff --git a/libc3/set_item.c.in b/libc3/set_item.c.in
index 6b14a57..3431d36 100644
--- a/libc3/set_item.c.in
+++ b/libc3/set_item.c.in
@@ -11,8 +11,8 @@
* THIS SOFTWARE.
*/
/* Gen from set_item.c.in NAME=_NAME$ TYPE=_TYPE$ */
+#include "alloc.h"
#include "assert.h"
-#include <stdlib.h>
#include "set_item___NAME$.h"
#include "_NAME$.h"
@@ -20,12 +20,9 @@ s_set_item___NAME$ *
set_item_new___NAME$ (const _TYPE$ *data, uw hash, s_set_item___NAME$ *next)
{
s_set_item___NAME$ *item;
- item = malloc(sizeof(s_set_item___NAME$));
- if (! item) {
- err_puts("set_item_new___NAME$: out of memory");
- assert(! "set_item_new___NAME$: out of memory");
+ item = alloc(sizeof(s_set_item___NAME$));
+ if (! item)
return NULL;
- }
if (! _NAME$_init_copy(&item->data, data)) {
free(item);
return NULL;
diff --git a/libc3/set_item__fact.c b/libc3/set_item__fact.c
index 175a407..7857e91 100644
--- a/libc3/set_item__fact.c
+++ b/libc3/set_item__fact.c
@@ -11,8 +11,8 @@
* THIS SOFTWARE.
*/
/* Gen from set_item.c.in NAME=fact TYPE=s_fact */
+#include "alloc.h"
#include "assert.h"
-#include <stdlib.h>
#include "set_item__fact.h"
#include "fact.h"
@@ -20,12 +20,9 @@ s_set_item__fact *
set_item_new__fact (const s_fact *data, uw hash, s_set_item__fact *next)
{
s_set_item__fact *item;
- item = malloc(sizeof(s_set_item__fact));
- if (! item) {
- err_puts("set_item_new__fact: out of memory");
- assert(! "set_item_new__fact: out of memory");
+ item = alloc(sizeof(s_set_item__fact));
+ if (! item)
return NULL;
- }
if (! fact_init_copy(&item->data, data)) {
free(item);
return NULL;
diff --git a/libc3/set_item__tag.c b/libc3/set_item__tag.c
index 6549740..b2cfd05 100644
--- a/libc3/set_item__tag.c
+++ b/libc3/set_item__tag.c
@@ -11,8 +11,8 @@
* THIS SOFTWARE.
*/
/* Gen from set_item.c.in NAME=tag TYPE=s_tag */
+#include "alloc.h"
#include "assert.h"
-#include <stdlib.h>
#include "set_item__tag.h"
#include "tag.h"
@@ -20,12 +20,9 @@ s_set_item__tag *
set_item_new__tag (const s_tag *data, uw hash, s_set_item__tag *next)
{
s_set_item__tag *item;
- item = malloc(sizeof(s_set_item__tag));
- if (! item) {
- err_puts("set_item_new__tag: out of memory");
- assert(! "set_item_new__tag: out of memory");
+ item = alloc(sizeof(s_set_item__tag));
+ if (! item)
return NULL;
- }
if (! tag_init_copy(&item->data, data)) {
free(item);
return NULL;