src/lib/metaWig.c 1.2

Index: src/lib/metaWig.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/lib/metaWig.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -B -U 4 -r1.1 -r1.2
--- src/lib/metaWig.c	3 Jun 2010 16:51:55 -0000	1.1
+++ src/lib/metaWig.c	3 Jun 2010 17:09:12 -0000	1.2
@@ -19,21 +19,22 @@
     }
 return hash;
 }
 
-struct metaWig *metaWigOpen(char *fileName, struct lm *lm)
+struct metaWig *metaWigOpen(char *fileName)
 /* Wrap self around file.  Read all of it if it's wig, just header if bigWig. */
 {
 struct metaWig *mw;
-lmAllocVar(lm, mw);
+AllocVar(mw);
 if (isBigWig(fileName))
     {
     mw->type = mwtBigWig;
     mw->bwf = bigWigFileOpen(fileName);
     }
 else
     {
-    mw->sectionList = bwgParseWig(fileName, FALSE, NULL, 512, lm);
+    mw->lm = lmInit(0);
+    mw->sectionList = bwgParseWig(fileName, FALSE, NULL, 512, mw->lm);
     mw->chromHash = hashSectionChroms(mw->sectionList);
     mw->type = mwtSections;
     }
 return mw;
@@ -45,10 +46,10 @@
 struct metaWig *mw = *pMw;
 if (mw != NULL)
     {
     bigWigFileClose(&mw->bwf);
-    *pMw = NULL;
-    /* note mw is in local memory. */
+    lmCleanup(&mw->lm);
+    freez(pMw);
     }
 }
 
 struct slName *metaWigChromList(struct metaWig *mw)