summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/column-utils.h11
-rw-r--r--epan/dissectors/packet-ssl-utils.h5
-rw-r--r--epan/dissectors/packet-zbee-zdp.h2
-rw-r--r--epan/emem.h11
-rw-r--r--epan/expert.h3
-rw-r--r--epan/gnuc_format_check.h39
-rw-r--r--epan/proto.h85
7 files changed, 56 insertions, 100 deletions
diff --git a/epan/column-utils.h b/epan/column-utils.h
index deb7135720..438374b6b8 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -27,7 +27,6 @@
#include <glib.h>
-#include "gnuc_format_check.h"
#include "column_info.h"
#include "packet_info.h"
#include <epan/epan.h>
@@ -147,7 +146,7 @@ extern void col_add_str(column_info *cinfo, gint col, const gchar *str);
* @param ... the variable number of parameters
*/
extern void col_add_fstr(column_info *cinfo, gint col, const gchar *format, ...)
- GNUC_FORMAT_CHECK(printf, 3, 4);
+ G_GNUC_PRINTF(3, 4);
/* For internal Wireshark use only. Not to be called from dissectors. */
void col_custom_set_edt(epan_dissect_t *edt, column_info *cinfo);
@@ -178,7 +177,7 @@ extern void col_append_str(column_info *cinfo, gint col, const gchar *str);
* @param ... the variable number of parameters
*/
extern void col_append_fstr(column_info *cinfo, gint col, const gchar *format, ...)
- GNUC_FORMAT_CHECK(printf, 3, 4);
+ G_GNUC_PRINTF(3, 4);
/** Prepend the given text to a column element, the text will be formatted and copied.
*
@@ -188,7 +187,7 @@ extern void col_append_fstr(column_info *cinfo, gint col, const gchar *format, .
* @param ... the variable number of parameters
*/
extern void col_prepend_fstr(column_info *cinfo, gint col, const gchar *format, ...)
- GNUC_FORMAT_CHECK(printf, 3, 4);
+ G_GNUC_PRINTF(3, 4);
/**Prepend the given text to a column element, the text will be formatted and copied.
* This function is similar to col_prepend_fstr() but this function will
@@ -199,7 +198,7 @@ extern void col_prepend_fstr(column_info *cinfo, gint col, const gchar *format,
* it does not yet exist.
*/
extern void col_prepend_fence_fstr(column_info *cinfo, gint col, const gchar *format, ...)
- GNUC_FORMAT_CHECK(printf, 3, 4);
+ G_GNUC_PRINTF(3, 4);
/** Append the given text (prepended by a separator) to a column element.
*
@@ -225,7 +224,7 @@ extern void col_append_sep_str(column_info *cinfo, gint col, const gchar *sep,
*/
extern void col_append_sep_fstr(column_info *cinfo, gint col, const gchar *sep,
const gchar *format, ...)
- GNUC_FORMAT_CHECK(printf, 4, 5);
+ G_GNUC_PRINTF(4, 5);
/** Set the given (relative) time to a column element.
*
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 5c00c97f87..f228d7fead 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -29,7 +29,6 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/emem.h>
-#include <epan/gnuc_format_check.h>
#include <epan/value_string.h>
#ifdef HAVE_LIBGNUTLS
@@ -486,7 +485,7 @@ ssl_is_valid_content_type(guint8 type);
#ifdef SSL_DECRYPT_DEBUG
extern void
-ssl_debug_printf(const gchar* fmt,...) GNUC_FORMAT_CHECK(printf,1,2);
+ssl_debug_printf(const gchar* fmt,...) G_GNUC_PRINTF(1,2);
extern void
ssl_print_data(const gchar* name, const guchar* data, size_t len);
extern void
@@ -500,7 +499,7 @@ ssl_debug_flush(void);
#else
/* No debug: nullify debug operation*/
-static inline void GNUC_FORMAT_CHECK(printf,1,2)
+static inline void G_GNUC_PRINTF(1,2)
ssl_debug_printf(const gchar* fmt _U_,...)
{
}
diff --git a/epan/dissectors/packet-zbee-zdp.h b/epan/dissectors/packet-zbee-zdp.h
index 3809e87732..cda52b9bf6 100644
--- a/epan/dissectors/packet-zbee-zdp.h
+++ b/epan/dissectors/packet-zbee-zdp.h
@@ -280,7 +280,7 @@ extern const gchar *zdp_status_name (guint8 status);
extern void zdp_dump_excess (tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree);
extern guint zbee_parse_uint (proto_tree *tree, int hfindex, tvbuff_t *tvb, guint *offset, guint length, proto_item **ti);
extern guint64 zbee_parse_eui64 (proto_tree *tree, int hfindex, tvbuff_t *tvb, guint *offset, guint length, proto_item **ti);
-extern void zbee_append_info (proto_item *item, packet_info *pinfo, const gchar *format, ...) GNUC_FORMAT_CHECK(printf, 3, 4);
+extern void zbee_append_info (proto_item *item, packet_info *pinfo, const gchar *format, ...) G_GNUC_PRINTF(3, 4);
extern void zdp_parse_node_desc (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset, packet_info *pinfo);
extern void zdp_parse_power_desc (proto_tree *tree, gint ettindex, tvbuff_t *tvb, guint *offset);
diff --git a/epan/emem.h b/epan/emem.h
index 4caeecb1b0..486f29d2b2 100644
--- a/epan/emem.h
+++ b/epan/emem.h
@@ -27,7 +27,6 @@
#define __EMEM_H__
#include "g_gnuc_malloc.h"
-#include "gnuc_format_check.h"
/* Initialize all the memory allocation pools described below.
* This function must be called once when *shark initialize to set up the
@@ -67,7 +66,7 @@ void* ep_memdup(const void* src, size_t len) G_GNUC_MALLOC;
/* Create a formatted string with a packet lifetime scope */
gchar* ep_strdup_vprintf(const gchar* fmt, va_list ap) G_GNUC_MALLOC;
gchar* ep_strdup_printf(const gchar* fmt, ...)
- G_GNUC_MALLOC GNUC_FORMAT_CHECK(printf, 1, 2);
+ G_GNUC_MALLOC G_GNUC_PRINTF(1, 2);
/* allocates with a packet lifetime scope an array of type made of num elements */
#define ep_alloc_array(type,num) (type*)ep_alloc(sizeof(type)*(num))
@@ -150,7 +149,7 @@ void* se_memdup(const void* src, size_t len) G_GNUC_MALLOC;
/* Create a formatted string with a capture lifetime scope */
gchar* se_strdup_vprintf(const gchar* fmt, va_list ap) G_GNUC_MALLOC;
gchar* se_strdup_printf(const gchar* fmt, ...)
- G_GNUC_MALLOC GNUC_FORMAT_CHECK(printf, 1, 2);
+ G_GNUC_MALLOC G_GNUC_PRINTF(1, 2);
/* allocates with a capture lifetime scope an array of type made of num elements */
#define se_alloc_array(type,num) (type*)se_alloc(sizeof(type)*(num))
@@ -423,7 +422,7 @@ void ep_strbuf_append_vprintf(emem_strbuf_t *strbuf, const gchar *format, va_lis
* @param format A printf-style string format.
*/
void ep_strbuf_printf(emem_strbuf_t *strbuf, const gchar *format, ...)
- GNUC_FORMAT_CHECK(printf, 2, 3);
+ G_GNUC_PRINTF(2, 3);
/**
* Append printf-style formatted text to a string buffer.
@@ -432,7 +431,7 @@ void ep_strbuf_printf(emem_strbuf_t *strbuf, const gchar *format, ...)
* @param format A printf-style string format.
*/
void ep_strbuf_append_printf(emem_strbuf_t *strbuf, const gchar *format, ...)
- GNUC_FORMAT_CHECK(printf, 2, 3);
+ G_GNUC_PRINTF(2, 3);
/**
* Append a string to a string buffer.
@@ -478,7 +477,7 @@ void emem_print_tree(emem_tree_t* emem_tree);
#ifdef DEBUG_INTENSE_CANARY_CHECKS
void ep_check_canary_integrity(const char* fmt, ...)
- GNUC_FORMAT_CHECK(printf, 1, 2);
+ G_GNUC_PRINTF(1, 2);
#define EP_CHECK_CANARY(args) ep_check_canary_integrity args
#else
#define EP_CHECK_CANARY(args)
diff --git a/epan/expert.h b/epan/expert.h
index 054d7e6c7c..52aeb53e16 100644
--- a/epan/expert.h
+++ b/epan/expert.h
@@ -27,7 +27,6 @@
#ifndef __EXPERT_H__
#define __EXPERT_H__
-#include "gnuc_format_check.h"
#include <epan/proto.h>
#include "value_string.h"
@@ -65,6 +64,6 @@ expert_get_highest_severity(void);
extern void
expert_add_info_format(packet_info *pinfo, proto_item *pi, int group,
int severity, const char *format, ...)
- GNUC_FORMAT_CHECK(printf, 5, 6);
+ G_GNUC_PRINTF(5, 6);
#endif /* __EXPERT_H__ */
diff --git a/epan/gnuc_format_check.h b/epan/gnuc_format_check.h
deleted file mode 100644
index 83e3ba4b7d..0000000000
--- a/epan/gnuc_format_check.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* gnuc_format_check.h
- * Definitions of macro to conditionally do GCC format checks
- *
- * $Id$
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GNUC_FORMAT_CHECK_H__
-#define __GNUC_FORMAT_CHECK_H__
-
-/** GNUC has the ability to check format strings that follow the syntax used in printf and others.
- Hide the differences between different compilers in this GNUC_FORMAT_CHECK macro.
- @param archetype one of: printf, scanf, strftime or strfmon
- @param string_index specifies which argument is the format string argument (starting from 1)
- @param first_to_check is the number of the first argument to check against the format string */
-#if __GNUC__ >= 2
- #define GNUC_FORMAT_CHECK(archetype, string_index, first_to_check) __attribute__((format (archetype, string_index, first_to_check)))
-#else
- #define GNUC_FORMAT_CHECK(archetype, string_index, first_to_check)
-#endif
-
-#endif /* gnuc-format-check.h */
diff --git a/epan/proto.h b/epan/proto.h
index 6e15389d27..fec48db587 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -45,7 +45,6 @@
#include <glib.h>
-#include "gnuc_format_check.h"
#include "ipv4.h"
#include "nstime.h"
#include "tvbuff.h"
@@ -442,14 +441,14 @@ extern proto_item* proto_item_get_parent_nth(proto_item *ti, int gen);
@param format printf like format string
@param ... printf like parameters */
extern void proto_item_set_text(proto_item *ti, const char *format, ...)
- GNUC_FORMAT_CHECK(printf, 2,3);
+ G_GNUC_PRINTF(2,3);
/** Append to text of item after it has already been created.
@param ti the item to append the text to
@param format printf like format string
@param ... printf like parameters */
extern void proto_item_append_text(proto_item *ti, const char *format, ...)
- GNUC_FORMAT_CHECK(printf, 2,3);
+ G_GNUC_PRINTF(2,3);
/** Set proto_item's length inside tvb, after it has already been created.
@param ti the item to set the length
@@ -565,7 +564,7 @@ proto_tree_add_item(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_text(proto_tree *tree, tvbuff_t *tvb, gint start, gint length, const char *format,
- ...) GNUC_FORMAT_CHECK(printf,5,6);
+ ...) G_GNUC_PRINTF(5,6);
/** Add a text-only node to a proto_tree using a variable argument list.
@param tree the tree to append this item to
@@ -591,7 +590,7 @@ proto_tree_add_text_valist(proto_tree *tree, tvbuff_t *tvb, gint start,
@return the newly created item */
extern proto_item *
proto_tree_add_none_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, const char *format, ...) GNUC_FORMAT_CHECK(printf,6,7);
+ gint length, const char *format, ...) G_GNUC_PRINTF(6,7);
/** Add a FT_PROTOCOL to a proto_tree.
@param tree the tree to append this item to
@@ -604,7 +603,7 @@ proto_tree_add_none_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint st
@return the newly created item */
extern proto_item *
proto_tree_add_protocol_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, const char *format, ...) GNUC_FORMAT_CHECK(printf,6,7);
+ gint length, const char *format, ...) G_GNUC_PRINTF(6,7);
@@ -636,7 +635,7 @@ proto_tree_add_bytes(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_bytes_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, const guint8* start_ptr, const char *format,
- ...) GNUC_FORMAT_CHECK(printf,7,8);
+ ...) G_GNUC_PRINTF(7,8);
/** Add a formatted FT_BYTES to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -651,7 +650,7 @@ proto_tree_add_bytes_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_bytes_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, const guint8* start_ptr, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, const guint8* start_ptr, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_ABSOLUTE_TIME or FT_RELATIVE_TIME to a proto_tree.
@param tree the tree to append this item to
@@ -680,7 +679,7 @@ proto_tree_add_time(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_time_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, nstime_t* value_ptr, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_ABSOLUTE_TIME or FT_RELATIVE_TIME to a proto_tree, with
the format generating the entire string for the entry, including any field
@@ -696,7 +695,7 @@ proto_tree_add_time_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_time_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, nstime_t* value_ptr, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, nstime_t* value_ptr, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_IPXNET to a proto_tree.
@param tree the tree to append this item to
@@ -725,7 +724,7 @@ proto_tree_add_ipxnet(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_ipxnet_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, guint32 value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_IPXNET to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -740,7 +739,7 @@ proto_tree_add_ipxnet_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_ipxnet_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, guint32 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, guint32 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_IPv4 to a proto_tree.
@param tree the tree to append this item to
@@ -769,7 +768,7 @@ proto_tree_add_ipv4(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_ipv4_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, guint32 value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_IPv4 to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -784,7 +783,7 @@ proto_tree_add_ipv4_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_ipv4_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, guint32 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, guint32 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_IPv6 to a proto_tree.
@param tree the tree to append this item to
@@ -813,7 +812,7 @@ proto_tree_add_ipv6(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_ipv6_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, const guint8* value_ptr, const char *format,
- ...) GNUC_FORMAT_CHECK(printf,7,8);
+ ...) G_GNUC_PRINTF(7,8);
/** Add a formatted FT_IPv6 to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -828,7 +827,7 @@ proto_tree_add_ipv6_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_ipv6_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, const guint8* value_ptr, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, const guint8* value_ptr, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_ETHER to a proto_tree.
@param tree the tree to append this item to
@@ -857,7 +856,7 @@ proto_tree_add_ether(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_ether_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, const guint8* value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_ETHER to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -872,7 +871,7 @@ proto_tree_add_ether_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_ether_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, const guint8* value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, const guint8* value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_GUID to a proto_tree.
@param tree the tree to append this item to
@@ -901,7 +900,7 @@ proto_tree_add_guid(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_guid_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, const e_guid_t *value_ptr, const char *format,
- ...) GNUC_FORMAT_CHECK(printf,7,8);
+ ...) G_GNUC_PRINTF(7,8);
/** Add a formatted FT_GUID to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -916,7 +915,7 @@ proto_tree_add_guid_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_guid_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, const e_guid_t *value_ptr, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, const e_guid_t *value_ptr, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_OID to a proto_tree.
@param tree the tree to append this item to
@@ -945,7 +944,7 @@ proto_tree_add_oid(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_oid_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, const guint8* value_ptr, const char *format,
- ...) GNUC_FORMAT_CHECK(printf,7,8);
+ ...) G_GNUC_PRINTF(7,8);
/** Add a formatted FT_OID to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -960,7 +959,7 @@ proto_tree_add_oid_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_oid_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, const guint8* value_ptr, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, const guint8* value_ptr, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_STRING to a proto_tree.
@param tree the tree to append this item to
@@ -989,7 +988,7 @@ proto_tree_add_string(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_string_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, const char* value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_STRING to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -1004,7 +1003,7 @@ proto_tree_add_string_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_string_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, const char* value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, const char* value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_BOOLEAN to a proto_tree.
@param tree the tree to append this item to
@@ -1033,7 +1032,7 @@ proto_tree_add_boolean(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_boolean_format_value(proto_tree *tree, int hfindex,
tvbuff_t *tvb, gint start, gint length, guint32 value,
- const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a formatted FT_BOOLEAN to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -1048,7 +1047,7 @@ proto_tree_add_boolean_format_value(proto_tree *tree, int hfindex,
@return the newly created item */
extern proto_item *
proto_tree_add_boolean_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, guint32 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, guint32 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_FLOAT to a proto_tree.
@param tree the tree to append this item to
@@ -1077,7 +1076,7 @@ proto_tree_add_float(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_float_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, float value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_FLOAT to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -1092,7 +1091,7 @@ proto_tree_add_float_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_float_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, float value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, float value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_DOUBLE to a proto_tree.
@param tree the tree to append this item to
@@ -1121,7 +1120,7 @@ proto_tree_add_double(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_double_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, double value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_DOUBLE to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -1136,7 +1135,7 @@ proto_tree_add_double_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_double_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, double value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, double value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add one of FT_UINT8, FT_UINT16, FT_UINT24 or FT_UINT32 to a proto_tree.
@param tree the tree to append this item to
@@ -1165,7 +1164,7 @@ proto_tree_add_uint(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_uint_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, guint32 value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_UINT8, FT_UINT16, FT_UINT24 or FT_UINT32 to a proto_tree,
with the format generating the entire string for the entry, including any
@@ -1181,7 +1180,7 @@ proto_tree_add_uint_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_uint_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, guint32 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, guint32 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add an FT_UINT64 to a proto_tree.
@param tree the tree to append this item to
@@ -1210,7 +1209,7 @@ proto_tree_add_uint64(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_uint64_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, guint64 value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_UINT64 to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -1225,7 +1224,7 @@ proto_tree_add_uint64_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_uint64_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, guint64 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, guint64 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add one of FT_INT8, FT_INT16, FT_INT24 or FT_INT32 to a proto_tree.
@param tree the tree to append this item to
@@ -1254,7 +1253,7 @@ proto_tree_add_int(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_int_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, gint32 value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_INT8, FT_INT16, FT_INT24 or FT_INT32 to a proto_tree,
with the format generating the entire string for the entry, including
@@ -1270,7 +1269,7 @@ proto_tree_add_int_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_int_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, gint32 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, gint32 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add an FT_INT64 to a proto_tree.
@param tree the tree to append this item to
@@ -1299,7 +1298,7 @@ proto_tree_add_int64(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
extern proto_item *
proto_tree_add_int64_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
gint start, gint length, gint64 value, const char *format, ...)
- GNUC_FORMAT_CHECK(printf,7,8);
+ G_GNUC_PRINTF(7,8);
/** Add a formatted FT_INT64 to a proto_tree, with the format generating
the entire string for the entry, including any field name.
@@ -1314,7 +1313,7 @@ proto_tree_add_int64_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
extern proto_item *
proto_tree_add_int64_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, gint64 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint length, gint64 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Useful for quick debugging. Also sends string to STDOUT, so don't
leave call to this function in production code.
@@ -1324,7 +1323,7 @@ proto_tree_add_int64_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint s
@return the newly created item */
extern proto_item *
proto_tree_add_debug_text(proto_tree *tree, const char *format,
- ...) GNUC_FORMAT_CHECK(printf,2,3);
+ ...) G_GNUC_PRINTF(2,3);
@@ -1684,7 +1683,7 @@ proto_tree_add_bits_ret_val(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint
@return the newly created item */
extern proto_item *
proto_tree_add_uint_bits_format_value(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint bit_offset, gint no_of_bits,
- guint32 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ guint32 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add bits for a FT_BOOLEAN header field to a proto_tree, with
the format generating the string for the value and with the field
@@ -1700,7 +1699,7 @@ proto_tree_add_uint_bits_format_value(proto_tree *tree, int hf_index, tvbuff_t *
@return the newly created item */
extern proto_item *
proto_tree_add_boolean_bits_format_value(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint bit_offset, gint no_of_bits,
- guint32 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ guint32 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add bits for a FT_INT8, FT_INT16, FT_INT24 or FT_INT32
header field to a proto_tree, with the format generating the
@@ -1716,7 +1715,7 @@ proto_tree_add_boolean_bits_format_value(proto_tree *tree, int hf_index, tvbuff_
@return the newly created item */
extern proto_item *
proto_tree_add_int_bits_format_value(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint bit_offset, gint no_of_bits,
- gint32 value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ gint32 value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add bits for a FT_FLOAT header field to a proto_tree, with
the format generating the string for the value and with the field
@@ -1732,7 +1731,7 @@ proto_tree_add_int_bits_format_value(proto_tree *tree, int hf_index, tvbuff_t *t
@return the newly created item */
extern proto_item *
proto_tree_add_float_bits_format_value(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint bit_offset, gint no_of_bits,
- float value, const char *format, ...) GNUC_FORMAT_CHECK(printf,7,8);
+ float value, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Check if given string is a valid field name
@param field_name the field name to check
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-26 00:00:47 +0000