diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-18 11:46:28 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-18 19:47:20 +0000 |
| commit | e601e01ffd141c2ddc3005e25a605be268980242 (patch) | |
| tree | 044b767e371ab8ff3478692f61a25fb40415da0e | |
| parent | 233dc643a6ec9265a5a6e7a29ab39f5587bb1b9f (diff) | |
| download | wireshark-e601e01ffd141c2ddc3005e25a605be268980242.tar.gz | |
Remove some apparently-unnecessary includes of emem.h.
Also update a comment to no longer speak of ep_ allocation, and add an
include of <glib.h> to ui/profile.c, which was formerly relying on the
include of emem.h to drag it in.
Change-Id: I08926699ee96cf66672836b6ee3bbb405b507ce8
Reviewed-on: https://code.wireshark.org/review/6633
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | ui/gtk/airpcap_dlg.c | 1 | ||||
| -rw-r--r-- | ui/gtk/main.c | 3 | ||||
| -rw-r--r-- | ui/gtk/uat_gui.c | 1 | ||||
| -rw-r--r-- | ui/profile.c | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c index ef8f415938..a079d9e006 100644 --- a/ui/gtk/airpcap_dlg.c +++ b/ui/gtk/airpcap_dlg.c @@ -31,7 +31,6 @@ #include <string.h> #include <wsutil/filesystem.h> -#include <epan/emem.h> #include <epan/prefs.h> #include <epan/frequency-utils.h> #include <epan/crypt/wep-wpadefs.h> diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 224491a1f1..e30e4cee56 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -76,7 +76,6 @@ #include <epan/epan_dissect.h> #include <epan/dfilter/dfilter.h> #include <epan/strutil.h> -#include <epan/emem.h> #include <epan/ex-opt.h> #include <epan/funnel.h> #include <epan/expert.h> @@ -619,7 +618,7 @@ get_filter_from_packet_list_row_and_column(gpointer data) */ if (strlen(cfile.cinfo.col_expr.col_expr[column]) != 0 && strlen(cfile.cinfo.col_expr.col_expr_val[column]) != 0) { - /* leak a little but safer than ep_ here */ + /* leak a little; is there a safe wmem_ scope here? */ if (cfile.cinfo.col_fmt[column] == COL_CUSTOM) { header_field_info *hfi = proto_registrar_get_byname(cfile.cinfo.col_custom_field[column]); if (hfi && hfi->parent == -1) { diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index 2703ac1a37..2fbe72e9c9 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -47,7 +47,6 @@ #include <wsutil/report_err.h> #include <epan/dfilter/dfilter-macro.h> -#include <epan/emem.h> #include <epan/proto.h> #include <epan/packet.h> #include <epan/uat-int.h> diff --git a/ui/profile.c b/ui/profile.c index 62b46517ec..361bd8fe83 100644 --- a/ui/profile.c +++ b/ui/profile.c @@ -26,8 +26,8 @@ #include <string.h> #include <errno.h> +#include <glib.h> -#include <epan/emem.h> #include <wsutil/filesystem.h> #include "profile.h" |