src/hg/qaPushQ/qaPushQ.c 1.121
1.121 2010/01/27 21:03:41 galt
moved new greek byte function to kent/src/lib/obscure.c
Index: src/hg/qaPushQ/qaPushQ.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/qaPushQ/qaPushQ.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -b -B -U 4 -r1.120 -r1.121
--- src/hg/qaPushQ/qaPushQ.c 27 Jan 2010 18:12:32 -0000 1.120
+++ src/hg/qaPushQ/qaPushQ.c 27 Jan 2010 21:03:41 -0000 1.121
@@ -2456,27 +2456,8 @@
freez(&temp);
}
-void mySprintWithGreekByte(char *s, int slength, long long size)
-/* Numbers formatted with PB, TB, GB, MB, KB, B */
-{
-char *greek[] = {"B", "KB", "MB", "GB", "TB", "PB"};
-int i = 0;
-long long d = 1;
-while ((size/d) >= 1024)
- {
- ++i;
- d *= 1024;
- }
-double result = ((double)size)/d;
-if (result < 10)
- safef(s,slength,"%3.1f %s",((double)size)/d, greek[i]);
-else
- safef(s,slength,"%3.0f %s",((double)size)/d, greek[i]);
-}
-
-
long long pq_getTableSize(char *rhost, char *db, char *tbl, int *errCount) /* added extension pq_ to supress name conflict in hdb.c */
/* Get table size via show table status command. Return -1 if err. Will match multiple if "%" used in tbl */
{
@@ -2972,34 +2953,34 @@
{
printf(" <br>\n");
mySprintWithCommas(nicenumber, sizeof(nicenumber), totalTable);
printf(" Total size of tables: %s ",nicenumber);
- mySprintWithGreekByte(nicenumber, sizeof(nicenumber), totalTable);
+ sprintWithGreekByte(nicenumber, sizeof(nicenumber), totalTable);
printf(" ( %s ) <br>\n",nicenumber);
}
if (totalGbdb > 0)
{
printf(" <br>\n");
mySprintWithCommas(nicenumber, sizeof(nicenumber), totalGbdb);
printf(" Total size of /gbdb/ files: %s ",nicenumber);
- mySprintWithGreekByte(nicenumber, sizeof(nicenumber), totalGbdb);
+ sprintWithGreekByte(nicenumber, sizeof(nicenumber), totalGbdb);
printf(" ( %s ) <br>\n",nicenumber);
}
if (totalGoldenPath > 0)
{
printf(" <br>\n");
mySprintWithCommas(nicenumber, sizeof(nicenumber), totalGoldenPath);
printf(" Total size of .../goldenPath/ files: %s ",nicenumber);
- mySprintWithGreekByte(nicenumber, sizeof(nicenumber), totalGoldenPath);
+ sprintWithGreekByte(nicenumber, sizeof(nicenumber), totalGoldenPath);
printf(" ( %s ) <br>\n",nicenumber);
}
printf(" <br>\n");
mySprintWithCommas(nicenumber, sizeof(nicenumber), totalsize);
printf(" Total size of all: %s ",nicenumber);
-mySprintWithGreekByte(nicenumber, sizeof(nicenumber), totalsize);
+sprintWithGreekByte(nicenumber, sizeof(nicenumber), totalsize);
printf(" ( %s ) <br>\n",nicenumber);
printf(" <br>\n");