Reformat hfi entries; Add editor modelines; Adjust whitespace.

Change-Id: Iead53f92cc847d04c32f4a307d45f9748c49a69c
Reviewed-on: https://code.wireshark.org/review/4483
Reviewed-by: Bill Meier <wmeier@newsguy.com>

2 files changed, 349 insertions, 323 deletions

diff --git a/epan/dissectors/file-gif.c b/epan/dissectors/file-gif.c
index 6087e4940e..613405c4b8 100644
--- a/epan/dissectors/file-gif.c
+++ b/epan/dissectors/file-gif.c
@@ -92,211 +92,211 @@ static header_field_info *hfi_gif = NULL;
 
 /* header fields */
 /* GIF signature */
-static header_field_info hfi_version GIF_HFI_INIT =
-    {   "Version",
-	IMG_GIF ".version",
-	FT_STRING, BASE_NONE, NULL, 0x00,
-	"GIF Version",
-	HFILL
-    };
+static header_field_info hfi_version GIF_HFI_INIT = {
+    "Version",
+    IMG_GIF ".version",
+    FT_STRING, BASE_NONE, NULL, 0x00,
+    "GIF Version",
+    HFILL
+};
 
 /* Screen descriptor */
-static header_field_info hfi_screen_width GIF_HFI_INIT =
-    {   "Screen width",
-	IMG_GIF ".screen.width",
-	FT_UINT16, BASE_DEC, NULL, 0x00,
-	NULL,
-	HFILL
-    };
+static header_field_info hfi_screen_width GIF_HFI_INIT = {
+    "Screen width",
+    IMG_GIF ".screen.width",
+    FT_UINT16, BASE_DEC, NULL, 0x00,
+    NULL,
+    HFILL
+};
 
-static header_field_info hfi_screen_height GIF_HFI_INIT =
-    {   "Screen height",
-	IMG_GIF ".screen.height",
-	FT_UINT16, BASE_DEC, NULL, 0x00,
-	NULL,
-	HFILL
-    };
+static header_field_info hfi_screen_height GIF_HFI_INIT = {
+    "Screen height",
+    IMG_GIF ".screen.height",
+    FT_UINT16, BASE_DEC, NULL, 0x00,
+    NULL,
+    HFILL
+};
 
-static header_field_info hfi_global_color_map_present GIF_HFI_INIT =
-    {   "Global color map is present",
-	IMG_GIF ".global.color_map.present",
-	FT_UINT8, BASE_DEC, VALS(vals_true_false), 0x80,
-	"Indicates if the global color map is present",
-	HFILL
-    };
+static header_field_info hfi_global_color_map_present GIF_HFI_INIT = {
+    "Global color map is present",
+    IMG_GIF ".global.color_map.present",
+    FT_UINT8, BASE_DEC, VALS(vals_true_false), 0x80,
+    "Indicates if the global color map is present",
+    HFILL
+};
 
-static header_field_info hfi_global_color_resolution GIF_HFI_INIT =
-    {   "Bits per color minus 1",
-	IMG_GIF ".global.color_bpp",
-	FT_UINT8, BASE_DEC, NULL, 0x70,
-	"The number of bits per color is one plus the field value.",
-	HFILL
-    };
+static header_field_info hfi_global_color_resolution GIF_HFI_INIT = {
+    "Bits per color minus 1",
+    IMG_GIF ".global.color_bpp",
+    FT_UINT8, BASE_DEC, NULL, 0x70,
+    "The number of bits per color is one plus the field value.",
+    HFILL
+};
 
-static header_field_info hfi_global_color_map_ordered/* GIF89a */ GIF_HFI_INIT =
-    {   "Global color map is ordered",
-	IMG_GIF ".global.color_map.ordered",
-	FT_UINT8, BASE_DEC, VALS(vals_true_false), 0x08,
-	"Indicates whether the global color map is ordered.",
-	HFILL
-    };
+static header_field_info hfi_global_color_map_ordered/* GIF89a */ GIF_HFI_INIT = {
+    "Global color map is ordered",
+    IMG_GIF ".global.color_map.ordered",
+    FT_UINT8, BASE_DEC, VALS(vals_true_false), 0x08,
+    "Indicates whether the global color map is ordered.",
+    HFILL
+};
 
