src/lib/ra.c 1.16
1.16 2009/12/07 02:37:21 kent
Fixing some problems with the new dyString parameter to the ra readers.
Index: src/lib/ra.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/lib/ra.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -B -U 4 -r1.15 -r1.16
--- src/lib/ra.c 6 Dec 2009 20:09:36 -0000 1.15
+++ src/lib/ra.c 7 Dec 2009 02:37:21 -0000 1.16
@@ -33,18 +33,24 @@
{
if (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;
@@ -59,26 +65,29 @@
for (;;)
{
if (!lineFileNext(lf, &line, NULL))
return FALSE;
+ if (dy)
+ {
+ dyStringAppend(dy, line);
+ dyStringAppendC(dy, '\n');
+ }
char *tag = skipLeadingSpaces(line);
if (tag[0] == 0)
+ {
return FALSE;
+ }
if (tag[0] == '#')
{
if (startsWith("#EOF", tag))
return FALSE;
else
{
- if (dy)
- dyStringAppend(dy, line);
continue;
}
}
break;
}
-if (dy)
- dyStringAppend(dy, line);
*retTag = nextWord(&line);
*retVal = trimSpaces(line);
return TRUE;
}