src/hg/makeDb/hgLoadMaf/hgLoadMaf.c 1.27
1.27 2009/09/23 18:42:22 angie
Fixed compiler warnings from gcc 4.3.3, mostly about system calls whose return values weren't checked and non-literal format strings with no args.
Index: src/hg/makeDb/hgLoadMaf/hgLoadMaf.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/makeDb/hgLoadMaf/hgLoadMaf.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -B -U 4 -r1.26 -r1.27
--- src/hg/makeDb/hgLoadMaf/hgLoadMaf.c 14 Sep 2008 08:08:28 -0000 1.26
+++ src/hg/makeDb/hgLoadMaf/hgLoadMaf.c 23 Sep 2009 18:42:22 -0000 1.27
@@ -188,22 +188,22 @@
double maxScore, minScore;
mc = findComponent(maf, refDb);
if (mc == NULL)
{
- char msg[256];
+ char msg[2048];
safef(msg, sizeof(msg),
"Couldn't find %s. sequence line %d of %s\n",
refDb, mf->lf->lineIx, fileName);
if (warnOption || warnVerboseOption)
{
warnCount++;
if (warnVerboseOption)
- verbose(1, msg);
+ verbose(1, "%s", msg);
mafAliFree(&maf);
continue;
}
else
- errAbort(msg);
+ errAbort("%s", msg);
}
ZeroVar(&mr);
mr.chrom = mc->src + dbNameLen + 1;
@@ -251,19 +251,16 @@
* then scale by blastz scoring range */
mr.score = (mr.score-minScore)/(maxScore-minScore);
if (mr.score <= 0.0)
{
- char msg[256];
- safef(msg, sizeof(msg),
- "Score too small (raw %.1f scaled %.1f #species %d),"
- " line %d of %s\n",
- maf->score, mr.score, slCount(maf->components),
- mf->lf->lineIx, fileName);
if (warnOption || warnVerboseOption)
{
warnCount++;
if (warnVerboseOption)
- verbose(1, msg);
+ verbose(1, "Score too small (raw %.1f scaled %.1f #species %d),"
+ " line %d of %s\n",
+ maf->score, mr.score, slCount(maf->components),
+ mf->lf->lineIx, fileName);
}
mr.score = 0.001;
}
if (mr.score > 1.0) mr.score = 1.0;
@@ -284,9 +281,9 @@
if (errMsg)
{
if (!isCustom)
hgPurgeExtFile(extId, conn);
- errAbort(errMsg);
+ errAbort("%s", errMsg);
}
if (warnCount)
verbose(1, "%d warnings\n", warnCount);