-static header_field_info hfi_global_image_bpp GIF_HFI_INIT =
-    {   "Image bits per pixel minus 1",
-	IMG_GIF ".global.bpp",
-	FT_UINT8, BASE_DEC, NULL, 0x07,
-	"The number of bits per pixel is one plus the field value.",
-	HFILL
-    };
+static header_field_info hfi_global_image_bpp GIF_HFI_INIT = {
+    "Image bits per pixel minus 1",
+    IMG_GIF ".global.bpp",
+    FT_UINT8, BASE_DEC, NULL, 0x07,
+    "The number of bits per pixel is one plus the field value.",
+    HFILL
+};
 
 /* Only makes sense if the global color map is present: */
-static header_field_info hfi_background_color GIF_HFI_INIT =
-    {   "Background color index",
-	IMG_GIF ".image_background_index",
-	FT_UINT8, BASE_DEC, NULL, 0x00,
-	"Index of the background color in the color map.",
-	HFILL
-    };
+static header_field_info hfi_background_color GIF_HFI_INIT = {
+    "Background color index",
+    IMG_GIF ".image_background_index",
+    FT_UINT8, BASE_DEC, NULL, 0x00,
+    "Index of the background color in the color map.",
+    HFILL
+};
 
-static header_field_info hfi_pixel_aspect_ratio/* GIF89a */ GIF_HFI_INIT =
-    {   "Global pixel aspect ratio",
-	IMG_GIF ".global.pixel_aspect_ratio",
-	FT_UINT8, BASE_DEC, NULL, 0x00,
-	"Gives an approximate value of the aspect ratio of the pixels.",
-	HFILL
-    };
+static header_field_info hfi_pixel_aspect_ratio/* GIF89a */ GIF_HFI_INIT = {
+    "Global pixel aspect ratio",
+    IMG_GIF ".global.pixel_aspect_ratio",
+    FT_UINT8, BASE_DEC, NULL, 0x00,
+    "Gives an approximate value of the aspect ratio of the pixels.",
+    HFILL
+};
 
-static header_field_info hfi_global_color_map GIF_HFI_INIT =
-    {   "Global color map",
-	IMG_GIF ".global.color_map",
-	FT_BYTES, BASE_NONE, NULL, 0x00,
-	"Global color map.",
-	HFILL
-    };
+static header_field_info hfi_global_color_map GIF_HFI_INIT = {
+    "Global color map",
+    IMG_GIF ".global.color_map",
+    FT_BYTES, BASE_NONE, NULL, 0x00,
+    "Global color map.",
+    HFILL
+};
 
 
 /* Image descriptor */
-static header_field_info hfi_image_left GIF_HFI_INIT =
-    {   "Image left position",
-	IMG_GIF ".image.left",
-	FT_UINT16, BASE_DEC, NULL, 0x00,
-	"Offset between left of Screen and left of Image.",
-	HFILL
-    };
+static header_field_info hfi_image_left GIF_HFI_INIT = {
+    "Image left position",
+    IMG_GIF ".image.left",
+    FT_UINT16, BASE_DEC, NULL, 0x00,
+    "Offset between left of Screen and left of Image.",
+    HFILL
+};
 
-static header_field_info hfi_image_top GIF_HFI_INIT =
-    {   "Image top position",
-	IMG_GIF ".image.top",
-	FT_UINT16, BASE_DEC, NULL, 0x00,
-	"Offset between top of Screen and top of Image.",
-	HFILL
-    };
+static header_field_info hfi_image_top GIF_HFI_INIT = {
+    "Image top position",
+    IMG_GIF ".image.top",
+    FT_UINT16, BASE_DEC, NULL, 0x00,
+    "Offset between top of Screen and top of Image.",
+    HFILL
+};
 
