Fix some duplicate display filter names.

[obnox/wireshark/wip.git] / epan / dissectors / packet-nisplus.c

diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index 50d77c0d5dd102990a603de88b60c3719a23fd45..820299f8d15998d2b8b40c6e01407478e2cb4e27 100644 (file)
--- a/epan/dissectors/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
@@ -293,7 +293,7 @@ dissect_group_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_group,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_group);
 
@@ -316,7 +316,7 @@ dissect_access_rights(tvbuff_t *tvb, int offset, proto_tree *tree)
        guint32 mask;
 
        mask_item = proto_tree_add_item(tree, hf_nisplus_access_mask,
-                       tvb, offset, 4, FALSE);
+                       tvb, offset, 4, ENC_NA);
 
        mask_tree = proto_item_add_subtree(mask_item, ett_nisplus_access_mask);
        mask = tvb_get_ntohl(tvb, offset);
@@ -352,7 +352,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_table_col,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table_col);
 
@@ -362,7 +362,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre
 
        mask_item = proto_tree_add_item(lock_tree, hf_nisplus_table_col_mask,
                tvb, offset, 4,
-               FALSE);
+               ENC_NA);
        mask_tree = proto_item_add_subtree(mask_item, ett_nisplus_table_col_mask);
        mask = tvb_get_ntohl(tvb, offset);
        proto_tree_add_boolean(mask_tree, hf_nisplus_table_col_mask_binary,
@@ -396,7 +396,7 @@ dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_table,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table);
 
@@ -430,13 +430,13 @@ dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tre
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_entry_col,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_entry_col);
 
        mask_item = proto_tree_add_item(lock_tree, hf_nisplus_entry_mask,
                        tvb, offset, 4,
-                       FALSE);
+                       ENC_NA);
 
        mask_tree = proto_item_add_subtree(mask_item, ett_nisplus_entry_mask);
        mask = tvb_get_ntohl(tvb, offset);
@@ -462,7 +462,7 @@ dissect_entry_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_entry,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_entry);
 
@@ -484,7 +484,7 @@ dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_attr,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_attr);
 
@@ -506,7 +506,7 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_link,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_link);
 
@@ -532,7 +532,7 @@ dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_endpoint,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_endpoint);
 
@@ -558,7 +558,7 @@ dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_server,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_server);
 
@@ -587,7 +587,7 @@ dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_directory_mask,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_directory_mask);
 
@@ -608,7 +608,7 @@ dissect_directory_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_directory,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_directory);
 
@@ -639,7 +639,7 @@ dissect_nisplus_oid(tvbuff_t *tvb, int offset, proto_tree *tree)
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_oid, tvb,
-                       offset, -1, FALSE);
+                       offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_oid);
 
@@ -662,7 +662,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_object, tvb,
-                       offset, -1, FALSE);
+                       offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_object);
 
@@ -785,7 +785,7 @@ dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tre
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_tag, tvb,
-                       offset, -1, FALSE);
+                       offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_tag);
 
@@ -1028,7 +1028,7 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nisplus_log_entry,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_log_entry);
 
@@ -1572,31 +1572,31 @@ proto_register_nis(void)
                        NULL, 0, "Entry Value", HFILL }},
 
                { &hf_nisplus_entry_mask, {
-                       "flags", "nisplus.entry.flags", FT_NONE, BASE_NONE,
-                       NULL, 0, "Entry Col Flags", HFILL }},
+                       "mask", "nisplus.entry.mask", FT_NONE, BASE_NONE,
+                       NULL, 0, "Entry Col Mask", HFILL }},
 
                { &hf_nisplus_entry_mask_binary, {
-                       "BINARY", "nisplus.entry.flags.binary",
+                       "BINARY", "nisplus.entry.mask.binary",
                        FT_BOOLEAN, 32, TFS(&tfs_entry_binary),
                        NIS_MASK_ENTRY_BINARY, "Is This Entry BINARY Flag", HFILL }},
 
                { &hf_nisplus_entry_mask_crypt, {
-                       "ENCRYPTED", "nisplus.entry.flags.encrypted",
+                       "ENCRYPTED", "nisplus.entry.mask.encrypted",
                        FT_BOOLEAN, 32, TFS(&tfs_entry_crypt),
                        NIS_MASK_ENTRY_CRYPT, "Is This Entry ENCRYPTED Flag", HFILL }},
 
                { &hf_nisplus_entry_mask_xdr, {
-                       "XDR", "nisplus.entry.flags.xdr",
+                       "XDR", "nisplus.entry.mask.xdr",
                        FT_BOOLEAN, 32, TFS(&tfs_entry_xdr),
                        NIS_MASK_ENTRY_XDR, "Is This Entry XDR Encoded Flag", HFILL }},
 
                { &hf_nisplus_entry_mask_modified, {
-                       "MODIFIED", "nisplus.entry.flags.modified",
+                       "MODIFIED", "nisplus.entry.mask.modified",
                        FT_BOOLEAN, 32, TFS(&tfs_entry_modified),
                        NIS_MASK_ENTRY_MODIFIED, "Is This Entry MODIFIED Flag", HFILL }},
 
                { &hf_nisplus_entry_mask_asn, {
-                       "ASN.1", "nisplus.entry.flags.asn",
+                       "ASN.1", "nisplus.entry.mask.asn",
                        FT_BOOLEAN, 32, TFS(&tfs_entry_asn),
                        NIS_MASK_ENTRY_ASN, "Is This Entry ASN.1 Encoded Flag", HFILL }},
 
