Merge branch 'master' of ssh://cvs/cvs/proj/litmus/repo/ft_tools

2 files changed, 4 insertions, 4 deletions

diff --git a/src/ftcat.c b/src/ftcat.c
index b317cba..f1a269f 100644
--- a/src/ftcat.c
+++ b/src/ftcat.c
@@ -54,9 +54,7 @@ static void cat2stdout(int fd)
 static void usage(void)
 {
         fprintf(stderr, 
-                "Usage: ftcat <ft device> TS1 TS2 ....\n\n"
-                //              "where TS1, TS2, ... is one of "
-                //              " sched, tick, plug_tick, plug_sche"
+                "Usage: ftcat <ft device> TS1 TS2 ...."
                 "\n");
         exit(1);
 }
diff --git a/src/timestamp.c b/src/timestamp.c
index 1df252a..f3f7861 100644
--- a/src/timestamp.c
+++ b/src/timestamp.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <string.h>
 
 #include "timestamp.h"
@@ -46,7 +47,8 @@ int  str2event(const char* str, cmd_t *id)
                         *id = event_table[i].id;
                         return 1;
                 }
-        return 0;
+        /* try to parse it as a number */
+        return sscanf(str, "%u", id);
 }
 
 const char* event2str(cmd_t id)