-static header_field_info hfi_image_width GIF_HFI_INIT =
-    {   "Image width",
-	IMG_GIF ".image.width",
-	FT_UINT16, BASE_DEC, NULL, 0x00,
-	"Image width.",
-	HFILL
-    };
+static header_field_info hfi_image_width GIF_HFI_INIT = {
+    "Image width",
+    IMG_GIF ".image.width",
+    FT_UINT16, BASE_DEC, NULL, 0x00,
+    "Image width.",
+    HFILL
+};
 
-static header_field_info hfi_image_height GIF_HFI_INIT =
-    {   "Image height",
-	IMG_GIF ".image.height",
-	FT_UINT16, BASE_DEC, NULL, 0x00,
-	"Image height.",
-	HFILL
-    };
+static header_field_info hfi_image_height GIF_HFI_INIT = {
+    "Image height",
+    IMG_GIF ".image.height",
+    FT_UINT16, BASE_DEC, NULL, 0x00,
+    "Image height.",
+    HFILL
+};
 
-static header_field_info hfi_local_color_map_present GIF_HFI_INIT =
-    {   "Local color map is present",
-	IMG_GIF ".local.color_map.present",
-	FT_UINT8, BASE_DEC, VALS(vals_true_false), 0x80,
-	"Indicates if the local color map is present",
-	HFILL
-    };
+static header_field_info hfi_local_color_map_present GIF_HFI_INIT = {
+    "Local color map is present",
+    IMG_GIF ".local.color_map.present",
+    FT_UINT8, BASE_DEC, VALS(vals_true_false), 0x80,
+    "Indicates if the local color map is present",
+    HFILL
+};
 
-static header_field_info hfi_local_color_resolution GIF_HFI_INIT =
-    {   "Bits per color minus 1",
-	IMG_GIF ".local.color_bpp",
-	FT_UINT8, BASE_DEC, NULL, 0x70,
-	"The number of bits per color is one plus the field value.",
-	HFILL
-    };
+static header_field_info hfi_local_color_resolution GIF_HFI_INIT = {
+    "Bits per color minus 1",
+    IMG_GIF ".local.color_bpp",
+    FT_UINT8, BASE_DEC, NULL, 0x70,
+    "The number of bits per color is one plus the field value.",
+    HFILL
+};
 
-static header_field_info hfi_local_color_map_ordered/* GIF89a */ GIF_HFI_INIT =
-    {   "Local color map is ordered",
-	IMG_GIF ".local.color_map.ordered",
-	FT_UINT8, BASE_DEC, VALS(vals_true_false), 0x08,
-	"Indicates whether the local color map is ordered.",
-	HFILL
-    };
+static header_field_info hfi_local_color_map_ordered/* GIF89a */ GIF_HFI_INIT = {
+    "Local color map is ordered",
+    IMG_GIF ".local.color_map.ordered",
+    FT_UINT8, BASE_DEC, VALS(vals_true_false), 0x08,
+    "Indicates whether the local color map is ordered.",
+    HFILL
+};
 
 #if 0
-static header_field_info hfi_local_image_bpp GIF_HFI_INIT =
-    {   "Image bits per pixel minus 1",
-	IMG_GIF ".local.bpp",
-	FT_UINT8, BASE_DEC, NULL, 0x07,
-	"The number of bits per pixel is one plus the field value.",
-	HFILL
-    };
+static header_field_info hfi_local_image_bpp GIF_HFI_INIT = {
+    "Image bits per pixel minus 1",
+    IMG_GIF ".local.bpp",
+    FT_UINT8, BASE_DEC, NULL, 0x07,
+    "The number of bits per pixel is one plus the field value.",
+    HFILL
+};
 #endif
 