@@ -1630,7 +1630,7 @@ proto_register_nis(void)
 
                { &hf_nisplus_table_col_name, {
                        "column name", "nisplus.table.col.name", FT_STRING, BASE_NONE,
-                       NULL, 0, "Column Name", HFILL }},
+                       NULL, 0, NULL, HFILL }},
 
                { &hf_nisplus_table_col_mask, {
                        "flags", "nisplus.table.col.flags", FT_NONE, BASE_NONE,
@@ -1688,11 +1688,11 @@ proto_register_nis(void)
                        NULL, 0, "Name Of Group Member", HFILL }},
 
                { &hf_nisplus_object_ctime, {
-                       "ctime", "nisplus.ctime", FT_ABSOLUTE_TIME, BASE_NONE,
+                       "ctime", "nisplus.ctime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL,
                        NULL, 0, "Time Of Creation", HFILL }},
 
                { &hf_nisplus_object_mtime, {
-                       "mtime", "nisplus.mtime", FT_ABSOLUTE_TIME, BASE_NONE,
+                       "mtime", "nisplus.mtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL,
                        NULL, 0, "Time Last Modified", HFILL }},
 
                { &hf_nisplus_ib_flags, {
@@ -1705,7 +1705,7 @@ proto_register_nis(void)
 
                { &hf_nisplus_cookie, {
                        "cookie", "nisplus.cookie", FT_BYTES, BASE_NONE,
-                       NULL, 0, "Cookie", HFILL }},
+                       NULL, 0, NULL, HFILL }},
 
                { &hf_nisplus_fd_dirname, {
                        "dirname", "nisplus.fd.dirname", FT_STRING, BASE_NONE,
@@ -1721,7 +1721,7 @@ proto_register_nis(void)
 
                { &hf_nisplus_tag, {
                        "tag", "nisplus.tag", FT_NONE, BASE_NONE,
-                       NULL, 0, "Tag", HFILL }},
+                       NULL, 0, NULL, HFILL }},
 
                { &hf_nisplus_tag_type, {
                        "type", "nisplus.tag.type", FT_UINT32, BASE_DEC,
@@ -1736,15 +1736,15 @@ proto_register_nis(void)
                        NULL, 0, "Directory To Dump", HFILL }},
 
                { &hf_nisplus_dump_time, {
-                       "time", "nisplus.dump.time", FT_ABSOLUTE_TIME, BASE_NONE,
+                       "time", "nisplus.dump.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL,
                        NULL, 0, "From This Timestamp", HFILL }},
 
                { &hf_nisplus_dummy, {
-                       " ", "nisplus.dummy", FT_BYTES, BASE_NONE,
+                       "dummy", "nisplus.dummy", FT_BYTES, BASE_NONE,
                        NULL, 0, NULL, HFILL }},
 
                { &hf_nisplus_ping_time, {
-                       "time", "nisplus.ping.time", FT_ABSOLUTE_TIME, BASE_NONE,
+                       "time", "nisplus.ping.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL,
                        NULL, 0, "Timestamp Of The Transaction", HFILL }},
 
                { &hf_nisplus_ping_dir, {
@@ -1765,14 +1765,14 @@ proto_register_nis(void)
 
                { &hf_nisplus_log_entries, {
                        "log entries", "nisplus.log.entries", FT_NONE, BASE_NONE,
-                       NULL, 0, "Log Entries", HFILL }},
+                       NULL, 0, NULL, HFILL }},
 
                { &hf_nisplus_log_entry, {
                        "log entry", "nisplus.log.entry", FT_NONE, BASE_NONE,
-                       NULL, 0, "Log Entry", HFILL }},
+                       NULL, 0, NULL, HFILL }},
 
                { &hf_nisplus_log_time, {
-                       "time", "nisplus.log.time", FT_ABSOLUTE_TIME, BASE_NONE,
+                       "time", "nisplus.log.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL,
                        NULL, 0, "Time Of Log Entry", HFILL }},
 
                { &hf_nisplus_log_type, {
@@ -1877,13 +1877,13 @@ static int
 dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
        proto_item* lock_item = NULL;
-       proto_tree* lock_tree = NULL;
+       /* proto_tree* lock_tree = NULL; */
        int old_offset = offset;
 
        lock_item = proto_tree_add_item(tree, hf_nispluscb_entry,
-                       tvb, offset, -1, FALSE);
+                       tvb, offset, -1, ENC_NA);
 
-       lock_tree = proto_item_add_subtree(lock_item, ett_nispluscb_entry);
+       /* lock_tree = proto_item_add_subtree(lock_item, ett_nispluscb_entry); */
 
 /*XXXXX Not implemented yet*/