Changed from using own defined GNUC_FORMAT_CHECK to G_GNUC_PRINTF

defined in GLib.  Removed epan/gnuc_format_check.h.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31657 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/cmdarg_err.h b/cmdarg_err.h
index 733d7faa763a1783bd50349c13d337f4753f6d24..dff2cbbe7011d674e910a4c2b8c38ed82379d56c 100644 (file)
--- a/cmdarg_err.h
+++ b/cmdarg_err.h
@@ -29,19 +29,17 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <epan/gnuc_format_check.h>
-
 /*
  * Report an error in command-line arguments.
  */
 extern void cmdarg_err(const char *fmt, ...)
-    GNUC_FORMAT_CHECK(printf, 1, 2);
+    G_GNUC_PRINTF(1, 2);
 
 /*
  * Report additional information for an error in command-line arguments.
  */
 extern void cmdarg_err_cont(const char *fmt, ...)
-    GNUC_FORMAT_CHECK(printf, 1, 2);
+    G_GNUC_PRINTF(1, 2);
 
 #ifdef __cplusplus
 }

diff --git a/doxygen_global.cfg b/doxygen_global.cfg
index 0ec454605143fe95a0802e16e3cafd3af75fb94f..df0e63d087f7004564048ce41a02827a7c865662 100644 (file)
--- a/doxygen_global.cfg
+++ b/doxygen_global.cfg
@@ -850,14 +850,14 @@ INCLUDE_FILE_PATTERNS  =
 # or name=definition (no spaces). If the definition and the = are 
 # omitted =1 is assumed.
 
-PREDEFINED             = GNUC_FORMAT_CHECK(a,b,c) HAVE_LIBPCAP _U_= 
+PREDEFINED             = G_GNUC_MALLOC G_GNUC_PRINTF(a,b) HAVE_LIBPCAP _U_= 
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
 # The macro definition that is found in the sources will be used. 
 # Use the PREDEFINED tag if you want to use a different macro definition.
 
-EXPAND_AS_DEFINED      = GNUC_FORMAT_CHECK
+EXPAND_AS_DEFINED      = G_GNUC_MALLOC G_GNUC_PRINTF
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
 # doxygen's preprocessor will remove all function-like macros that are alone 

diff --git a/epan/column-utils.h b/epan/column-utils.h
index deb7135720053503840716608ac2e59c51126ddb..438374b6b859ea0459690719b96eb68b1551dca8 100644 (file)
--- 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 5c00c97f8761788c006876b20155c96f87e9432d..f228d7fead988547afcf55b1a1c4e7f5e7d439d4 100644 (file)
--- 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 3809e87732af9e16c9be1db18e1db99a27d27279..cda52b9bf6b1914c3fbd758280fb25c3899b7c5e 100644 (file)
--- 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 4caeecb1b0043eeb784edc0970fab5646719cd4a..486f29d2b283bafa4afc0b2d0ac03a2df78912f0 100644 (file)
--- 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 054d7e6c7c81b416420db11f9feae3e7dc5ab2d0..52aeb53e16852dc801243a319e83787ca68037d3 100644 (file)
--- 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 (file)
index 83e3ba4..0000000
--- 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 6e15389d2743b94dcafd6555c34568ddd2ab06b5..fec48db5878fdac37b037d491c66e1a6f48c3572 100644 (file)
--- 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

diff --git a/simple_dialog.h b/simple_dialog.h
index 1b503e940522a267c75250ffb975e6bc855722fc..ea7355b80def60a46114ead091bbdeedfde1d44e 100644 (file)
--- a/simple_dialog.h
+++ b/simple_dialog.h
@@ -26,8 +26,6 @@
 #ifndef __DIALOG_H__
 #define __DIALOG_H__
 
-#include <epan/gnuc_format_check.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -89,7 +87,7 @@ typedef enum {
  */
 extern gpointer simple_dialog(ESD_TYPE_E type, gint btn_mask,
     const gchar *msg_format, ...)
-    GNUC_FORMAT_CHECK(printf, 3, 4);
+    G_GNUC_PRINTF(3, 4);
 
 /** Create and show a simple dialog using a va_list.
  *
@@ -166,7 +164,7 @@ extern void display_queued_messages(void);
  * @param msg Status message
  */
 extern void simple_status(const gchar *msg_format, ...)
-    GNUC_FORMAT_CHECK(printf, 1, 2);
+    G_GNUC_PRINTF(1, 2);