-static header_field_info hfi_local_color_map GIF_HFI_INIT =
-    {   "Local color map",
-	IMG_GIF ".local.color_map",
-	FT_BYTES, BASE_NONE, NULL, 0x00,
-	"Local color map.",
-	HFILL
-    };
+static header_field_info hfi_local_color_map GIF_HFI_INIT = {
+    "Local color map",
+    IMG_GIF ".local.color_map",
+    FT_BYTES, BASE_NONE, NULL, 0x00,
+    "Local color map.",
+    HFILL
+};
 
 /* Extension */
-static header_field_info hfi_extension GIF_HFI_INIT =
-    {   "Extension",
-	IMG_GIF ".extension",
-	FT_NONE, BASE_NONE, NULL, 0x00,
-	"Extension.",
-	HFILL
-    };
+static header_field_info hfi_extension GIF_HFI_INIT = {
+    "Extension",
+    IMG_GIF ".extension",
+    FT_NONE, BASE_NONE, NULL, 0x00,
+    "Extension.",
+    HFILL
+};
 
-static header_field_info hfi_extension_label GIF_HFI_INIT =
-    {   "Extension label",
-	IMG_GIF ".extension.label",
-	FT_UINT8, BASE_HEX, VALS(vals_extensions), 0x00,
-	"Extension label.",
-	HFILL
-    };
+static header_field_info hfi_extension_label GIF_HFI_INIT = {
+    "Extension label",
+    IMG_GIF ".extension.label",
+    FT_UINT8, BASE_HEX, VALS(vals_extensions), 0x00,
+    "Extension label.",
+    HFILL
+};
 
-static header_field_info hfi_image GIF_HFI_INIT =
-    {   "Image",
-	IMG_GIF ".image",
-	FT_NONE, BASE_NONE, NULL, 0x00,
-	"Image.",
-	HFILL
-    };
+static header_field_info hfi_image GIF_HFI_INIT = {
+    "Image",
+    IMG_GIF ".image",
+    FT_NONE, BASE_NONE, NULL, 0x00,
+    "Image.",
+    HFILL
+};
 
-static header_field_info hfi_image_code_size GIF_HFI_INIT =
-    {   "LZW minimum code size",
-	IMG_GIF ".image.code_size",
-	FT_UINT8, BASE_DEC, NULL, 0x00,
-	"Minimum code size for the LZW compression.",
-	HFILL
-    };
+static header_field_info hfi_image_code_size GIF_HFI_INIT = {
+    "LZW minimum code size",
+    IMG_GIF ".image.code_size",
+    FT_UINT8, BASE_DEC, NULL, 0x00,
+    "Minimum code size for the LZW compression.",
+    HFILL
+};
 
 /* Trailer (end of GIF data stream) */
-static header_field_info hfi_trailer GIF_HFI_INIT =
-    {   "Trailer (End of the GIF stream)",
-	IMG_GIF ".end",
-	FT_NONE, BASE_NONE, NULL, 0x00,
-	"This byte tells the decoder that the data stream is finished.",
-	HFILL
-    };
+static header_field_info hfi_trailer GIF_HFI_INIT = {
+    "Trailer (End of the GIF stream)",
+    IMG_GIF ".end",
+    FT_NONE, BASE_NONE, NULL, 0x00,
+    "This byte tells the decoder that the data stream is finished.",
+    HFILL
+};
 
-static header_field_info hfi_data_block GIF_HFI_INIT =
-    {   "Data block",
-	IMG_GIF ".data_block",
-	FT_BYTES, BASE_NONE, NULL, 0x00,
-	NULL, HFILL };
+static header_field_info hfi_data_block GIF_HFI_INIT = {
+    "Data block",
+    IMG_GIF ".data_block",
+    FT_BYTES, BASE_NONE, NULL, 0x00,
+    NULL, HFILL };
 
 
 /* Initialize the subtree pointers */
@@ -708,3 +708,16 @@ proto_reg_handoff_gif(void)
     heur_dissector_add("http", dissect_gif_heur, hfi_gif->id);
     heur_dissector_add("wtap_file", dissect_gif_heur, hfi_gif->id);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c
