[PATCH]: trivial patches

[PATCH]: trivial patches

[Yasuyuki Kozakai]

[-- Attachment #1: Type: Text/Plain, Size: 213 bytes --]


Hi,

These patches fix strange indent in libip(6)t_{tcp,udp}.c.

Please apply.

-----------------------------------------------------------------
Yasuyuki KOZAKAI @ USAGI Project <yasuyuki.kozakai@toshiba.co.jp>

[-- Attachment #2: iptables-indent.patch --]
[-- Type: Text/Plain, Size: 2410 bytes --]

Index: extensions/libip6t_tcp.c
===================================================================
RCS file: /cvspublic/iptables/extensions/libip6t_tcp.c,v
retrieving revision 1.11
diff -u -r1.11 libip6t_tcp.c
--- extensions/libip6t_tcp.c	30 Mar 2003 18:29:56 -0000	1.11
+++ extensions/libip6t_tcp.c	27 Jul 2004 16:13:27 -0000
@@ -123,7 +123,7 @@
 		if (i == sizeof(tcp_flag_names)/sizeof(struct tcp_flag_names))
 			exit_error(PARAMETER_PROBLEM,
 				   "Unknown TCP flag `%s'", ptr);
-		}
+	}
 
 	free(buffer);
 	return ret;
Index: extensions/libip6t_udp.c
===================================================================
RCS file: /cvspublic/iptables/extensions/libip6t_udp.c,v
retrieving revision 1.8
diff -u -r1.8 libip6t_udp.c
--- extensions/libip6t_udp.c	2 Oct 2003 19:59:27 -0000	1.8
+++ extensions/libip6t_udp.c	27 Jul 2004 16:13:27 -0000
@@ -50,9 +50,9 @@
 	    (portnum = service_to_port(port)) != -1)
 		return (u_int16_t)portnum;
 
-		exit_error(PARAMETER_PROBLEM,
-			   "invalid UDP port/service `%s' specified", port);
-	}
+	exit_error(PARAMETER_PROBLEM,
+		   "invalid UDP port/service `%s' specified", port);
+}
 
 static void
 parse_udp_ports(const char *portstring, u_int16_t *ports)
Index: extensions/libipt_tcp.c
===================================================================
RCS file: /cvspublic/iptables/extensions/libipt_tcp.c,v
retrieving revision 1.15
diff -u -r1.15 libipt_tcp.c
--- extensions/libipt_tcp.c	30 Mar 2003 18:29:56 -0000	1.15
+++ extensions/libipt_tcp.c	27 Jul 2004 16:13:28 -0000
@@ -123,7 +123,7 @@
 		if (i == sizeof(tcp_flag_names)/sizeof(struct tcp_flag_names))
 			exit_error(PARAMETER_PROBLEM,
 				   "Unknown TCP flag `%s'", ptr);
-		}
+	}
 
 	free(buffer);
 	return ret;
Index: extensions/libipt_udp.c
===================================================================
RCS file: /cvspublic/iptables/extensions/libipt_udp.c,v
retrieving revision 1.10
diff -u -r1.10 libipt_udp.c
--- extensions/libipt_udp.c	26 Jul 2002 16:27:57 -0000	1.10
+++ extensions/libipt_udp.c	27 Jul 2004 16:13:28 -0000
@@ -50,9 +50,9 @@
 	    (portnum = service_to_port(port)) != -1)
 		return (u_int16_t)portnum;
 
-		exit_error(PARAMETER_PROBLEM,
-			   "invalid UDP port/service `%s' specified", port);
-	}
+	exit_error(PARAMETER_PROBLEM,
+		   "invalid UDP port/service `%s' specified", port);
+}
 
 static void
 parse_udp_ports(const char *portstring, u_int16_t *ports)

[ot] Standard patch exclude file?

[Scott MacKay]

Instead of making it from scratch, I was wondering if
anyone had a diff exclude file for making diff -urN
patches....

-Scott


		
__________________________________
Do you Yahoo!?
New and Improved Yahoo! Mail - Send 10MB messages!
http://promotions.yahoo.com/new_mail 

Re: [ot] Standard patch exclude file?

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 674 bytes --]

On Thu, Jul 29, 2004 at 05:14:25AM -0700, Scott MacKay wrote:
> Instead of making it from scratch, I was wondering if
> anyone had a diff exclude file for making diff -urN
> patches....

please google for 'dontdiff', which leads you to
http://www.moses.uklinux.net/patches/dontdiff

> -Scott

-- 
- Harald Welte <laforge@netfilter.org>             http://www.netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]