[Glibc-bsd-commits] r5997 - in trunk/ctfutils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-04-10 21:11:48 +0000 (Sun, 10 Apr 2016)
New Revision: 5997

Added:
   trunk/ctfutils/debian/patches/sou_too_many_values.diff
Modified:
   trunk/ctfutils/debian/changelog
   trunk/ctfutils/debian/patches/series
Log:
Turn a "sou %s has too many values" error into a warning;
skip encoding struct/unions too large.


Modified: trunk/ctfutils/debian/changelog
===================================================================
--- trunk/ctfutils/debian/changelog	2016-04-10 21:10:53 UTC (rev 5996)
+++ trunk/ctfutils/debian/changelog	2016-04-10 21:11:48 UTC (rev 5997)
@@ -6,6 +6,8 @@
     - compat_opensolaris.diff
     - ulong_t.diff
   * Now using Standards-Version 3.9.8 (no changes needed)
+  * Turn a "sou %s has too many values" error into a warning;
+    skip encoding struct/unions too large.
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 10 Apr 2016 20:58:12 +0100
 

Modified: trunk/ctfutils/debian/patches/series
===================================================================
--- trunk/ctfutils/debian/patches/series	2016-04-10 21:10:53 UTC (rev 5996)
+++ trunk/ctfutils/debian/patches/series	2016-04-10 21:11:48 UTC (rev 5997)
@@ -9,3 +9,4 @@
 # Patches that are likely to be Debian-specific
 makefile.diff
 mips64.diff
+sou_too_many_values.diff

Added: trunk/ctfutils/debian/patches/sou_too_many_values.diff
===================================================================
--- trunk/ctfutils/debian/patches/sou_too_many_values.diff	                        (rev 0)
+++ trunk/ctfutils/debian/patches/sou_too_many_values.diff	2016-04-10 21:11:48 UTC (rev 5997)
@@ -0,0 +1,20 @@
+Date: Sun, 10 Apr 2016 21:54:27 +0100
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: skip encoding struct/union with >CTF_MAX_VLEN members
+
+Turn a "sou %s has too many values" error into a warning;
+skip encoding struct/unions too large.
+
+--- a/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
++++ b/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
+@@ -383,8 +383,9 @@
+ 			i++; /* count up struct or union members */
+ 
+ 		if (i > CTF_MAX_VLEN) {
+-			terminate("sou %s has too many members: %d > %d\n",
++			warning("sou %s has too many members: %d > %d\n",
+ 			    tdesc_name(tp), i, CTF_MAX_VLEN);
++			break;
+ 		}
+ 
+ 		if (tp->t_type == STRUCT)