index 8442f272de..805119b402 100644
--- a/epan/dissectors/packet-acap.c
+++ b/epan/dissectors/packet-acap.c
@@ -42,179 +42,192 @@ static header_field_info *hfi_acap = NULL;
 
 #define HFI_ACAP HFI_INIT(proto_acap)
 
-static header_field_info hfi_acap_response HFI_ACAP =
-		  { "Response",           "acap.response",
-		    FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		    "TRUE if ACAP response", HFILL };
-
-static header_field_info hfi_acap_request HFI_ACAP =
-		  { "Request",            "acap.request",
-		    FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		    "TRUE if ACAP request", HFILL };
-
-static header_field_info hfi_acap_request_tag HFI_ACAP =
-		  { "Request Tag",            "acap.request_tag",
-		    FT_STRING, BASE_NONE, NULL, 0x0,
-		    NULL, HFILL };
-
-static header_field_info hfi_acap_response_tag HFI_ACAP =
-		  { "Response Tag",            "acap.response_tag",
-		    FT_STRING, BASE_NONE, NULL, 0x0,
-		    NULL, HFILL };
-
-static header_field_info hfi_acap_request_data HFI_ACAP =
-		  { "Request",            "acap.request_data",
-		    FT_STRING, BASE_NONE, NULL, 0x0,
-		    NULL, HFILL };
-
-static header_field_info hfi_acap_response_data HFI_ACAP =
-		  { "Response",            "acap.response_data",
-		    FT_STRING, BASE_NONE, NULL, 0x0,
-		    NULL, HFILL };
+static header_field_info hfi_acap_response HFI_ACAP = {
+    "Response",           "acap.response",
+    FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+    "TRUE if ACAP response", HFILL };
+
+static header_field_info hfi_acap_request HFI_ACAP = {
+    "Request",            "acap.request",
+    FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+    "TRUE if ACAP request", HFILL };
+
+static header_field_info hfi_acap_request_tag HFI_ACAP = {
+    "Request Tag",            "acap.request_tag",
+    FT_STRING, BASE_NONE, NULL, 0x0,
+    NULL, HFILL };
+
+static header_field_info hfi_acap_response_tag HFI_ACAP = {
+    "Response Tag",            "acap.response_tag",
+    FT_STRING, BASE_NONE, NULL, 0x0,
+    NULL, HFILL };
+
+static header_field_info hfi_acap_request_data HFI_ACAP = {
+    "Request",            "acap.request_data",
+    FT_STRING, BASE_NONE, NULL, 0x0,
+    NULL, HFILL };
+
+static header_field_info hfi_acap_response_data HFI_ACAP = {
+    "Response",            "acap.response_data",
+    FT_STRING, BASE_NONE, NULL, 0x0,
+    NULL, HFILL };
 
 static gint ett_acap = -1;
 static gint ett_acap_reqresp = -1;
 
-#define TCP_PORT_ACAP			674
+#define TCP_PORT_ACAP           674
 
 static void
 dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	gboolean        is_request;
