diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2011-03-23 05:11:06 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2011-03-23 05:11:06 +0000 |
| commit | c317244ff8f16f8aaddcd7e1d11afd61a3e8a18f (patch) | |
| tree | 6d39283bc2f81b7372dded67ab79f1061a37728c /gtk | |
| parent | 89d3156883557f8e56ea72c99498067bdfba760e (diff) | |
| download | wireshark-c317244ff8f16f8aaddcd7e1d11afd61a3e8a18f.tar.gz | |
Print the time units in the CSV output for io_stat using correct extension, i.e. always in seconds.
coverity 419
svn path=/trunk/; revision=36275
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/io_stat.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk/io_stat.c b/gtk/io_stat.c index 9147adc861..ab45cb00a0 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -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); } } } |