aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-12-08 21:12:55 -0500
committerMichael Mann <mmann78@netscape.net>2015-12-09 03:13:04 +0000
commit55fa72224afb7924e0e176fe4df5e933bc7314b9 (patch)
tree9797c6a0976d7c90ea9ad8819d9a653e6a4d0294
parent12f6311b20658aba7b1b441b0260f88401cd06fb (diff)
new_create_dissector_handle_with_name -> create_dissector_handle_with_name
Change-Id: I32d30ada66ee68782194905a8aa669c07f0dc204 Reviewed-on: https://code.wireshark.org/review/12482 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-rpc.c4
-rw-r--r--epan/packet.c2
-rw-r--r--epan/packet.h1
3 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 13c6ba1460..82365b2106 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -571,7 +571,7 @@ rpc_init_prog(int proto, guint32 prog, int ett, size_t nvers,
continue;
}
dissector_add_custom_table_handle("rpc.call", g_memdup(&key, sizeof(rpc_proc_info_key)),
- new_create_dissector_handle_with_name(proc->dissect_call, value->proto_id, proc->strptr));
+ create_dissector_handle_with_name(proc->dissect_call, value->proto_id, proc->strptr));
if (proc->dissect_reply == NULL) {
fprintf(stderr, "OOPS: No reply handler for %s version %u procedure %s\n",
@@ -586,7 +586,7 @@ rpc_init_prog(int proto, guint32 prog, int ett, size_t nvers,
continue;
}
dissector_add_custom_table_handle("rpc.reply", g_memdup(&key, sizeof(rpc_proc_info_key)),
- new_create_dissector_handle_with_name(proc->dissect_reply, value->proto_id, proc->strptr));
+ create_dissector_handle_with_name(proc->dissect_reply, value->proto_id, proc->strptr));
}
}
}
diff --git a/epan/packet.c b/epan/packet.c
index 15edc4df8f..f736f3a2d1 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -2592,7 +2592,7 @@ new_create_dissector_handle(new_dissector_t dissector, const int proto)
return handle;
}
-dissector_handle_t new_create_dissector_handle_with_name(new_dissector_t dissector,
+dissector_handle_t create_dissector_handle_with_name(new_dissector_t dissector,
const int proto, const char* name)
{
struct dissector_handle *handle;
diff --git a/epan/packet.h b/epan/packet.h
index 2bb109304d..fbc4eb7eb1 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -539,7 +539,6 @@ WS_DLL_PUBLIC const char *dissector_handle_get_dissector_name(const dissector_ha
#define new_create_dissector_handle create_dissector_handle
WS_DLL_PUBLIC dissector_handle_t create_dissector_handle(new_dissector_t dissector,
const int proto);
-#define new_create_dissector_handle_with_name create_dissector_handle_with_name
WS_DLL_PUBLIC dissector_handle_t create_dissector_handle_with_name(new_dissector_t dissector,
const int proto, const char* name);