Print the time units in the CSV output for io_stat using correct extension, i.e....
authorsahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 23 Mar 2011 05:11:06 +0000 (05:11 +0000)
committersahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 23 Mar 2011 05:11:06 +0000 (05:11 +0000)
coverity 419

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36275 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/io_stat.c

index 9147adc8617aa1a99f711d04b6a0dc5f9f1f752d..ab45cb00a0d22f3db9e45942dbc948bf77f37344 100644 (file)
@@ -672,16 +672,18 @@ print_interval_string(char *buf, int buf_len, guint32 interval, io_stat_t *io,
                        g_snprintf(buf, buf_len, "%02d:%02d:%02d.%03d", tmp->tm_hour, tmp->tm_min, tmp->tm_sec, nsec_val);
                }
        } else {
-               if(io->interval>=60000 && ext){
-                       g_snprintf(buf, buf_len, "%d%s", interval/60000, ext?"m":"");
+               if (!ext) {
+                       g_snprintf(buf, buf_len, "%d.%03d", interval/1000,interval%1000);
+               } else if(io->interval>=60000){
+                       g_snprintf(buf, buf_len, "%dm", interval/60000);
                } else if(io->interval>=1000){
-                       g_snprintf(buf, buf_len, "%d%s", interval/1000, ext?"s":"");
+                       g_snprintf(buf, buf_len, "%ds", interval/1000);
                } else if(io->interval>=100){
-                       g_snprintf(buf, buf_len, "%d.%1d%s", interval/1000,(interval/100)%10, ext?"s":"");
+                       g_snprintf(buf, buf_len, "%d.%1ds", interval/1000,(interval/100)%10);
                } else if(io->interval>=10){
-                       g_snprintf(buf, buf_len, "%d.%02d%s", interval/1000,(interval/10)%100, ext?"s":"");
+                       g_snprintf(buf, buf_len, "%d.%02ds", interval/1000,(interval/10)%100);
                } else {
-                       g_snprintf(buf, buf_len, "%d.%03d%s", interval/1000,interval%1000, ext?"s":"");
+                       g_snprintf(buf, buf_len, "%d.%03ds", interval/1000,interval%1000);
                }
        }
 }