[csw-devel] SF.net SVN: gar:[3706] csw/mgar/pkg/libnids/trunk

[hson at users.sourceforge.net]

Revision: 3706
          http://gar.svn.sourceforge.net/gar/?rev=3706&view=rev
Author:   hson
Date:     2009-03-11 03:25:12 +0000 (Wed, 11 Mar 2009)

Log Message:
-----------
libnids: Remove inline-gccism

Modified Paths:
--------------
    csw/mgar/pkg/libnids/trunk/checksums
    csw/mgar/pkg/libnids/trunk/files/mainpatch

Modified: csw/mgar/pkg/libnids/trunk/checksums
===================================================================
--- csw/mgar/pkg/libnids/trunk/checksums	2009-03-11 03:10:07 UTC (rev 3705)
+++ csw/mgar/pkg/libnids/trunk/checksums	2009-03-11 03:25:12 UTC (rev 3706)
@@ -1,2 +1,2 @@
 af35e8ef403a0ca95df2da94db856428  download/libnids-1.23.tar.gz
-ea5ddd010782ed77209e2414e5500ec7  download/mainpatch
+f30f9291f73781869e9d1e3091d8d151  download/mainpatch

Modified: csw/mgar/pkg/libnids/trunk/files/mainpatch
===================================================================
--- csw/mgar/pkg/libnids/trunk/files/mainpatch	2009-03-11 03:10:07 UTC (rev 3705)
+++ csw/mgar/pkg/libnids/trunk/files/mainpatch	2009-03-11 03:25:12 UTC (rev 3706)
@@ -1,6 +1,6 @@
 diff --speed-large-files --minimal -ru libnids-1.23.orig/src/Makefile.in libnids-1.23/src/Makefile.in
 --- libnids-1.23.orig/src/Makefile.in	2008-02-21 11:40:19.000000000 +0100
-+++ libnids-1.23/src/Makefile.in	2009-03-08 05:26:17.000000000 +0100
++++ libnids-1.23/src/Makefile.in	2009-03-11 00:03:28.000000000 +0100
 @@ -16,7 +16,7 @@
  LIBSHARED      = libnids.so.1.23
  
@@ -75,19 +75,44 @@
  	rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED)
 diff --speed-large-files --minimal -ru libnids-1.23.orig/src/checksum.c libnids-1.23/src/checksum.c
 --- libnids-1.23.orig/src/checksum.c	2005-02-08 16:46:11.000000000 +0100
-+++ libnids-1.23/src/checksum.c	2009-03-08 11:39:55.103753000 +0100
-@@ -25,7 +25,7 @@
- 	return 0;
++++ libnids-1.23/src/checksum.c	2009-03-11 00:49:43.000000000 +0100
+@@ -120,7 +120,7 @@
+   By Jorge Cwik <jorge at laser.satlink.net>, adapted for linux by Arnt
+   Gulbrandsen.
+ */
+-inline u_short ip_fast_csum(u_char * iph, u_int ihl)
++u_short ip_fast_csum(u_char * iph, u_int ihl)
+ {
+   u_int sum;
+   if (dontchksum(((struct ip*)iph)->ip_src.s_addr))
+@@ -191,13 +191,13 @@
+   this routine is used for miscellaneous IP-like checksums, mainly in
+   icmp.c
+ */
+-inline u_short
++u_short
+ ip_compute_csum(u_char * buff, int len)
+ {
+   return (csum_fold(csum_partial(buff, len, 0)));
  }
-  
--#if ( __i386__ || __i386 )
-+#if ( __i386__ || __i386 ) && __GNUC__
- // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels
  
- /*
+-inline u_short
++u_short
+ my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr)
+ {
+   if (dontchksum(saddr))
+@@ -205,7 +205,7 @@
+   return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP,
+ 			   csum_partial((char *)th, len, 0));
+ }
+-inline u_short
++u_short
+ my_udp_check(void *u, int len, u_int saddr, u_int daddr)
+ {
+   if (dontchksum(saddr))
 diff --speed-large-files --minimal -ru libnids-1.23.orig/src/ip_options.c libnids-1.23/src/ip_options.c
 --- libnids-1.23.orig/src/ip_options.c	2002-08-10 21:07:45.000000000 +0200
-+++ libnids-1.23/src/ip_options.c	2009-03-08 05:26:17.000000000 +0100
++++ libnids-1.23/src/ip_options.c	2009-03-11 00:03:28.000000000 +0100
 @@ -69,7 +69,7 @@
    unsigned char __pad1;
    unsigned char __pad2;
@@ -97,3 +122,22 @@
  };
  
  struct iphdr {
+diff --speed-large-files --minimal -ru libnids-1.23.orig/src/util.c libnids-1.23/src/util.c
+--- libnids-1.23.orig/src/util.c	2006-05-01 18:58:48.000000000 +0200
++++ libnids-1.23/src/util.c	2009-03-11 00:48:59.000000000 +0100
+@@ -29,13 +29,13 @@
+   return ret;
+ }
+ 
+-inline int
++int
+ before(u_int seq1, u_int seq2)
+ {
+   return ((int)(seq1 - seq2) < 0);
+ }
+ 
+-inline int
++int
+ after(u_int seq1, u_int seq2)
+ {
+   return ((int)(seq2 - seq1) < 0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.