Use errAbort when fail

icebert · icebert · commit 98df9e0976c3 · 2020-06-14T11:12:26.000-04:00
diff --git a/blatSrc/blat.c b/blatSrc/blat.c
@@ -696,8 +696,11 @@ void bigBlat(struct dnaSeq *untransList, int queryCount, char *queryFiles[], str
                         frame = fwrite(buf, 1, cnt, out[0]);
                         if (frame != cnt)
                         {
-                            printf("Merge files failed\n");
-                            return;
+                            free(thd);
+                            free(args);
+                            free(id);
+                            free(offset);
+                            errAbort("Merge files failed\n");
                         }
                     }
                     out[i] = freopen(NULL, "w+", out[i]);
@@ -946,7 +949,7 @@ int main(int argc, char *argv[])
         lf[i] = lineFileOpen(queryFiles[0], TRUE);
     }
 
-    
+
     queryCount=0;
     struct lineFile *tlf = lineFileOpen(queryFiles[0], TRUE);
     while (faMixedSpeedReadNext(tlf, NULL, NULL, NULL, &faFastBuf, &faFastBufSize))
@@ -993,8 +996,8 @@ int main(int argc, char *argv[])
                 tmp=fwrite(buf, 1, cnt, out[0]);
                 if (tmp!=cnt)
                 {
-                    printf("Merge files failed\n");
-                    return 1;
+                    free(out);
+                    errAbort("Merge files failed\n");
                 }
             }
             carefulClose(&(out[i]));

Original file line number	Diff line number	Diff line change
`@@ -696,8 +696,11 @@ void bigBlat(struct dnaSeq untransList, int queryCount, char queryFiles[], str`
`696`	`696`	`frame = fwrite(buf, 1, cnt, out[0]);`
`697`	`697`	`if (frame != cnt)`
`698`	`698`	`{`
`699`		`- printf("Merge files failed\n");`
`700`		`- return;`
	`699`	`+ free(thd);`
	`700`	`+ free(args);`
	`701`	`+ free(id);`
	`702`	`+ free(offset);`
	`703`	`+ errAbort("Merge files failed\n");`
`701`	`704`	`}`
`702`	`705`	`}`
`703`	`706`	`out[i] = freopen(NULL, "w+", out[i]);`
`@@ -946,7 +949,7 @@ int main(int argc, char *argv[])`
`946`	`949`	`lf[i] = lineFileOpen(queryFiles[0], TRUE);`
`947`	`950`	`}`
`948`	`951`
`949`		`-`
	`952`	`+`
`950`	`953`	`queryCount=0;`
`951`	`954`	`struct lineFile *tlf = lineFileOpen(queryFiles[0], TRUE);`
`952`	`955`	`while (faMixedSpeedReadNext(tlf, NULL, NULL, NULL, &faFastBuf, &faFastBufSize))`
`@@ -993,8 +996,8 @@ int main(int argc, char *argv[])`
`993`	`996`	`tmp=fwrite(buf, 1, cnt, out[0]);`
`994`	`997`	`if (tmp!=cnt)`
`995`	`998`	`{`
`996`		`- printf("Merge files failed\n");`
`997`		`- return 1;`
	`999`	`+ free(out);`
	`1000`	`+ errAbort("Merge files failed\n");`
`998`	`1001`	`}`
`999`	`1002`	`}`
`1000`	`1003`	`carefulClose(&(out[i]));`