Add "register-static.c" to the list of files to ignore in CVS.

[obnox/wireshark/wip.git] / packet-bootparams.c

diff --git a/packet-bootparams.c b/packet-bootparams.c
index a3b4a52d15dd8b5b54b239a420373cd841e36801..8eb3495190674a3b09e0b8cd852ec93e045e7489 100644 (file)
--- a/packet-bootparams.c
+++ b/packet-bootparams.c
@@ -1,10 +1,10 @@
 /* packet-bootparams.c
  * Routines for bootparams dissection
  *
- * $Id: packet-bootparams.c,v 1.17 2001/03/18 02:07:02 guy Exp $
+ * $Id: packet-bootparams.c,v 1.19 2001/06/18 02:17:45 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
  * Copied from packet-smb.c
@@ -69,7 +69,7 @@ dissect_bp_address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 
        type = tvb_get_ntohl(tvb, offset);
        
-       offset = dissect_rpc_uint32_tvb(tvb, pinfo, tree, hf_bootparams_addresstype, offset);
+       offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_bootparams_addresstype, offset);
 
        switch(type){
        case 1:
@@ -95,8 +95,8 @@ dissect_getfile_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 {
        if ( tree )
        {
-               offset = dissect_rpc_string_tvb(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
-               offset = dissect_rpc_string_tvb(tvb, pinfo, tree, hf_bootparams_fileid, offset, NULL);
+               offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
+               offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_fileid, offset, NULL);
        }
        
        return offset;
@@ -107,9 +107,9 @@ dissect_getfile_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 {
        if ( tree )
        {
-               offset = dissect_rpc_string_tvb(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
+               offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
                offset = dissect_bp_address(tvb, offset, pinfo, tree, hf_bootparams_hostaddr);
-               offset = dissect_rpc_string_tvb(tvb, pinfo, tree, hf_bootparams_filepath, offset, NULL);
+               offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_filepath, offset, NULL);
        }
        
        return offset;
@@ -131,8 +131,8 @@ dissect_whoami_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 {
        if ( tree )
        {
-               offset = dissect_rpc_string_tvb(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
-               offset = dissect_rpc_string_tvb(tvb, pinfo, tree, hf_bootparams_domain, offset, NULL);
+               offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_host, offset, NULL);
+               offset = dissect_rpc_string(tvb, pinfo, tree, hf_bootparams_domain, offset, NULL);
                offset = dissect_bp_address(tvb, offset, pinfo, tree, hf_bootparams_routeraddr);
        }
        
@@ -159,25 +159,25 @@ proto_register_bootparams(void)
        static hf_register_info hf[] = {
                { &hf_bootparams_host, {
                        "Client Host", "bootparams.host", FT_STRING, BASE_DEC,
-                       NULL, 0, "Client Host" }},
+                       NULL, 0, "Client Host", HFILL }},
                { &hf_bootparams_domain, {
                        "Client Domain", "bootparams.domain", FT_STRING, BASE_DEC,
-                       NULL, 0, "Client Domain" }},
+                       NULL, 0, "Client Domain", HFILL }},
                { &hf_bootparams_fileid, {
                        "File ID", "bootparams.fileid", FT_STRING, BASE_DEC,
-                       NULL, 0, "File ID" }},
+                       NULL, 0, "File ID", HFILL }},
                { &hf_bootparams_filepath, {
                        "File Path", "bootparams.filepath", FT_STRING, BASE_DEC,
-                       NULL, 0, "File Path" }},
+                       NULL, 0, "File Path", HFILL }},
                { &hf_bootparams_hostaddr, {
                        "Client Address", "bootparams.hostaddr", FT_IPv4, BASE_DEC,
-                       NULL, 0, "Address" }},
+                       NULL, 0, "Address", HFILL }},
                { &hf_bootparams_routeraddr, {
                        "Router Address", "bootparams.routeraddr", FT_IPv4, BASE_DEC,
-                       NULL, 0, "Router Address" }},
+                       NULL, 0, "Router Address", HFILL }},
                { &hf_bootparams_addresstype, {
                        "Address Type", "bootparams.type", FT_UINT32, BASE_DEC,
-                       VALS(addr_type), 0, "Address Type" }},
+                       VALS(addr_type), 0, "Address Type", HFILL }},
        };
        static gint *ett[] = {
                &ett_bootparams,