svn commit: r279984 - head/sys/dev/cxgbe

[Ian Lepore]

Author: ian
Date: Sat Mar 14 13:04:39 2015
New Revision: 279984
URL: https://svnweb.freebsd.org/changeset/base/279984

Log:
  Revert r279934, r279938; this is going to be fixed in sbuf instead.
  
  PR:		195668

Modified:
  head/sys/dev/cxgbe/t4_l2t.c
  head/sys/dev/cxgbe/t4_main.c

Modified: head/sys/dev/cxgbe/t4_l2t.c
==============================================================================
--- head/sys/dev/cxgbe/t4_l2t.c	Sat Mar 14 13:02:08 2015	(r279983)
+++ head/sys/dev/cxgbe/t4_l2t.c	Sat Mar 14 13:04:39 2015	(r279984)
@@ -321,7 +321,6 @@ skip:
 		mtx_unlock(&e->lock);
 	}
 
-	sbuf_putc(sb, 0); /* nullterm */
 	rc = sbuf_finish(sb);
 	sbuf_delete(sb);
 

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Sat Mar 14 13:02:08 2015	(r279983)
+++ head/sys/dev/cxgbe/t4_main.c	Sat Mar 14 13:04:39 2015	(r279984)
@@ -5087,7 +5087,6 @@ sysctl_int_array(SYSCTL_HANDLER_ARGS)
 	for (i = arg1; arg2; arg2 -= sizeof(int), i++)
 		sbuf_printf(&sb, "%d ", *i);
 	sbuf_trim(&sb);
-	sbuf_putc(&sb, 0); /* nullterm */
 	sbuf_finish(&sb);
 	rc = sysctl_handle_string(oidp, sbuf_data(&sb), sbuf_len(&sb), req);
 	sbuf_delete(&sb);