[pkgsrc/trunk]: pkgsrc/net/xl2tpd Fix inline use.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46471f9b854c
branches:  trunk
changeset: 621821:46471f9b854c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jul 18 12:06:39 2013 +0000

description:
Fix inline use.

diffstat:

 net/xl2tpd/distinfo                |   4 +-
 net/xl2tpd/patches/patch-control.c |  62 +++++++++++++++++++++++++++++++++++--
 2 files changed, 60 insertions(+), 6 deletions(-)

diffs (96 lines):

diff -r 092aec5605bd -r 46471f9b854c net/xl2tpd/distinfo
--- a/net/xl2tpd/distinfo       Thu Jul 18 12:06:10 2013 +0000
+++ b/net/xl2tpd/distinfo       Thu Jul 18 12:06:39 2013 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2013/07/15 11:57:23 christos Exp $
+$NetBSD: distinfo,v 1.3 2013/07/18 12:06:39 joerg Exp $
 
 SHA1 (xl2tpd-20130626.zip) = f115483cd04c8cd1af183be21842d13ce34fdc66
 RMD160 (xl2tpd-20130626.zip) = 1a53199f5a288811fcd540b93812293a95c4ced5
 Size (xl2tpd-20130626.zip) = 590466 bytes
 SHA1 (patch-Makefile) = fde2535eb5c2eb498df8e96162d2f24dba27b3dd
 SHA1 (patch-contrib_pfc.c) = 22a7bf36e45347470154b87ff26e68ecdd2493ac
-SHA1 (patch-control.c) = 8c280948c027185063e4ae5b5b36dc0b4c0b41ce
+SHA1 (patch-control.c) = 3b1aa772be07bdc1312d94c8e0b1543086b6fb7f
 SHA1 (patch-l2tp.h) = d068d47170da6a1a3d960ef6f7a7027c10c8820f
 SHA1 (patch-md5.c) = cc100db8b9314a86a96464cde4df78c387b56e9a
 SHA1 (patch-misc.c) = 8c1b0bff81af1f5718cbf1d02e4f47fcad14c9a9
diff -r 092aec5605bd -r 46471f9b854c net/xl2tpd/patches/patch-control.c
--- a/net/xl2tpd/patches/patch-control.c        Thu Jul 18 12:06:10 2013 +0000
+++ b/net/xl2tpd/patches/patch-control.c        Thu Jul 18 12:06:39 2013 +0000
@@ -1,13 +1,58 @@
-$NetBSD: patch-control.c,v 1.1 2013/07/12 19:06:31 christos Exp $
+$NetBSD: patch-control.c,v 1.2 2013/07/18 12:06:39 joerg Exp $
 
 Remove static from inline; each inlined copy might have its own buffer and
 this is not want you want if you define it static. In this case it does not
 matter, since it is only 4K and we don't return it, so don't try to play
 around with saving stack space for no good reason.
 
---- control.c.orig     2013-06-17 06:17:24.000000000 -0400
-+++ control.c  2013-07-12 14:54:44.000000000 -0400
-@@ -1571,7 +1571,7 @@
+--- control.c.orig     2013-06-17 10:17:24.000000000 +0000
++++ control.c
+@@ -75,7 +75,7 @@ struct buffer *new_outgoing (struct tunn
+     return tmp;
+ }
+ 
+-inline void recycle_outgoing (struct buffer *buf, struct sockaddr_in peer)
++void recycle_outgoing (struct buffer *buf, struct sockaddr_in peer)
+ {
+     /* 
+      * This should only be used for ZLB's!
+@@ -1139,7 +1139,7 @@ int control_finish (struct tunnel *t, st
+     return 0;
+ }
+ 
+-inline int check_control (const struct buffer *buf, struct tunnel *t,
++static inline int check_control (const struct buffer *buf, struct tunnel *t,
+                           struct call *c)
+ {
+     /*
+@@ -1275,7 +1275,7 @@ inline int check_control (const struct b
+     return 0;
+ }
+ 
+-inline int check_payload (struct buffer *buf, struct tunnel *t,
++static inline int check_payload (struct buffer *buf, struct tunnel *t,
+                           struct call *c)
+ {
+     /*
+@@ -1381,7 +1381,7 @@ inline int check_payload (struct buffer 
+ #endif
+     return 0;
+ }
+-inline int expand_payload (struct buffer *buf, struct tunnel *t,
++static inline int expand_payload (struct buffer *buf, struct tunnel *t,
+                            struct call *c)
+ {
+     /*
+@@ -1561,7 +1561,7 @@ void send_zlb (void *data)
+     toss (buf);
+ }
+ 
+-inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c,
++static inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c,
+                          int convert)
+ {
+     /*
+@@ -1571,7 +1571,7 @@ inline int write_packet (struct buffer *
      int x;
      unsigned char e;
      int err;
@@ -16,3 +61,12 @@
      int pos = 0;
  
      if (c->fd < 0)
+@@ -1739,7 +1739,7 @@ void handle_special (struct buffer *buf,
+     }
+ }
+ 
+-inline int handle_packet (struct buffer *buf, struct tunnel *t,
++int handle_packet (struct buffer *buf, struct tunnel *t,
+                           struct call *c)
+ {
+     int res;