7e8a696881983f39aaf4d358a618217cae150ed8 hiram Mon Mar 2 12:52:44 2020 -0800 correct one line header message in usage() no redmine diff --git src/hg/utils/pslMap/pslMap.c src/hg/utils/pslMap/pslMap.c index 3a05253..509cc1d 100644 --- src/hg/utils/pslMap/pslMap.c +++ src/hg/utils/pslMap/pslMap.c @@ -40,38 +40,38 @@ static char* mapInfoFile = NULL; static char* mappingPslFile = NULL; static char *mapInfoHdr = "#srcQName\t" "srcQStart\t" "srcQEnd\t" "srcQSize\t" "srcTName\t" "srcTStart\t" "srcTEnd\t" "srcStrand\t" "srcAligned\t" "mappingQName\t" "mappingQStart\t" "mappingQEnd\t" "mappingTName\t" "mappingTStart\t" "mappingTEnd\t" "mappingStrand\t" "mappingId\t" "mappedQName\t" "mappedQStart\t" "mappedQEnd\t" "mappedTName\t" "mappedTStart\t" "mappedTEnd\t" "mappedStrand\t" "mappedAligned\t" "qStartTrunc\t" "qEndTrunc\n"; -static void usage(char *msg) +static void usage() /* usage msg and exit */ { /* message got huge, so it's in a generate file */ static char *usageMsg = #include "usage.msg" ; -errAbort("%s\n%s", msg, usageMsg); +errAbort("%s", usageMsg); } static void verbosePslNl(int verbosity, char *msg, struct psl *psl) /* Verbose logging of msg, if not null, followed by a psl if not null, followed by a new line */ { if (verboseLevel() >= verbosity) { if (msg != NULL) verbose(verbosity, "%s ", msg); if (psl != NULL) pslTabOut(psl, verboseLogFile()); else verbose(verbosity, "NULL\n"); } } @@ -368,31 +368,31 @@ pslSwap(inPsl, FALSE); mapQueryPsl(inPsl, mapAlns, outPslFh, mapInfoFh, mappingPslFh); pslFree(&inPsl); } carefulClose(&mappingPslFh); carefulClose(&mapInfoFh); carefulClose(&outPslFh); lineFileClose(&inPslLf); } int main(int argc, char *argv[]) /* Process command line. */ { optionInit(&argc, argv, optionSpecs); if (argc != 4) - usage("Error: wrong number of arguments"); + usage(); suffix = optionVal("suffix", NULL); if (optionExists("keepTranslated")) mapOpts |= pslTransMapKeepTrans; mapFileWithInQName = optionExists("mapFileWithInQName"); chainMapFile = optionExists("chainMapFile"); if (mapFileWithInQName && chainMapFile) errAbort("can't specify -mapFileWithInQName with -chainMapFile"); swapMap = optionExists("swapMap"); swapIn = optionExists("swapIn"); simplifyMappingIds = optionExists("simplifyMappingIds"); mapInfoFile = optionVal("mapInfo", NULL); mappingPslFile = optionVal("mappingPsls", NULL); pslMap(argv[1], argv[2], argv[3]); return 0;