Attachment 195056 Details for Bug 217152 – svn-diff-xorp_v2

[patch] svn-diff-xorp_v2

svn-diff-xorp (text/plain), 7.62 KB, created by Walter Schwarzenfeld on 2018-07-11 17:16:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2018-07-11 17:16:50 UTC

Size: 7.62 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 473791)
>+++ Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	xorp
> PORTVERSION=	1.8.5
> DISTVERSIONPREFIX=	${PORTNAME}-
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	net
> 
> MAINTAINER=	hrs@FreeBSD.org
>Index: files/patch-SConstruct
>===================================================================
>--- files/patch-SConstruct	(revision 473791)
>+++ files/patch-SConstruct	(working copy)
>@@ -1,4 +1,4 @@
>---- SConstruct.orig	2012-01-11 17:56:10 UTC
>+--- SConstruct.orig	2018-07-11 16:37:51 UTC
> +++ SConstruct
> @@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0):
>  
>@@ -33,3 +33,11 @@
>      '-pipe',
>      ])
>  
>+@@ -891,7 +883,6 @@ env.AppendUnique(CXXFLAGS = [
>+     '-Wpointer-arith',
>+     '-Wcast-align',
>+     '-Woverloaded-virtual',
>+-    '-ftemplate-depth-25',
>+     '-pipe',
>+     ])
>+ 
>Index: files/patch-io__ip__socket.cc
>===================================================================
>--- files/patch-io__ip__socket.cc	(nonexistent)
>+++ files/patch-io__ip__socket.cc	(working copy)
>@@ -0,0 +1,16 @@
>+--- fea/data_plane/io/io_ip_socket.cc.orig	2018-07-10 15:49:50 UTC
>++++ fea/data_plane/io/io_ip_socket.cc
>+@@ -2293,10 +2293,10 @@ IoIpSocket::send_packet(const string& if
>+ 	    //
>+ 	    struct sockaddr_in sin;
>+ 	    src_address.copy_out(sin);
>+-	    if (bind(_proto_socket_out,
>++	    bind(_proto_socket_out,
>+ 		     reinterpret_cast<struct sockaddr*>(&sin),
>+-		     sizeof(sin))
>+-		< 0) {
>++		     sizeof(sin));
>++		if ( reinterpret_cast<struct sockaddr*>(&sin) < ((void*)0)) {
>+ 		error_msg = c_format("raw socket bind(%s) failed: %s",
>+ 				     cstring(src_address), XSTRERROR);
>+ 		XLOG_ERROR("%s", error_msg.c_str());
>
>Property changes on: files/patch-io__ip__socket.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-lex.yy__policy__backend__parser.cc
>===================================================================
>--- files/patch-lex.yy__policy__backend__parser.cc	(nonexistent)
>+++ files/patch-lex.yy__policy__backend__parser.cc	(working copy)
>@@ -0,0 +1,87 @@
>+--- policy/backend/lex.yy_policy_backend_parser.cc.orig	2018-07-10 15:46:56 UTC
>++++ policy/backend/lex.yy_policy_backend_parser.cc
>+@@ -728,9 +728,9 @@ extern int yy_policy_backend_parserlex (
>+  */
>+ YY_DECL
>+ {
>+-	register yy_state_type yy_current_state;
>+-	register char *yy_cp, *yy_bp;
>+-	register int yy_act;
>++	yy_state_type yy_current_state;
>++	char *yy_cp, *yy_bp;
>++	int yy_act;
>+     
>+ #line 40 "backend.l"
>+ 
>+@@ -779,7 +779,7 @@ YY_DECL
>+ yy_match:
>+ 		do
>+ 			{
>+-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
>++			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
>+ 			if ( yy_accept[yy_current_state] )
>+ 				{
>+ 				(yy_last_accepting_state) = yy_current_state;
>+@@ -1171,9 +1171,9 @@ case YY_STATE_EOF(STR):
>+  */
>+ static int yy_get_next_buffer (void)
>+ {
>+-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
>+-	register char *source = (yytext_ptr);
>+-	register int number_to_move, i;
>++    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
>++	char *source = (yytext_ptr);
>++	int number_to_move, i;
>+ 	int ret_val;
>+ 
>+ 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
>+@@ -1297,14 +1297,14 @@ static int yy_get_next_buffer (void)
>+ 
>+     static yy_state_type yy_get_previous_state (void)
>+ {
>+-	register yy_state_type yy_current_state;
>+-	register char *yy_cp;
>++	yy_state_type yy_current_state;
>++	char *yy_cp;
>+     
>+ 	yy_current_state = (yy_start);
>+ 
>+ 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
>+ 		{
>+-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
>++		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
>+ 		if ( yy_accept[yy_current_state] )
>+ 			{
>+ 			(yy_last_accepting_state) = yy_current_state;
>+@@ -1329,10 +1329,10 @@ static int yy_get_next_buffer (void)
>+  */
>+     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
>+ {
>+-	register int yy_is_jam;
>+-    	register char *yy_cp = (yy_c_buf_p);
>++	int yy_is_jam;
>++    	char *yy_cp = (yy_c_buf_p);
>+ 
>+-	register YY_CHAR yy_c = 1;
>++	YY_CHAR yy_c = 1;
>+ 	if ( yy_accept[yy_current_state] )
>+ 		{
>+ 		(yy_last_accepting_state) = yy_current_state;
>+@@ -1933,7 +1933,7 @@ int yy_policy_backend_parserlex_destroy 
>+ #ifndef yytext_ptr
>+ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
>+ {
>+-	register int i;
>++	int i;
>+ 	for ( i = 0; i < n; ++i )
>+ 		s1[i] = s2[i];
>+ }
>+@@ -1942,7 +1942,7 @@ static void yy_flex_strncpy (char* s1, y
>+ #ifdef YY_NEED_STRLEN
>+ static int yy_flex_strlen (yyconst char * s )
>+ {
>+-	register int n;
>++	int n;
>+ 	for ( n = 0; s[n]; ++n )
>+ 		;
>+ 
>
>Property changes on: files/patch-lex.yy__policy__backend__parser.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-libproto__packet.cc
>===================================================================
>--- files/patch-libproto__packet.cc	(revision 473791)
>+++ files/patch-libproto__packet.cc	(working copy)
>@@ -1,5 +1,16 @@
>---- libproto/packet.cc.orig	2012-01-11 17:56:10 UTC
>+--- libproto/packet.cc.orig	2018-07-10 12:55:07 UTC
> +++ libproto/packet.cc
>+@@ -88,8 +88,8 @@ IpHeader4::fragment(size_t mtu, list<vec
>+     //
>+     memcpy(&frag_buf[0], _data, IpHeader4::SIZE);
>+     {
>+-	register const u_char *cp;
>+-	register u_char *dp;
>++	const u_char *cp;
>++	u_char *dp;
>+ 	int opt, optlen, cnt;
>+ 
>+ 	cp = (const u_char *)(orig_ip4.data() + orig_ip4.size());
> @@ -233,7 +233,7 @@ IpHeader4Writer::compute_checksum()
>  }
>  
>Index: files/patch-pathutil.c
>===================================================================
>--- files/patch-pathutil.c	(nonexistent)
>+++ files/patch-pathutil.c	(working copy)
>@@ -0,0 +1,38 @@
>+--- cli/libtecla/pathutil.c.orig	2018-07-10 13:09:21 UTC
>++++ cli/libtecla/pathutil.c
>+@@ -168,7 +168,7 @@ char *_pn_append_to_path(PathName *path,
>+ /*
>+  * How many characters should be appended?
>+  */
>+-  if(slen < 0 || slen > strlen(string))
>++  if(slen < 0 || (unsigned long)(slen) > strlen(string))
>+     slen = strlen(string);
>+ /*
>+  * Resize the pathname if needed.
>+@@ -239,7 +239,7 @@ char *_pn_prepend_to_path(PathName *path
>+ /*
>+  * How many characters should be appended?
>+  */
>+-  if(slen < 0 || slen > strlen(string))
>++  if(slen < 0 || (unsigned long)(slen) > strlen(string))
>+     slen = strlen(string);
>+ /*
>+  * Work out how far we need to shift the original path string to make
>+@@ -494,7 +494,7 @@ char *_pu_start_of_path(const char *stri
>+ 	break;
>+     };
>+   };
>+-  return (char *)string + i + 1;
>++  return (char *)(string + i + 1);
>+ }
>+ 
>+ /*.......................................................................
>+@@ -534,7 +534,7 @@ char *_pu_end_of_path(const char *string
>+       escaped = 1;
>+     };
>+   };
>+-  return (char *)string + i;
>++  return (char *)(string + i);
>+ }
>+ 
>+ /*.......................................................................
>
>Property changes on: files/patch-pathutil.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 217152: 194840 | 194845 | 195056 | 195057 | 195059 | 195071 | 195073 | 195086 | 195088 | 195089 | 195094 | 195125