X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Frssearch.c;fp=yarrg%2Frssearch.c;h=6674c02952a263dde69b7c4c1838e737f2a8a63d;hb=d0f65e91f071ebb0fbc6791ee168e2be5ba8e5ae;hp=0286584dddaa5f5045ce392a2b3e2350f119b0f8;hpb=2bed6e5f821385bd05e8a412554b91798028df14;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 0286584..6674c02 100644
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -23,7 +23,8 @@ static Neighbour *get_neighbours(int isle) {
 
   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;
@@ -152,7 +153,7 @@ char **archnames;
 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=?");
@@ -162,10 +163,8 @@ void setup_search(void) {
 		   "  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,