Don't call subdissectors / expert...() / col...() under 'if (tree)'

Also:
 Remove some uneeded initializers;
 Do some whitespace cleanup and re-formatting.

svn path=/trunk/; revision=43681

1 files changed, 6 insertions, 8 deletions

diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 807cf2444f..c623926c83 100644
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -882,15 +882,13 @@ dissect_memcache_message (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
   if (tvb_reported_length_remaining (tvb, offset) != 0) {
     /* Dissect a request or a response. */
     if (is_request_or_reply && reqresp_dissector) {
-      if (tree) {
-        next_offset = reqresp_dissector (tvb, pinfo, memcache_tree,
-                                         offset, line, lineend, opcode);
-        if (next_offset == -1) {
-          /* Error in dissecting. */
-          return -1;
-        }
-        offset = next_offset;
+      next_offset = reqresp_dissector (tvb, pinfo, memcache_tree,
+                                       offset, line, lineend, opcode);
+      if (next_offset == -1) {
+        /* Error in dissecting. */
+        return -1;
       }
+      offset = next_offset;
     }
   }