diff options
author | Anders Broman <anders.broman@ericsson.com> | 2011-09-16 14:25:50 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2011-09-16 14:25:50 +0000 |
commit | bd87f77148f310ccc768513fec7af71b6353823a (patch) | |
tree | 87f25d774ae89e25ba44b8832cbe28615b15a1b0 | |
parent | 54dc8d1f54aff508aefab03f39688f2ee57f4707 (diff) |
set_abs_time and friends always return 1.
svn path=/trunk/; revision=39027
-rw-r--r-- | epan/column-utils.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index ae3bfb747c..02dbe13437 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -620,7 +620,7 @@ col_has_time_fmt(column_info *cinfo, const gint col) (cinfo->fmt_matx[col][COL_DELTA_TIME_DIS])); } -static gint +static void set_abs_date_time(const frame_data *fd, gchar *buf, gboolean local) { struct tm *tmp; @@ -704,26 +704,25 @@ set_abs_date_time(const frame_data *fd, gchar *buf, gboolean local) } else { buf[0] = '\0'; } - return 1; } static void col_set_abs_date_time(const frame_data *fd, column_info *cinfo, const int col) { - if (set_abs_date_time(fd, cinfo->col_buf[col], TRUE)) { - cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->col_buf[col],COL_MAX_LEN); - } + set_abs_date_time(fd, cinfo->col_buf[col], TRUE); + cinfo->col_expr.col_expr[col] = "frame.time"; + g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->col_buf[col],COL_MAX_LEN); + cinfo->col_data[col] = cinfo->col_buf[col]; } static void col_set_utc_date_time(const frame_data *fd, column_info *cinfo, const int col) { - if (set_abs_date_time(fd, cinfo->col_buf[col], FALSE)) { - cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->col_buf[col],COL_MAX_LEN); - } + set_abs_date_time(fd, cinfo->col_buf[col], FALSE); + cinfo->col_expr.col_expr[col] = "frame.time"; + g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->col_buf[col],COL_MAX_LEN); + cinfo->col_data[col] = cinfo->col_buf[col]; } @@ -988,7 +987,7 @@ col_set_delta_time_dis(const frame_data *fd, column_info *cinfo, const int col) cinfo->col_data[col] = cinfo->col_buf[col]; } -static gint +static void set_abs_time(const frame_data *fd, gchar *buf, gboolean local) { struct tm *tmp; @@ -1055,26 +1054,25 @@ set_abs_time(const frame_data *fd, gchar *buf, gboolean local) } else { *buf = '\0'; } - return 1; } static void col_set_abs_time(const frame_data *fd, column_info *cinfo, const int col) { - if (set_abs_time(fd, cinfo->col_buf[col], TRUE)) { - cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->col_buf[col],COL_MAX_LEN); - } + set_abs_time(fd, cinfo->col_buf[col], TRUE); + cinfo->col_expr.col_expr[col] = "frame.time"; + g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->col_buf[col],COL_MAX_LEN); + cinfo->col_data[col] = cinfo->col_buf[col]; } static void col_set_utc_time(const frame_data *fd, column_info *cinfo, const int col) { - if (set_abs_time(fd, cinfo->col_buf[col], FALSE)) { - cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->col_buf[col],COL_MAX_LEN); - } + set_abs_time(fd, cinfo->col_buf[col], FALSE); + cinfo->col_expr.col_expr[col] = "frame.time"; + g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->col_buf[col],COL_MAX_LEN); + cinfo->col_data[col] = cinfo->col_buf[col]; } |