diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-08-29 19:05:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-08-29 19:05:41 +0000 |
| commit | 3f4397bbb054b20791c237afac01f431d8d20f04 (patch) | |
| tree | 0438f2db9c0e65b5e2189f4592f4834ee7fdc0cb /packet-dcerpc-reg.c | |
| parent | 79195136aaa365702c69a0ca1ab0cbe553a6bf44 (diff) | |
From Ulf Lamping: change some #define names to avoid name collisions on
Windows that cause compiler warnings.
svn path=/trunk/; revision=6129
Diffstat (limited to 'packet-dcerpc-reg.c')
| -rw-r--r-- | packet-dcerpc-reg.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/packet-dcerpc-reg.c b/packet-dcerpc-reg.c index 86a47904c9..79da7c69c5 100644 --- a/packet-dcerpc-reg.c +++ b/packet-dcerpc-reg.c @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\winreg packet disassembly * Copyright 2001, 2002 Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-reg.c,v 1.11 2002/08/28 21:00:10 jmayer Exp $ + * $Id: packet-dcerpc-reg.c,v 1.12 2002/08/29 19:05:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -602,18 +602,18 @@ RegFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Registry data types */ const value_string reg_datatypes[] = { - { REG_NONE, "REG_NONE" }, - { REG_SZ, "REG_SZ" }, - { REG_EXPAND_SZ, "REG_EXPAND_SZ" }, - { REG_BINARY, "REG_BINARY" }, - { REG_DWORD, "REG_DWORD" }, - { REG_DWORD_LE, "REG_DWORD_LE" }, - { REG_DWORD_BE, "REG_DWORD_BE" }, - { REG_LINK, "REG_LINK" }, - { REG_MULTI_SZ, "REG_MULTI_SZ" }, - { REG_RESOURCE_LIST, "REG_RESOURCE_LIST" }, - { REG_FULL_RESOURCE_DESCRIPTOR, "REG_FULL_RESOURCE_DESCRIPTOR" }, - { REG_RESOURCE_REQUIREMENTS_LIST, "REG_RESOURCE_REQUIREMENTS_LIST" }, + { DCERPC_REG_NONE, "REG_NONE" }, + { DCERPC_REG_SZ, "REG_SZ" }, + { DCERPC_REG_EXPAND_SZ, "REG_EXPAND_SZ" }, + { DCERPC_REG_BINARY, "REG_BINARY" }, + { DCERPC_REG_DWORD, "REG_DWORD" }, + { DCERPC_REG_DWORD_LE, "REG_DWORD_LE" }, + { DCERPC_REG_DWORD_BE, "REG_DWORD_BE" }, + { DCERPC_REG_LINK, "REG_LINK" }, + { DCERPC_REG_MULTI_SZ, "REG_MULTI_SZ" }, + { DCERPC_REG_RESOURCE_LIST, "REG_RESOURCE_LIST" }, + { DCERPC_REG_FULL_RESOURCE_DESCRIPTOR, "REG_FULL_RESOURCE_DESCRIPTOR" }, + { DCERPC_REG_RESOURCE_REQUIREMENTS_LIST, "REG_RESOURCE_REQUIREMENTS_LIST" }, {0, NULL } }; @@ -655,7 +655,7 @@ static dcerpc_sub_dissector dcerpc_reg_dissectors[] = { { _REG_UNK_17, "Unknown17", NULL, NULL }, { REG_SHUTDOWN, "Shutdown", NULL, NULL }, { REG_ABORT_SHUTDOWN, "AbortShutdown", NULL, NULL }, - { REG_UNK_1A, "Unknown1A", RegUnknown1A_q, RegUnknown1A_r }, + { _REG_UNK_1A, "Unknown1A", RegUnknown1A_q, RegUnknown1A_r }, { 0, NULL, NULL, NULL } }; @@ -687,7 +687,7 @@ static const value_string reg_opnum_vals[] = { { _REG_UNK_17, "Unknown17" }, { REG_SHUTDOWN, "Shutdown" }, { REG_ABORT_SHUTDOWN, "AbortShutdown" }, - { REG_UNK_1A, "Unknown1A" }, + { _REG_UNK_1A, "Unknown1A" }, { 0, NULL } }; |