a22f29f70bbec6f5865153ef76637e4fa773b874 chinhli Tue Jun 7 15:40:19 2011 -0700 code review #4180 - Use pointer copy for static character pointers: char *clickMsg = NULL; and clickMsg = openMsg2; diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c index c9c3b44..788cbd8 100644 --- src/hg/hgc/hgc.c +++ src/hg/hgc/hgc.c @@ -23403,31 +23403,31 @@ /* Put up page for NumtS. */ { char *table = tdb->table; struct sqlConnection *conn = hAllocConn(database); struct bed *bed; char query[512]; struct sqlResult *sr; char **row; boolean firstTime = TRUE; int start = cartInt(cart, "o"); int num = 6; char itemNameDash[64]; /* itenName appended with a "_" */ char itemNameTrimmed[64]; /* itemName trimed at last "_" */ int sDiff = 30; /* acceptable difference of genomics size */ /* message strings */ -char clickMsg[128]; +char *clickMsg = NULL; char *openMsg1 = "Click 'browser' link below to open Genome Browser at genomic position where"; char *openMsg2 = "maps\n"; char *openMsgM = "Click 'browser' link below to open Genome Browser at mitochondrial position where"; genericHeader(tdb, itemName); genericBedClick(conn, tdb, itemName, start, num); safecpy(itemNameDash, sizeof(itemNameDash),itemName); safecat(itemNameDash,64,"_"); safecpy(itemNameTrimmed, sizeof(itemNameTrimmed),itemName); chopSuffixAt(itemNameTrimmed, '_'); safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand from %s where name='%s'", table, itemName); @@ -23438,61 +23438,61 @@ bed = bedLoad6(row); sSize = bed->chromEnd - bed->chromStart; /* printf("sSize is: %5d <BR>", sSize); */ } if (sameString("numtS", table)) { safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand " "from numtSMitochondrionChrPlacement where ( " "(name = '%s') OR (((name REGEXP '^%s') OR (name='%s')) AND " " (ABS((chromEnd - chromStart)-%d) <= %d ))) ", itemName, itemNameDash, itemNameTrimmed, sSize, sDiff); - strcpy(clickMsg, openMsgM); + clickMsg = openMsgM; } else if (sameString("numtSAssembled", table)) { safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand " "from numtSMitochondrionChrPlacement where ( " "(name = '%s') OR (((name REGEXP '^%s') OR (name='%s')) AND " " (ABS((chromEnd - chromStart)-%d) <= %d ))) ", itemName, itemNameDash, itemNameTrimmed, sSize, sDiff); - strcpy(clickMsg, openMsgM); + clickMsg = openMsgM; } else if (sameString("numtSMitochondrion", table)) { safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand " "from numtS where ( " "(name = '%s') OR (((name REGEXP '^%s') OR (name='%s')) AND " " (ABS((chromEnd - chromStart)-%d) <= %d ))) ", itemName, itemNameDash, itemNameTrimmed, sSize, sDiff); - strcpy(clickMsg, openMsg1); + clickMsg = openMsg1; } else if (sameString("numtSMitochondrionChrPlacement", table)) { safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand " "from numtS where ( " "(name = '%s') OR (((name REGEXP '^%s') OR (name='%s')) AND " " (ABS((chromEnd - chromStart)-%d) <= %d ))) ", itemName, itemNameDash, itemNameTrimmed, sSize, sDiff); - strcpy(clickMsg, openMsg1); + clickMsg = openMsg1; } sr = sqlGetResult(conn, query); firstTime = TRUE; while ((row = sqlNextRow(sr)) != NULL) { printf("<PRE><TT>"); if (firstTime) { firstTime = FALSE; printf("<BR><H3>%s item '%s' %s</H3><BR>", clickMsg, itemName, openMsg2); printf("BROWSER | NAME CHROMOSOME START END SIZE SCORE STRAND \n"); printf("--------|--------------------------------------------------------------------------------------------\n"); @@ -23516,69 +23516,62 @@ void doNumtSHg19Mm9(struct trackDb *tdb, char *itemName) /* Put up page for NumtS. */ { char *table = tdb->table; struct sqlConnection *conn = hAllocConn(database); struct bed *bed; char query[512]; struct sqlResult *sr; char **row; boolean firstTime = TRUE; int start = cartInt(cart, "o"); int num = 6; /* message strings */ -char clickMsg[128]; +char *clickMsg = NULL; char *openMsg1 = "Click 'browser' link below to open Genome Browser at genomic position where"; char *openMsg2 = "maps\n"; char *openMsgM = "Click 'browser' link below to open Genome Browser at mitochondrial position where"; genericHeader(tdb, itemName); genericBedClick(conn, tdb, itemName, start, num); safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand from %s where name='%s'", table, itemName); sr = sqlGetResult(conn, query); int sSize=0; while ((row = sqlNextRow(sr)) != NULL) { bed = bedLoad6(row); sSize = bed->chromEnd - bed->chromStart; /* printf("sSize is: %5d <BR>", sSize); */ } -if (sameString("numtS", table)) +if (sameString("numtS", table) || sameString("numtSAssembled", table)) { safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand " "from numtSMitochondrion where name = '%s' ", itemName); - strcpy(clickMsg, openMsgM); - } -else if (sameString("numtSAssembled", table)) - { - safef(query, sizeof(query), - "select chrom, chromStart, chromEnd, name, score, strand " - "from numtSMitochondrionChrPlacement where name = '%s' ", itemName); - strcpy(clickMsg, openMsgM); + clickMsg = openMsgM; } else if (sameString("numtSMitochondrion", table)) { safef(query, sizeof(query), "select chrom, chromStart, chromEnd, name, score, strand " "from numtS where name = '%s'", itemName); - strcpy(clickMsg, openMsg1); + clickMsg = openMsg1; } sr = sqlGetResult(conn, query); firstTime = TRUE; while ((row = sqlNextRow(sr)) != NULL) { printf("<PRE><TT>"); if (firstTime) { firstTime = FALSE; printf("<BR><H3>%s item '%s' %s</H3><BR>", clickMsg, itemName, openMsg2); printf("BROWSER | NAME CHROMOSOME START END SIZE SCORE STRAND \n"); printf("--------|--------------------------------------------------------------------------------------------\n");