diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-12-30 02:24:11 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-12-30 02:24:11 +0000 |
| commit | 8724d5de0f9905cf2cfa20a0bff1cc6625c78587 (patch) | |
| tree | 17200c8d993ea21f798408cdc854f467e2b74dda /ui/cli | |
| parent | f7208c856293b0152aaa5b395919bb7f76457bb2 (diff) | |
Use G_GUINT64_CONSTANT(nn) instead of nnULL in a few places.
svn path=/trunk/; revision=54494
Diffstat (limited to 'ui/cli')
| -rw-r--r-- | ui/cli/tap-iostat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index 224351aaea..28bb2773c3 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -557,7 +557,7 @@ iostat_draw(void *arg) gboolean last_row=FALSE; io_stat_t *iot; column_width *col_w; - struct tm * tm_time; + struct tm *tm_time; time_t the_time; mit = (io_stat_item_t *)arg; @@ -713,7 +713,7 @@ iostat_draw(void *arg) if (type==CALC_TYPE_LOAD) { iot->max_vals[j] /= interval; } else if (type != CALC_TYPE_AVG) { - iot->max_vals[j] = (iot->max_vals[j] + 500000000ULL) / NANOSECS_PER_SEC; + iot->max_vals[j] = (iot->max_vals[j] + G_GUINT64_CONSTANT(500000000)) / NANOSECS_PER_SEC; } val_mag = magnitude(iot->max_vals[j], 15); g_snprintf(val_mag_s, 3, "%u", val_mag); @@ -1059,10 +1059,10 @@ iostat_draw(void *arg) full_fmt = g_strconcat( dur_mag==1 ? "| " : "| ", invl_fmt, " <> ", "%-", dur_mag_s, "s|", NULL); - printf(full_fmt, (guint32)(t/1000000ULL), "Dur"); + printf(full_fmt, (guint32)(t/G_GUINT64_CONSTANT(1000000)), "Dur"); } else { - printf(full_fmt, (guint32)(t/1000000ULL), - (guint32)(invl_end/G_GUINT64_CONSTANT(1000000))); + printf(full_fmt, (guint32)(t/G_GUINT64_CONSTANT(1000000)), + (guint32)(invl_end/G_GUINT64_CONSTANT(1000000))); } } else { printf(full_fmt, (guint32)(t/G_GUINT64_CONSTANT(1000000)), |