-	proto_tree      *acap_tree, *reqresp_tree;
-	proto_item      *ti, *hidden_item;
-	gint			offset = 0;
-	const guchar	*line;
-	gint			next_offset;
-	int				linelen;
-	int				tokenlen;
-	const guchar	*next_token;
-
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACAP");
-
-	/*
-	 * Find the end of the first line.
-	 *
-	 * Note that "tvb_find_line_end()" will return a value that is
-	 * not longer than what's in the buffer, so the "tvb_get_ptr()"
-	 * call won't throw an exception.
-	 */
-	linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
-	line = tvb_get_ptr(tvb, offset, linelen);
-
-	if (pinfo->match_uint == pinfo->destport)
-		is_request = TRUE;
-	else
-		is_request = FALSE;
-
-	/*
-	 * Put the first line from the buffer into the summary
-	 * (but leave out the line terminator).
-	 */
-	col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s",
-	    is_request ? "Request" : "Response",
-	    format_text(line, linelen));
-
-	if (tree) {
-		ti = proto_tree_add_item(tree, hfi_acap, tvb, offset, -1,
-		    ENC_NA);
-		acap_tree = proto_item_add_subtree(ti, ett_acap);
-
-		if (is_request) {
-			hidden_item = proto_tree_add_boolean(acap_tree,
-			    &hfi_acap_request, tvb, 0, 0, TRUE);
-			PROTO_ITEM_SET_HIDDEN(hidden_item);
-		} else {
-			hidden_item = proto_tree_add_boolean(acap_tree,
-			    &hfi_acap_response, tvb, 0, 0, TRUE);
-			PROTO_ITEM_SET_HIDDEN(hidden_item);
-		}
-
-		/*
-		 * Put the line into the protocol tree.
-		 */
-		ti = proto_tree_add_format_text(acap_tree, tvb, offset, next_offset - offset);
-		reqresp_tree = proto_item_add_subtree(ti, ett_acap_reqresp);
-
-		/*
-		 * Show the first line as tags + requests or replies.
-		 */
-
-		/*
-		 * Extract the first token, and, if there is a first
-		 * token, add it as the request or reply tag.
-		 */
-		tokenlen = get_token_len(line, line + linelen, &next_token);
-		if (tokenlen != 0) {
-			if (is_request) {
-				proto_tree_add_string(reqresp_tree, &hfi_acap_request_tag, tvb, offset,
-					tokenlen, format_text(line, tokenlen));
-			} else {
-				proto_tree_add_string(reqresp_tree, &hfi_acap_response_tag, tvb, offset,
-					tokenlen, format_text(line, tokenlen));
-			}
-			offset += (int)(next_token - line);
-			linelen -= (int)(next_token - line);
-			line = next_token;
-		}
-
-		/*
-		 * Add the rest of the line as request or reply data.
-		 */
-		if (linelen != 0) {
-			if (is_request) {
-				proto_tree_add_string(reqresp_tree, &hfi_acap_request_data, tvb, offset,
-					linelen, format_text(line, linelen));
-			} else {
-				proto_tree_add_string(reqresp_tree, &hfi_acap_response_data, tvb, offset,
-					linelen, format_text(line, linelen));
-			}
-		}
-
-		/*
-		 * XXX - show the rest of the frame; this requires that
-		 * we handle literals, quoted strings, continuation
-		 * responses, etc..
-		 *
-		 * This involves a state machine, and attaching
-		 * state information to the packets.
-		 */
-	}
+    gboolean      is_request;
+    proto_tree   *acap_tree, *reqresp_tree;
+    proto_item   *ti, *hidden_item;
+    gint          offset = 0;
+    const guchar *line;
+    gint          next_offset;
+    int           linelen;
+    int           tokenlen;
+    const guchar *next_token;
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACAP");
+
+    /*
+     * Find the end of the first line.
+     *
+     * Note that "tvb_find_line_end()" will return a value that is
+     * not longer than what's in the buffer, so the "tvb_get_ptr()"
+     * call won't throw an exception.
+     */
+    linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+    line = tvb_get_ptr(tvb, offset, linelen);
+
+    if (pinfo->match_uint == pinfo->destport)
+        is_request = TRUE;
+    else
+        is_request = FALSE;
+
+    /*
+     * Put the first line from the buffer into the summary
+     * (but leave out the line terminator).
+     */
+    col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s",
+        is_request ? "Request" : "Response",
+        format_text(line, linelen));
+
+    if (tree) {
+        ti = proto_tree_add_item(tree, hfi_acap, tvb, offset, -1,
+            ENC_NA);
+        acap_tree = proto_item_add_subtree(ti, ett_acap);
+
+        if (is_request) {
+            hidden_item = proto_tree_add_boolean(acap_tree,
+                &hfi_acap_request, tvb, 0, 0, TRUE);
+            PROTO_ITEM_SET_HIDDEN(hidden_item);
+        } else {
+            hidden_item = proto_tree_add_boolean(acap_tree,
+                &hfi_acap_response, tvb, 0, 0, TRUE);
+            PROTO_ITEM_SET_HIDDEN(hidden_item);
+        }
+
+        /*
+         * Put the line into the protocol tree.
+         */
+        ti = proto_tree_add_format_text(acap_tree, tvb, offset, next_offset - offset);
+        reqresp_tree = proto_item_add_subtree(ti, ett_acap_reqresp);
+
+        /*
+         * Show the first line as tags + requests or replies.
+         */
+
+        /*
+         * Extract the first token, and, if there is a first
+         * token, add it as the request or reply tag.
+         */
+        tokenlen = get_token_len(line, line + linelen, &next_token);
+        if (tokenlen != 0) {
+            if (is_request) {
+                proto_tree_add_string(reqresp_tree, &hfi_acap_request_tag, tvb, offset,
+                    tokenlen, format_text(line, tokenlen));
+            } else {
+                proto_tree_add_string(reqresp_tree, &hfi_acap_response_tag, tvb, offset,
+                    tokenlen, format_text(line, tokenlen));
+            }
+            offset += (int)(next_token - line);
+            linelen -= (int)(next_token - line);
+            line = next_token;
+        }
+
+        /*
+         * Add the rest of the line as request or reply data.
+         */
+        if (linelen != 0) {
+            if (is_request) {
+                proto_tree_add_string(reqresp_tree, &hfi_acap_request_data, tvb, offset,
+                    linelen, format_text(line, linelen));
+            } else {
+                proto_tree_add_string(reqresp_tree, &hfi_acap_response_data, tvb, offset,
+                    linelen, format_text(line, linelen));
+            }
+        }
+
+        /*
+         * XXX - show the rest of the frame; this requires that
+         * we handle literals, quoted strings, continuation
+         * responses, etc..
+         *
+         * This involves a state machine, and attaching
+         * state information to the packets.
+         */
+    }
 }
 
 void
 proto_register_acap(void)
 {
 #ifndef HAVE_HFI_SECTION_INIT
-	static header_field_info *hfi[] = {
-		&hfi_acap_response,
-		&hfi_acap_request,
-		&hfi_acap_request_tag,
-		&hfi_acap_response_tag,
-		&hfi_acap_request_data,
-		&hfi_acap_response_data,
-	};
+    static header_field_info *hfi[] = {
+        &hfi_acap_response,
+        &hfi_acap_request,
+        &hfi_acap_request_tag,
+        &hfi_acap_response_tag,
+        &hfi_acap_request_data,
+        &hfi_acap_response_data,
+    };
 #endif
 
-	static gint *ett[] = {
-		&ett_acap,
-		&ett_acap_reqresp,
-	};
+    static gint *ett[] = {
+        &ett_acap,
+        &ett_acap_reqresp,
+    };
 
-	int proto_acap;
+    int proto_acap;
 
-	proto_acap = proto_register_protocol("Application Configuration Access Protocol",
-					     "ACAP", "acap");
-	hfi_acap = proto_registrar_get_nth(proto_acap);
+    proto_acap = proto_register_protocol("Application Configuration Access Protocol",
+                         "ACAP", "acap");
+    hfi_acap = proto_registrar_get_nth(proto_acap);
 
-	proto_register_fields(proto_acap, hfi, array_length(hfi));
-	proto_register_subtree_array(ett, array_length(ett));
+    proto_register_fields(proto_acap, hfi, array_length(hfi));
+    proto_register_subtree_array(ett, array_length(ett));
 
-	acap_handle = create_dissector_handle(dissect_acap, proto_acap);
+    acap_handle = create_dissector_handle(dissect_acap, proto_acap);
 }
 
 void
 proto_reg_handoff_acap(void)
 {
-	dissector_add_uint("tcp.port", TCP_PORT_ACAP, acap_handle);
+    dissector_add_uint("tcp.port", TCP_PORT_ACAP, acap_handle);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */