summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-04-25 13:03:45 -0700
committerGuy Harris <guy@alum.mit.edu>2014-04-25 20:04:11 +0000
commitae666f6001a45341838926486d552932493fb573 (patch)
treee5021f1fb630265206e0d89acb29e8d5bd8c9b2b
parentf5165ba0f0b160031fbdb47c084ffcb6d0fbdddd (diff)
downloadwireshark-ae666f6001a45341838926486d552932493fb573.tar.gz
Clean up code formatting a bit.
Change-Id: I8f82630f59304149293680f742d490767b88179e Reviewed-on: https://code.wireshark.org/review/1358 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--epan/dissectors/packet-http.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index e8958763b8..a418280964 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -951,17 +951,16 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
break;
is_http:
- if (first_loop) {
+ if (first_loop) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, proto_tag);
- if (is_request_or_reply) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", format_text(firstline, first_linelen));
- }
- else
- col_set_str(pinfo->cinfo, COL_INFO, "Continuation");
+ if (is_request_or_reply)
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", format_text(firstline, first_linelen));
+ else
+ col_set_str(pinfo->cinfo, COL_INFO, "Continuation");
first_loop = FALSE;
- }
+ }
if ((tree) && (http_tree == NULL)) {
ti = proto_tree_add_item(tree, proto_http, tvb, orig_offset, -1, ENC_NA);
@@ -998,13 +997,14 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
}
expert_add_info_format(pinfo, hdr_item, &ei_http_chat, "%s", text);
if (reqresp_dissector) {
- if (tree) req_tree = proto_item_add_subtree(hdr_item, ett_http_request);
- else req_tree = NULL;
+ if (tree)
+ req_tree = proto_item_add_subtree(hdr_item, ett_http_request);
+ else
+ req_tree = NULL;
reqresp_dissector(tvb, req_tree, offset, line,
lineend, conv_data);
}
-
} else {
/*
* Header.