eb79c72631afcf5aaa693d68cd1d423330d3c717 max Tue Sep 22 08:23:04 2015 -0700 rewording line after a code review concerned with code readability, refs #16057 diff --git src/hg/lib/customPp.c src/hg/lib/customPp.c index 1e42dad..cb6bde8 100644 --- src/hg/lib/customPp.c +++ src/hg/lib/customPp.c @@ -95,32 +95,33 @@ return reused->name; } /* Get next line from file on top of stack. If at EOF * go to next file in stack. If get a http:// or https:// or ftp:// line * open file this references and push it onto stack. Meanwhile * squirrel away 'browser' lines. */ struct lineFile *lf; while ((lf = cpp->fileStack) != NULL) { char *line; if (lineFileNext(lf, &line, NULL)) { // if user pastes just a URL, create a track line automatically // also allow a filename from a local directory if it has been allowed via udc.localDir in hg.conf + bool isLocalFile = cfgOption("udc.localDir")!=NULL && startsWith(cfgOption("udc.localDir"), line); if (startsWith("http://", line) || startsWith("https://", line) || startsWith("ftp://", line) || - (cfgOption("udc.localDir")!=NULL && startsWith(cfgOption("udc.localDir"), line)) ) + isLocalFile) { if (customTrackIsBigData(line)) line = bigUrlToTrackLine(line); else { lf = netLineFileOpen(line); slAddHead(&cpp->fileStack, lf); #ifdef PROGRESS_METER off_t remoteSize = 0; remoteSize = remoteFileSize(line); cpp->remoteFileSize = remoteSize; #endif continue; } }