Module Name:    src
Committed By:   snj
Date:           Mon Jun 29 17:18:10 UTC 2015

Modified Files:
        src/external/cddl/osnet/dist/tools/ctf/cvt [netbsd-7]: dwarf.c

Log Message:
Pull up following revision(s) (requested by chs in ticket #855):
        external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c: revision 1.11
don't fail for anonymous unions.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 \
    src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.10 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.10.2.1
--- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.10	Sat Apr  5 23:33:15 2014
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c	Mon Jun 29 17:18:10 2015
@@ -1162,6 +1162,14 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t **
 			    continue;
 			}
 
+			/*
+			 * anonymous union members are OK.
+			 * XXX: we should consistently use NULL, instead of ""
+			 */
+			if (mt->t_type == UNION &&
+			    (mt->t_name == NULL || mt->t_name[0] == '\0'))
+			    continue;
+
 			printf("%s unresolved type = %d (%s)\n", tdesc_name(tdp),
 				mt->t_type, tdesc_name(mt));
 			dw->dw_nunres++;

Reply via email to