Fix an argument parsing error in libextra and cleanup

1 files changed, 2 insertions, 3 deletions

diff --git a/extra.h b/extra.h
index 9f27a80..990d2e0 100644
--- a/extra.h
+++ b/extra.h
@@ -83,7 +83,7 @@ long unsigned int _rt_period;
 static void _rt_load_params_itrl(int argc, char **argv) {
 #ifdef PAIRED
     if (argc != (8 + LITMUS*2) && argc != (9 + LITMUS*2)) {
-        fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?>\n", argv[0]);
+        fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?> <pairID>\n", argv[0]);
 #else
     if (argc != (6 + LITMUS*2)) {
         fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);
@@ -120,7 +120,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     _rt_will_output = atoi(argv[7]);
     char *pairId;
     int end;
-    if (argc > 7) {
+    if (argc > 8) {
         pairId = argv[8];
         end = 9;
     } else {
@@ -218,7 +218,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     rt_param.phase = 0;
     rt_param.priority = LITMUS_LOWEST_PRIORITY;
     rt_param.cls = crit;
-    rt_param.release_policy = TASK_PERIODIC;
     rt_param.budget_policy = NO_ENFORCEMENT;
     rt_param.cpu = _rt_core;
     rt_param.release_policy = TASK_PERIODIC;