Fix some YAML errors

3 files changed, 10 insertions, 6 deletions

diff --git a/src/fig0_13.cpp b/src/fig0_13.cpp
index 9b8c2c0..dd053b7 100644
--- a/src/fig0_13.cpp
+++ b/src/fig0_13.cpp
@@ -159,10 +159,14 @@ fig_result_t fig0_13(fig0_common_t& fig0, const display_settings_t &disp)
                 }
             }
 
-            std::string ua_data = "UA Data=";
+            std::string ua_data = "UA Data=[";
             for (size_t i = 0; i < effective_uadata_len; i++) {
-                ua_data += strprintf("0x%02x ", f[k + i]);
+                ua_data += strprintf("0x%02x", f[k + i]);
+                if (i + 1 < effective_uadata_len) {
+                    ua_data += ", ";
+                }
             }
+            ua_data += "]";
             r.msgs.emplace_back(2, move(ua_data));
         }
 
diff --git a/src/fig0_7.cpp b/src/fig0_7.cpp
index 7130cf7..eae6a71 100644
--- a/src/fig0_7.cpp
+++ b/src/fig0_7.cpp
@@ -46,8 +46,8 @@ fig_result_t fig0_7(fig0_common_t& fig0, const display_settings_t &disp)
         const uint8_t services = service_count >> 10;
         const uint16_t count = service_count & 0x3FF;
 
-        r.msgs.push_back(strprintf("Services =%d", services));
-        r.msgs.push_back(strprintf("Count =%d", count));
+        r.msgs.push_back(strprintf("Services=%d", services));
+        r.msgs.push_back(strprintf("Count=%d", count));
     }
 
     r.complete = true;
diff --git a/src/fig1.cpp b/src/fig1.cpp
index d3d4017..71e4508 100644
--- a/src/fig1.cpp
+++ b/src/fig1.cpp
@@ -77,7 +77,7 @@ fig_result_t fig1_select(fig1_common_t& fig1, const display_settings_t &disp)
 
                     r.msgs.push_back(strprintf("Label=\"%s\"", fig1.ensemble.label.label().c_str()));
                     r.msgs.push_back(strprintf("Short label mask=0x%04X", flag));
-                    r.msgs.push_back(strprintf("Short label=%s", fig1.ensemble.label.shortlabel().c_str()));
+                    r.msgs.push_back(strprintf("Short label=\"%s\"", fig1.ensemble.label.shortlabel().c_str()));
                 }
             }
             break;
@@ -96,7 +96,7 @@ fig_result_t fig1_select(fig1_common_t& fig1, const display_settings_t &disp)
                         r.msgs.push_back(strprintf("Service ID=0x%04X", sid));
                         r.msgs.push_back(strprintf("Label=\"%s\"", service.label.label().c_str()));
                         r.msgs.push_back(strprintf("Short label mask=0x%04X", flag));
-                        r.msgs.push_back(strprintf("Short label=%s", service.label.shortlabel().c_str()));
+                        r.msgs.push_back(strprintf("Short label=\"%s\"", service.label.shortlabel().c_str()));
                     }
                     catch (ensemble_database::not_found &e) {
                         r.errors.push_back("Not yet in DB");