diff options
author | joerg <joerg@pkgsrc.org> | 2012-11-19 03:06:04 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2012-11-19 03:06:04 +0000 |
commit | 5622fdc72bf150abfb97f1d5abc0a87a14225b54 (patch) | |
tree | 599ec1cebfe4773f142481aa4ad050630d3a8326 /net/ipgrab | |
parent | 10d66c31d8d7205530c97461637375214edb4fa9 (diff) | |
download | pkgsrc-5622fdc72bf150abfb97f1d5abc0a87a14225b54.tar.gz |
Fix inline usage for c99 compiler.
Diffstat (limited to 'net/ipgrab')
-rw-r--r-- | net/ipgrab/distinfo | 8 | ||||
-rw-r--r-- | net/ipgrab/patches/patch-src_display.h | 38 | ||||
-rw-r--r-- | net/ipgrab/patches/patch-src_hexbuffer.h | 15 | ||||
-rw-r--r-- | net/ipgrab/patches/patch-src_layers.h | 16 | ||||
-rw-r--r-- | net/ipgrab/patches/patch-src_packet__manip.h | 36 | ||||
-rw-r--r-- | net/ipgrab/patches/patch-src_stats.h | 22 | ||||
-rw-r--r-- | net/ipgrab/patches/patch-src_utilities.h | 28 |
7 files changed, 162 insertions, 1 deletions
diff --git a/net/ipgrab/distinfo b/net/ipgrab/distinfo index b815f48cf6b..09af953507e 100644 --- a/net/ipgrab/distinfo +++ b/net/ipgrab/distinfo @@ -1,5 +1,11 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:13:50 agc Exp $ +$NetBSD: distinfo,v 1.4 2012/11/19 03:06:04 joerg Exp $ SHA1 (ipgrab-0.9.9.tar.gz) = 2fe9816ee2661c1efe87ce63b845a32732bf3b78 RMD160 (ipgrab-0.9.9.tar.gz) = cef17116e4f2c86edc7d20c95fb5a6c8b900a130 Size (ipgrab-0.9.9.tar.gz) = 289561 bytes +SHA1 (patch-src_display.h) = 16763fdef9ea3caaaf05d51c9f0301e908546057 +SHA1 (patch-src_hexbuffer.h) = 2ac77e4ba8db664d9cb25aef2dbe5b160effd61a +SHA1 (patch-src_layers.h) = aea0e3160e0c3df18be9b8a8793d6fcd5911c451 +SHA1 (patch-src_packet__manip.h) = 4ebefb1a25ba438e559d98887c8d275243fcdc49 +SHA1 (patch-src_stats.h) = a64deed68af2eca989925c114001dc65b4bc28bf +SHA1 (patch-src_utilities.h) = cc74618134221ece276c1ac554e8260595415327 diff --git a/net/ipgrab/patches/patch-src_display.h b/net/ipgrab/patches/patch-src_display.h new file mode 100644 index 00000000000..a1f1f9cf9eb --- /dev/null +++ b/net/ipgrab/patches/patch-src_display.h @@ -0,0 +1,38 @@ +$NetBSD: patch-src_display.h,v 1.1 2012/11/19 03:06:04 joerg Exp $ + +--- src/display.h.orig 2012-11-19 00:55:37.000000000 +0000 ++++ src/display.h +@@ -67,19 +67,19 @@ typedef enum headerline + * Function prototypes + */ + +-inline void display_header_line (headerline_t); +-inline void display_header_banner (char *); +-inline void display_header_banner_ts(char *, char *); +-inline void display (char *, u_int8_t *, u_int32_t, display_t); +-inline void display_string (u_int8_t *, u_int8_t *); +-inline void display_strmap(char *, int, strmap_t *map); +-inline void display_strmap_hex(char *, int, strmap_t *map); +-inline void display_ipv4 (u_int8_t *, u_int8_t *); +-inline void display_ipv6 (u_int8_t *, u_int8_t *); +-inline void display_minimal (u_int8_t *, u_int32_t, display_t); +-inline void display_minimal_string (u_int8_t *); +-inline void display_minimal_ipv4 (u_int8_t *); +-inline void display_minimal_ipv6 (u_int8_t *); +-inline void display_minimal_cr(void); ++void display_header_line (headerline_t); ++void display_header_banner (char *); ++void display_header_banner_ts(char *, char *); ++void display (char *, u_int8_t *, u_int32_t, display_t); ++void display_string (u_int8_t *, u_int8_t *); ++void display_strmap(char *, int, strmap_t *map); ++void display_strmap_hex(char *, int, strmap_t *map); ++void display_ipv4 (u_int8_t *, u_int8_t *); ++void display_ipv6 (u_int8_t *, u_int8_t *); ++void display_minimal (u_int8_t *, u_int32_t, display_t); ++void display_minimal_string (u_int8_t *); ++void display_minimal_ipv4 (u_int8_t *); ++void display_minimal_ipv6 (u_int8_t *); ++void display_minimal_cr(void); + + #endif diff --git a/net/ipgrab/patches/patch-src_hexbuffer.h b/net/ipgrab/patches/patch-src_hexbuffer.h new file mode 100644 index 00000000000..12b897ddbf2 --- /dev/null +++ b/net/ipgrab/patches/patch-src_hexbuffer.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_hexbuffer.h,v 1.1 2012/11/19 03:06:04 joerg Exp $ + +--- src/hexbuffer.h.orig 2012-11-19 00:55:40.000000000 +0000 ++++ src/hexbuffer.h +@@ -32,7 +32,7 @@ + #include "global.h" + #include "local.h" + +-inline void hexbuffer_add(u_int8_t *ptr, int length); +-inline void hexbuffer_flush(void); +-inline void hexbuffer_kill(void); ++void hexbuffer_add(u_int8_t *ptr, int length); ++void hexbuffer_flush(void); ++void hexbuffer_kill(void); + #endif diff --git a/net/ipgrab/patches/patch-src_layers.h b/net/ipgrab/patches/patch-src_layers.h new file mode 100644 index 00000000000..ab75b2550cd --- /dev/null +++ b/net/ipgrab/patches/patch-src_layers.h @@ -0,0 +1,16 @@ +$NetBSD: patch-src_layers.h,v 1.1 2012/11/19 03:06:04 joerg Exp $ + +--- src/layers.h.orig 2012-11-19 00:55:12.000000000 +0000 ++++ src/layers.h +@@ -39,8 +39,8 @@ typedef enum layer + LAYER_APPLICATION + } layer_t; + +-inline void set_layer(layer_t); +-inline layer_t get_layer(void); +-inline int check_layer(void); ++void set_layer(layer_t); ++layer_t get_layer(void); ++int check_layer(void); + + #endif diff --git a/net/ipgrab/patches/patch-src_packet__manip.h b/net/ipgrab/patches/patch-src_packet__manip.h new file mode 100644 index 00000000000..ac5e35d42f1 --- /dev/null +++ b/net/ipgrab/patches/patch-src_packet__manip.h @@ -0,0 +1,36 @@ +$NetBSD: patch-src_packet__manip.h,v 1.1 2012/11/19 03:06:04 joerg Exp $ + +--- src/packet_manip.h.orig 2012-11-19 00:55:44.000000000 +0000 ++++ src/packet_manip.h +@@ -67,18 +67,18 @@ typedef struct packet + } packet_t; + + +-inline int look_packet_bytes(u_int8_t *, packet_t *, unsigned int); +-inline int get_packet_bytes(u_int8_t *, packet_t *, unsigned int); +-inline int get_packet_bytestoend(u_int8_t *, packet_t *, unsigned int); +-inline int get_packet_line(u_int8_t *, u_int32_t, packet_t *); +-inline int get_packet_string(u_int8_t *, u_int32_t, packet_t *); +-inline int skip_packet_bytes(packet_t *, unsigned int); +-inline int skip_packet_toapparentend(packet_t *); +-inline u_int32_t get_packet_bytesleft(packet_t *); +-inline u_int32_t get_packet_apparentbytesleft(packet_t *); +-inline void set_packet_mark(packet_t *); +-inline int32_t get_packet_markdistance(packet_t *); +-inline void set_packet_apparentend(packet_t *, int); +-inline int packet_haspadding(packet_t *); ++int look_packet_bytes(u_int8_t *, packet_t *, unsigned int); ++int get_packet_bytes(u_int8_t *, packet_t *, unsigned int); ++int get_packet_bytestoend(u_int8_t *, packet_t *, unsigned int); ++int get_packet_line(u_int8_t *, u_int32_t, packet_t *); ++int get_packet_string(u_int8_t *, u_int32_t, packet_t *); ++int skip_packet_bytes(packet_t *, unsigned int); ++int skip_packet_toapparentend(packet_t *); ++u_int32_t get_packet_bytesleft(packet_t *); ++u_int32_t get_packet_apparentbytesleft(packet_t *); ++void set_packet_mark(packet_t *); ++int32_t get_packet_markdistance(packet_t *); ++void set_packet_apparentend(packet_t *, int); ++int packet_haspadding(packet_t *); + + #endif diff --git a/net/ipgrab/patches/patch-src_stats.h b/net/ipgrab/patches/patch-src_stats.h new file mode 100644 index 00000000000..4cb189d68a4 --- /dev/null +++ b/net/ipgrab/patches/patch-src_stats.h @@ -0,0 +1,22 @@ +$NetBSD: patch-src_stats.h,v 1.1 2012/11/19 03:06:04 joerg Exp $ + +--- src/stats.h.orig 2012-11-19 00:55:46.000000000 +0000 ++++ src/stats.h +@@ -52,11 +52,11 @@ + * Function prototypes + */ + +-inline void stats_init(void); +-inline void stats_update(int type); +-inline void stats_dump(void); +-inline void stats_reset(void); +-inline void stats_pause(void); +-inline void stats_unpause(void); ++void stats_init(void); ++void stats_update(int type); ++void stats_dump(void); ++void stats_reset(void); ++void stats_pause(void); ++void stats_unpause(void); + + #endif diff --git a/net/ipgrab/patches/patch-src_utilities.h b/net/ipgrab/patches/patch-src_utilities.h new file mode 100644 index 00000000000..39647fba9dd --- /dev/null +++ b/net/ipgrab/patches/patch-src_utilities.h @@ -0,0 +1,28 @@ +$NetBSD: patch-src_utilities.h,v 1.1 2012/11/19 03:06:04 joerg Exp $ + +--- src/utilities.h.orig 2012-11-19 00:56:45.000000000 +0000 ++++ src/utilities.h +@@ -28,14 +28,14 @@ + + #include "global.h" + +-inline void reverse_byte_order(u_int8_t *, int); +-inline int isprint_str(char *, int); +-inline int isspace_str(char *, int); +-inline char * argv2str(char **); +-inline void * my_malloc(size_t); +-inline void my_free(void *); +-inline void dump_hex_and_text(char *, int); +-inline int ipaddr_space(u_int32_t); +-inline char * make_space_str(int); ++void reverse_byte_order(u_int8_t *, int); ++int isprint_str(char *, int); ++int isspace_str(char *, int); ++char * argv2str(char **); ++void * my_malloc(size_t); ++void my_free(void *); ++void dump_hex_and_text(char *, int); ++int ipaddr_space(u_int32_t); ++char * make_space_str(int); + + #endif |