aa05e8309dcff108120ec513b1e999c5c9fdab2c galt Tue Dec 31 21:03:13 2024 -0800 fix compiler warning in hgc on hgwdev-new with Rocky 9. diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c index 71c1f64..8598de8 100644 --- src/hg/hgc/hgc.c +++ src/hg/hgc/hgc.c @@ -680,31 +680,31 @@ toUpperN(seq->dna + (start-s), end - start); printf("<PRE><TT>"); cfm = cfmNew(10, 50, TRUE, FALSE, stdout, s); for (i=0; i<seq->size; ++i) { cfmOut(cfm, seq->dna[i], 0); } cfmFree(&cfm); printf("</TT></PRE>"); } void printBand(char *chrom, int start, int end, boolean tableFormat) /* Print all matching chromosome bands. */ /* Ignore end if it is zero. */ { -char sband[32], eband[32]; +char sband[HDB_MAX_BAND_STRING], eband[HDB_MAX_BAND_STRING]; boolean gotS = FALSE; boolean gotE = FALSE; if (start < 0) return; gotS = hChromBand(database, chrom, start, sband); /* if the start lookup fails, don't bother with the end lookup */ if (!gotS) return; /* if no end chrom, print start band and exit */ if (end == 0) { if (tableFormat) printf("<TR><TH ALIGN=left>Band:</TH><TD>%s</TD></TR>\n",sband); else @@ -4933,32 +4933,32 @@ { struct dyString *url = dyStringNew(0); dyStringAppend(url, "https://www.ncbi.nlm.nih.gov/Traces/trace.cgi?"); dyStringPrintf(url, "cmd=retrieve&size=1&val=%s&", traceId); dyStringAppend(url, "file=trace&dopt=trace"); return dyStringCannibalize(&url); } void doGetDna1() /* Do first get DNA dialog. */ { struct hTableInfo *hti = NULL; char *tbl = cgiUsualString("table", ""); if (dbIsFound && tbl[0] != 0) { - char rootName[256]; - char parsedChrom[32]; + char rootName[HDB_MAX_TABLE_STRING]; + char parsedChrom[HDB_MAX_CHROM_STRING]; hParseTableName(database, tbl, rootName, parsedChrom); if (!trackHubDatabase(database)) hti = hFindTableInfo(database, seqName, rootName); } char *thisOrg = hOrganism(database); cartWebStart(cart, database, "Get DNA in Window (%s/%s)", trackHubSkipHubName(database), trackHubSkipHubName(thisOrg)); printf("<H2>Get DNA for </H2>\n"); printf("<FORM ACTION=\"%s\">\n\n", hgcName()); cartSaveSession(cart); cgiMakeHiddenVar("g", "htcGetDna2"); cgiMakeHiddenVar("table", tbl); cgiContinueHiddenVar("i"); cgiContinueHiddenVar("o"); cgiContinueHiddenVar("t"); cgiContinueHiddenVar("l"); @@ -5488,32 +5488,32 @@ itemCount = 1; if ( NULL != (pos = stripCommas(cartOptionalString(cart, "getDnaPos"))) && hgParseChromRange((dbIsFound ? database : NULL), pos, &chrom, &start, &end)) { hgSeqRange(database, chrom, start, end, '?', "dna"); } else { hgSeqRange(database, seqName, cartInt(cart, "l"), cartInt(cart, "r"), '?', "dna"); } } else { struct hTableInfo *hti = NULL; - char rootName[256]; - char parsedChrom[32]; + char rootName[HDB_MAX_TABLE_STRING]; + char parsedChrom[HDB_MAX_CHROM_STRING]; /* use the values from the dnaPos dialog box */ if (!( NULL != (pos = stripCommas(cartOptionalString(cart, "getDnaPos"))) && hgParseChromRange(database, pos, &chrom, &start, &end))) { /* if can't get DnaPos from dialog box, use "o" and "t" */ start = cartInt(cart, "o"); end = cartInt(cart, "t"); } /* Table might be a custom track if it's not in the database, * or bigBed if it is in the database but has only one column called 'fileName'; * in which case, just get DNA as if no table were given. */ hParseTableName(database, tbl, rootName, parsedChrom); if (!trackHubDatabase(database)) @@ -11657,31 +11657,31 @@ showOmimDisorderTable(conn, url, itemName); } printf("</div>"); // #omimText } void printOmimLocationDetails(struct trackDb *tdb, char *itemName, boolean encode) /* Print details of an OMIM Class 3 Gene entry. */ { struct sqlConnection *conn = hAllocConn(database); struct sqlConnection *conn2 = hAllocConn(database); char query[256]; struct sqlResult *sr; char **row; char *url = tdb->url; -char *kgId= NULL; +char *kgId = cartString(cart, "i"); char *title1 = NULL; char *geneSymbol = NULL; char *chrom, *chromStart, *chromEnd; char *kgDescription = NULL; char *refSeq; char *omimId; chrom = cartOptionalString(cart, "c"); chromStart = cartOptionalString(cart, "o"); chromEnd = cartOptionalString(cart, "t"); omimId = itemName; if (url != NULL && url[0] != 0) { @@ -11916,34 +11916,37 @@ " from omimGeneMap2 m, omimAv v" " where m.omimId=%s and m.omimId=v.omimId and v.avId='%s';", itemName, avId); sr = sqlMustGetResult(conn, query); row = sqlNextRow(sr); if (row != NULL) { if (row[0] != NULL) { title1 = cloneString(row[0]); } avDesc = cloneString(row[2]); } sqlFreeResult(&sr); + if (avDesc) + { printf("<B>OMIM Allelic Variant: "); printf("<A HREF=\"%s%s\" target=_blank>", url, avString); printf("%s</A></B>", avId); printf(" %s", avDesc); + } printf("<BR><B>OMIM: "); printf("<A HREF=\"%s%s\" target=_blank>", url, itemName); printf("%s</A></B>", itemName); if (title1 != NULL) printf(": %s", title1); // disable NCBI link until they work it out with OMIM /* printf("<BR>\n"); printf("<B>OMIM page at NCBI: "); printf("<A HREF=\"%s%s\" target=_blank>", ncbiOmimUrl, itemName); printf("%s</A></B><BR>", itemName); */ sqlSafef(query, sizeof(query),