cad7a0c5af84f9a1a0ec2a1ee0e7b9622a8c9729 angie Wed Nov 16 14:09:29 2011 -0800 Fixes for stricter -Wall warnings: use puts instead of printf if there's noformat argument, and use TRUE & FALSE instead of true & false. diff --git src/hg/hgc/t2g.c src/hg/hgc/t2g.c index 01f912f..4ff016c 100644 --- src/hg/hgc/t2g.c +++ src/hg/hgc/t2g.c @@ -43,31 +43,31 @@ printf("<P style=\"width:800px; font-size:100%%\">%s</P>\n", abstract); } sqlFreeResult(&sr); return docId; } struct hash* getSeqIdHash(struct sqlConnection* conn, char* trackTable, char* docId, char *item, char* seqName, int start) { /* get sequence-Ids for feature that was clicked (item&startPos are unique) and return as hash */ // there must be an easier way to do this... // couldn't find a function that splits a string and converts it to a list char query[512]; safef(query, sizeof(query), "SELECT seqIds,'' FROM %s WHERE name='%s' " "and chrom='%s' and chromStart=%d", trackTable, item, seqName, start); if (debug) - printf(query); + puts(query); char* seqIdCoordString = sqlQuickString(conn, query); char* seqIdCoords[1024]; int partCount = chopString(seqIdCoordString, ",", seqIdCoords, ArraySize(seqIdCoords)); int i; struct hash *seqIdHash = NULL; seqIdHash = newHash(0); for (i=0; i<partCount; i++) { char* seqId[1024]; chopString(seqIdCoords[i], ":", seqId, ArraySize(seqId)); if (debug) printf("%s, %s<br>", seqId[0], seqId[1]); hashAdd(seqIdHash, seqId[0], seqId[1]); } freeMem(seqIdCoordString); @@ -85,65 +85,65 @@ puts(" <TH style=\"width: 30%\">Identifiers</TH>\n"); if (!isClickedSection && !debug) puts(" <TH style=\"width: 20%\">Matches</TH>\n"); puts("</TR>\n"); } bool printSeqSection(char* docId, char* title, bool showDesc, struct sqlConnection* conn, struct hash* filterIdHash, bool isClickedSection, bool fasta) /* print a table of sequences, show only sequences with IDs in hash, * */ { // get data from mysql char query[4096]; safef(query, sizeof(query), "SELECT fileDesc, snippet, locations, articleId,fileId, seqId, sequence FROM %s WHERE articleId='%s';", sequenceTable, docId); if (debug) - printf(query); + puts(query); struct sqlResult *sr = sqlGetResult(conn, query); // construct title for section char fullTitle[5000]; safef(fullTitle, sizeof(fullTitle), "%s <A HREF=\"../cgi-bin/hgc?%s&o=%s&t=%s&g=%s&i=%s&fasta=%d\"><SMALL>(switch fasta format)</SMALL></A>", title, cartSidUrlString(cart), cgiString("o"), cgiString("t"), cgiString("g"), cgiString("i"), !fasta); webNewSection(fullTitle); if (!fasta) printSeqHeaders(debug, showDesc, isClickedSection); char **row; - bool foundSkippedRows = false; + bool foundSkippedRows = FALSE; while ((row = sqlNextRow(sr)) != NULL) { char* fileDesc = row[0]; char* snippet = row[1]; char* locList = row[2]; char* artId = row[3]; char* fileId = row[4]; char* seqId = row[5]; char* seq = row[6]; // annotation (=sequence) ID is a 64 bit int with 10 digits for // article, 3 digits for file, 5 for annotation char annotId[100]; safef(annotId, 100, "%010d%03d%05d", atoi(artId), atoi(fileId), atoi(seqId)); // only display this sequence if we're in the right section if ((hashLookup(filterIdHash, annotId)==0) ^ !isClickedSection) { - foundSkippedRows = true; + foundSkippedRows = FALSE; continue; } if (fasta) { printf("<TT>>%s<BR>%s<BR></TT>", annotId, seq); } else { printf("<TR style=\"background-color: #%s\">\n", HG_COL_LOCAL_TABLE); if (showDesc) printf("<TD style=\"word-break: normal\">%s\n", fileDesc); //printf("<TD><I>%s</I></TD>\n", snippet); printf("<TD style=\"word-break: normal\"><I>%s</I></TD>\n", snippet); if (debug)