warning: ISO C does not allow extra ; outside of a function

[obnox/wireshark/wip.git] / packet-dcerpc-rs_misc.c

diff --git a/packet-dcerpc-rs_misc.c b/packet-dcerpc-rs_misc.c
index fb0f880d2c21e4967db7c18e324116ab7ab7583a..7170b3374eebcf2c7f536c82001aa93fe8c091b1 100644 (file)
--- a/packet-dcerpc-rs_misc.c
+++ b/packet-dcerpc-rs_misc.c
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_misc.idl
  *      
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_misc.idl
  *      

- * $Id: packet-dcerpc-rs_misc.c,v 1.2 2002/11/08 19:42:40 guy Exp $
+ * $Id: packet-dcerpc-rs_misc.c,v 1.6 2003/12/21 05:51:33 jmayer Exp $

  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>


@@ -62,7 +62,7 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset,
 {
 
        guint32 key_size;
 {
 
        guint32 key_size;

-       char *key_t = NULL;
+       const char *key_t = NULL;

 
        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, 
                        hf_rs_misc_login_get_info_rqst_var, NULL);
 
        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, 
                        hf_rs_misc_login_get_info_rqst_var, NULL);


@@ -72,7 +72,7 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset,
        if (key_size){ /* Not able to yet decipher the OTHER versions of this call just yet. */
 
                proto_tree_add_string (tree, hf_rs_misc_login_get_info_rqst_key_t, tvb, offset, hf_rs_misc_login_get_info_rqst_key_size, tvb_get_ptr (tvb, offset, key_size));
        if (key_size){ /* Not able to yet decipher the OTHER versions of this call just yet. */
 
                proto_tree_add_string (tree, hf_rs_misc_login_get_info_rqst_key_t, tvb, offset, hf_rs_misc_login_get_info_rqst_key_size, tvb_get_ptr (tvb, offset, key_size));

-               key_t = (char *)tvb_get_ptr(tvb,offset,key_size);
+               key_t = (const char *)tvb_get_ptr(tvb,offset,key_size);

                offset += key_size;
 
                if (check_col(pinfo->cinfo, COL_INFO)) {
                offset += key_size;
 
                if (check_col(pinfo->cinfo, COL_INFO)) {


@@ -87,7 +87,7 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset,
        }
 
        return offset;
        }
 
        return offset;

-};
+}

 
 
 static dcerpc_sub_dissector rs_misc_dissectors[] = {
 
 
 static dcerpc_sub_dissector rs_misc_dissectors[] = {


@@ -97,20 +97,13 @@ static dcerpc_sub_dissector rs_misc_dissectors[] = {
        { 0, NULL, NULL, NULL }
 };
 
        { 0, NULL, NULL, NULL }
 };
 

-static const value_string rs_misc_opnum_vals[] = {
-       { 0, "rs_login_get_info" },
-       { 1, "rs_wait_until_consistent" },
-       { 2, "rs_check_consistency" },
-       { 0, NULL },
-};
-

 void
 proto_register_rs_misc (void)
 {
        static hf_register_info hf[] = {
        { &hf_rs_misc_opnum,
                { "Operation", "rs_misc.opnum", FT_UINT16, BASE_DEC,
 void
 proto_register_rs_misc (void)
 {
        static hf_register_info hf[] = {
        { &hf_rs_misc_opnum,
                { "Operation", "rs_misc.opnum", FT_UINT16, BASE_DEC,

-               VALS(rs_misc_opnum_vals), 0x0, "Operation", HFILL }},
+               NULL, 0x0, "Operation", HFILL }},

        { &hf_rs_misc_login_get_info_rqst_var,
                { "Var", "rs_misc.login_get_info_rqst_var", FT_UINT32, BASE_DEC,
                NULL, 0x0, "", HFILL }},
        { &hf_rs_misc_login_get_info_rqst_var,
                { "Var", "rs_misc.login_get_info_rqst_var", FT_UINT32, BASE_DEC,
                NULL, 0x0, "", HFILL }},