SQL_BIND(ss_neigh, 1, isle);
while (SQL_STEP(ss_neigh)) {
- Neighbour *add= mmalloc(sizeof(*add));
+ Neighbour *add;
+ NEW(add);
add->islandid= sqlite3_column_int(ss_neigh, 0);
add->dist= sqlite3_column_int(ss_neigh, 1);
add->next= head;
int *islandid2arch;
void setup_search(void) {
- neighbours= mcalloc(sizeof(*neighbours) * islandtablesz);
+ MCALLOC(neighbours, islandtablesz);
SQL_PREPARE(ss_neigh,
"SELECT biid, dist FROM routes WHERE aiid=?");
" SELECT DISTINCT archipelago\n"
" FROM islands\n"
" )");
- archnames= mcalloc(sizeof(*archnames) * max_narches);
- islandid2arch= mmalloc(sizeof(*islandid2arch) * islandtablesz);
- int i;
- for (i=0; i<islandtablesz; i++) islandid2arch[i]=-1;
+ MCALLOC(archnames, max_narches);
+ MCALLOC_INITEACH(islandid2arch, islandtablesz, *this=-1);
sqlite3_stmt *archs;
SQL_PREPARE(archs,