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>

diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 13c6ba14609ed5b1d47b1c8fe0f889427c3d2774..82365b2106b01c278937fb7918c02f6f7c4261ec 100644 (file)
--- 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 15edc4df8f6d8373297407feca695549162350c9..f736f3a2d142988996342a30efc9bd949c2d1b2f 100644 (file)
--- 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 2bb109304d762a7693db1a8461de22d0f032a29f..fbc4eb7eb1292cc1a7716061679ae43fb6bfc33d 100644 (file)
--- 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);