Changeset: 47be0d022fa1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47be0d022fa1
Modified Files:
clients/mapiclient/tomograph.c
Branch: default
Log Message:
Merge from Feb2013 branch.
diffs (24 lines):
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1041,7 +1041,7 @@ static void fprintf_tm ( FILE *f, lng ti
}
if (TME & TME_MS && (tail || time >= US_MS)) {
fmt = tail ? "%0*d%s" : "%*d%s";
- fprintf(f, fmt, digits, (int) (time / US_MS), (TME & TME_US) ?
"." : "s");
+ fprintf(f, fmt, digits, (int) (time / US_MS), (TME & TME_US) ?
"." : tail ? "s" : "ms");
if (time / US_MS > 99)
digits = 1;
else if (time / US_MS > 9)
@@ -1441,9 +1441,9 @@ static void createTomogram(void)
} else {
if (w >= US_DD) {
TME = TME_DD|TME_HH;
- } else if (w >= 10 * US_HH) {
+ } else if (w >= US_HH) {
TME = TME_HH|TME_MM;
- } else if (w >= 10 * US_MM) {
+ } else if (w >= US_MM) {
TME = TME_MM|TME_SS;
} else if (w >= US_SS) {
TME = TME_SS|TME_MS;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
