diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-21 14:09:28 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-21 22:10:08 +0000 |
| commit | 0be413e27069c56d1e58bad8fb43427eb8347a42 (patch) | |
| tree | c6c1604fe067ac1d1d18218c8f345e465ef51944 /epan/proto.h | |
| parent | 5d30a3cb41afdf2dc4ecc03116bb4e792d3344fb (diff) | |
Move another helper macro.
Change-Id: Id3801373526af57146a87abe9698b192074a0fa0
Reviewed-on: https://code.wireshark.org/review/5958
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/proto.h')
| -rw-r--r-- | epan/proto.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/proto.h b/epan/proto.h index e24394b3cd..dfbf6c6b07 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -203,6 +203,11 @@ WS_DLL_PUBLIC WS_MSVC_NORETURN void proto_report_dissector_bug(const char *messa * @param op Any binary operator. * @param b The second integer. */ +#define __DISSECTOR_ASSERT_CMPINT(a, op, b, type, fmt) \ + (REPORT_DISSECTOR_BUG( \ + ep_strdup_printf("%s:%u: failed assertion "#a" "#op" "#b" ("fmt" "#op" "fmt")", \ + __FILE__, __LINE__, (type)a, (type)b))) + #define DISSECTOR_ASSERT_CMPINT(a, op, b) \ ((void) ((a op b) ? (void)0 : \ __DISSECTOR_ASSERT_CMPINT (a, op, b, gint64, "%"G_GINT64_MODIFIER"d"))) \ @@ -226,11 +231,6 @@ WS_DLL_PUBLIC WS_MSVC_NORETURN void proto_report_dissector_bug(const char *messa __DISSECTOR_ASSERT_CMPINT (a, op, b, guint64, "0x%"G_GINT64_MODIFIER"X"))) \ __DISSECTOR_ASSERT_STATIC_ANALYSIS_HINT(a op b) -#define __DISSECTOR_ASSERT_CMPINT(a, op, b, type, fmt) \ - (REPORT_DISSECTOR_BUG( \ - ep_strdup_printf("%s:%u: failed assertion "#a" "#op" "#b" ("fmt" "#op" "fmt")", \ - __FILE__, __LINE__, (type)a, (type)b))) - /* * The encoding of a field of a particular type may involve more * than just whether it's big-endian or little-endian and its size. |