10812 ctf tools shouldn't add blank labels
10813 ctf symbol mapping needs work
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

@@ -8,11 +8,11 @@
  * source.  A copy of the CDDL is also available via the Internet at
  * http://www.illumos.org/license/CDDL.
  */
 
 /*
- * Copyright 2015 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
  * Main conversion entry points. This has been designed such that there can be
  * any number of different conversion backends. Currently we only have one that

@@ -166,13 +166,11 @@
         }
 
         /*
          * Succsesful conversion.
          */
-        if (fp != NULL) {
-                if (label == NULL)
-                        label = "";
+        if (fp != NULL && label != NULL) {
                 if (ctf_add_label(fp, label, fp->ctf_typemax, 0) == CTF_ERR) {
                         *errp = ctf_errno(fp);
                         ctf_close(fp);
                         return (NULL);
                 }