diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
| commit | 6110a96f689d51c92c5b00b4dfda3a9cd6916a25 (patch) | |
| tree | ef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-mysql.c | |
| parent | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (diff) | |
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
Diffstat (limited to 'epan/dissectors/packet-mysql.c')
| -rw-r--r-- | epan/dissectors/packet-mysql.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index f8a3e53e0a..7dbfa0182e 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -1195,9 +1195,7 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } offset+= 3; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MySQL"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MySQL"); if (pinfo->destport == pinfo->match_port) { is_response= FALSE; @@ -1232,29 +1230,21 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (is_response) { if (packet_number == 0) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Server Greeting" ); - } + col_set_str(pinfo->cinfo, COL_INFO, "Server Greeting"); offset= mysql_dissect_greeting(tvb, pinfo, offset, mysql_tree, conn_data); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Response" ); - } + col_set_str(pinfo->cinfo, COL_INFO, "Response"); offset= mysql_dissect_response(tvb, pinfo, offset, mysql_tree, conn_data); } } else { if (packet_number == 1) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Login Request"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Login Request"); offset= mysql_dissect_login(tvb, pinfo, offset, mysql_tree, conn_data); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Request"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Request"); offset= mysql_dissect_request(tvb, pinfo, offset, mysql_tree, conn_data); } |