From 264f62313c6601fa962ab17eef570aa08d9e11b5 Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Mon, 28 Sep 2009 16:08:34 -0400 Subject: [PATCH] fix marker listing output --- libust/tracectl.c | 2 +- libustcmd/ustcmd.c | 2 +- ust/ust.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libust/tracectl.c b/libust/tracectl.c index d6726d4..17d28dc 100644 --- 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 bbb6928..49b76f5 100644 --- 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 d056745..3f87c73 100644 --- 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, -- 2.34.1