fix marker listing output

diff --git a/libust/tracectl.c b/libust/tracectl.c
index d6726d4fc53290ffcd7d7b05cc6ed062d8d32e0a..17d28dca61394f744077fea45f5fea1bf5d17e43 100644 (file)
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -121,7 +121,7 @@ static void print_markers(FILE *fp)
        marker_iter_start(&iter);
 
        while(iter.marker) {
-               fprintf(fp, "marker: %s_%s %d \"%s\"\n", iter.marker->channel, iter.marker->name, (int)imv_read(iter.marker->state), iter.marker->format);
+               fprintf(fp, "marker: %s/%s %d \"%s\"\n", iter.marker->channel, iter.marker->name, (int)imv_read(iter.marker->state), iter.marker->format);
                marker_iter_next(&iter);
        }
        unlock_markers();

diff --git a/libustcmd/ustcmd.c b/libustcmd/ustcmd.c
index bbb6928c3bff3fda77e02b380d93305d75b9e9cb..49b76f541af9f5c8bd883093d117f4c7e8b4d09d 100644 (file)
--- a/libustcmd/ustcmd.c
+++ b/libustcmd/ustcmd.c
@@ -255,7 +255,7 @@ int ustcmd_get_cmsf(struct marker_status **cmsf, const pid_t pid)
        while (big_str[i] != '\0') {
                char state;
 
-               sscanf(big_str + i, "%a[^/]/%a[^ ] %c %a[^\n]",
+               sscanf(big_str + i, "marker: %a[^/]/%a[^ ] %c %a[^\n]",
                        &tmp_cmsf[cmsf_ind].channel,
                        &tmp_cmsf[cmsf_ind].marker,
                        &state,

diff --git a/ust/ust.c b/ust/ust.c
index d05674535dfbd5d4c9ecf3fdc0b5cb807ee4842d..3f87c73454ac0b6460177a07d491467a265987d9 100644 (file)
--- a/ust/ust.c
+++ b/ust/ust.c
@@ -310,7 +310,7 @@ int main(int argc, char *argv[])
                                unsigned int i = 0;
                                while (cmsf[i].channel != NULL) {
                                        printf("{PID: %u, channel/marker: %s/%s, "
-                                               "state: %u, fs: %s}\n",
+                                               "state: %u, fmt: %s}\n",
                                                (unsigned int) *pidit,
                                                cmsf[i].channel,
                                                cmsf[i].marker,