aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wslua/wslua_pinfo.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2010-01-13 20:32:01 +0000
committerAnders Broman <anders.broman@ericsson.com>2010-01-13 20:32:01 +0000
commit440c3f9261af41a397823a80121cfa0122df1c88 (patch)
tree64b368c46b53e0e8f52e80f61ed17e13d64596a5 /epan/wslua/wslua_pinfo.c
parent6343ffb68e3e7ea3b335ad5e443e23f324a99d35 (diff)
From Didier Gautheron:
check_col.diff Remove redundant calls to check_col() if it guards only one columns function with one parameter after the column type. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394 svn path=/trunk/; revision=31519
Diffstat (limited to 'epan/wslua/wslua_pinfo.c')
-rw-r--r--epan/wslua/wslua_pinfo.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c
index faaa670b0d..d5a5d6389f 100644
--- a/epan/wslua/wslua_pinfo.c
+++ b/epan/wslua/wslua_pinfo.c
@@ -393,8 +393,7 @@ WSLUA_METHOD Column_clear(lua_State *L) {
if (!(c && c->cinfo)) return 0;
- if (check_col(c->cinfo, c->col))
- col_clear(c->cinfo, c->col);
+ col_clear(c->cinfo, c->col);
return 0;
}
@@ -410,8 +409,7 @@ WSLUA_METHOD Column_set(lua_State *L) {
if (!s) WSLUA_ARG_ERROR(Column_set,TEXT,"must be a string");
- if (check_col(c->cinfo, c->col))
- col_set_str(c->cinfo, c->col, s);
+ col_set_str(c->cinfo, c->col, s);
return 0;
}
@@ -427,8 +425,7 @@ WSLUA_METHOD Column_append(lua_State *L) {
if (!s) WSLUA_ARG_ERROR(Column_append,TEXT,"must be a string");
- if (check_col(c->cinfo, c->col))
- col_append_str(c->cinfo, c->col, s);
+ col_append_str(c->cinfo, c->col, s);
return 0;
}
@@ -505,8 +502,7 @@ WSLUA_METAMETHOD Columns__newindex(lua_State *L) {
for(cn = colnames; cn->name; cn++) {
if( g_str_equal(cn->name,colname) ) {
- if (check_col(cols->cinfo, cn->id))
- col_set_str(cols->cinfo, cn->id, text);
+ col_set_str(cols->cinfo, cn->id, text);
return 0;
}
}