src/lib/ra.c 1.17

1.17 2009/12/08 20:42:50 kent
Making it so that don't lose blank terminating lines in raNextTagVal. Simplifying logic in raSkipLeadingEmptyLines.
Index: src/lib/ra.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/lib/ra.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -B -U 4 -r1.16 -r1.17
--- src/lib/ra.c	7 Dec 2009 02:37:21 -0000	1.16
+++ src/lib/ra.c	8 Dec 2009 20:42:50 -0000	1.17
@@ -28,31 +28,19 @@
    {
    if (!lineFileNext(lf, &line, NULL))
        return FALSE;
    char *tag = skipLeadingSpaces(line);
-   if (tag[0] != 0 )
-       {
-       if (tag[0] == '#')
+    if (tag[0] == 0 || tag[0] == '#')
 	   {
 	   if (dy)
 	       {
 	       dyStringAppend(dy, line);
 	       dyStringAppendC(dy, '\n');
 	       }
-           continue;
 	   }
        else 
            break;
        }
-   else
-       {
-       if (dy)
-	   {
-	   dyStringAppend(dy, line);
-	   dyStringAppendC(dy, '\n');
-	   }
-       }
-   }
 lineFileReuse(lf);
 return TRUE;
 }
 
@@ -65,18 +53,20 @@
 for (;;)
     {
     if (!lineFileNext(lf, &line, NULL))
        return FALSE;
-   if (dy)
-       {
-       dyStringAppend(dy, line);
-       dyStringAppendC(dy, '\n');
-       }
     char *tag = skipLeadingSpaces(line);
     if (tag[0] == 0)
        {
+       if (dy)
+	   lineFileReuse(lf);	/* Just so don't lose leading space in dy. */
        return FALSE;
        }
+    if (dy)
+       {
+       dyStringAppend(dy, line);
+       dyStringAppendC(dy, '\n');
+       }
     if (tag[0] == '#')
        {
        if (startsWith("#EOF", tag))
 	   return FALSE;