From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 4 Apr 2013 14:24:23 +0000 (+0200)
Subject: Remove useless code.
X-Git-Tag: v3_9_90~412^2~30
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b70f72945a9cf30aee4d6ee74c510e9553f9a620

Remove useless code.
---

diff --git a/tools/tesh/run_context.c b/tools/tesh/run_context.c
index 747976806c..c6113367ad 100644
--- a/tools/tesh/run_context.c
+++ b/tools/tesh/run_context.c
@@ -777,38 +777,20 @@ void *rctx_wait(void *r)
     xbt_dynar_free(&a);
   }
 
-  { // Sorting output wanted
+  if (rctx->output_sort) { // Sorting output wanted
+    char *newbuf;
     xbt_dynar_t a = xbt_str_split(rctx->output_wanted->data, "\n");
-    xbt_dynar_t b = xbt_dynar_new(sizeof(char *), NULL);
-    unsigned cpt;
-    char *str;
-    xbt_dynar_foreach(a, cpt, str) {
-      if (strncmp(str, "TESH_ERROR ", (sizeof "TESH_ERROR ") - 1) == 0) {
-        XBT_CRITICAL("%s", str);
-        errcode = 1;
-      } else if (coverage &&
-                 strncmp(str, "profiling:", (sizeof "profiling:") - 1) == 0) {
-        XBT_DEBUG("Remove line [%u]: '%s'", cpt, str);
-      } else {
-        xbt_dynar_push_as(b, char *, str);
-      }
-    }
 
-    if (rctx->output_sort) {
-      stable_sort(b);
-      /* If empty lines moved in first position, remove them */
-      while (!xbt_dynar_is_empty(b) && *xbt_dynar_getfirst_as(b, char*) == '\0')
-        xbt_dynar_shift(b, NULL);
-    }
+    stable_sort(a);
+    /* If empty lines moved in first position, remove them */
+    while (!xbt_dynar_is_empty(a) && *xbt_dynar_getfirst_as(a, char*) == '\0')
+        xbt_dynar_shift(a, NULL);
 
-    if (rctx->output_sort || xbt_dynar_length(b) != xbt_dynar_length(a)) {
-      char *newbuf = xbt_str_join(b, "\n");
-      strcpy(rctx->output_wanted->data, newbuf);
-      rctx->output_wanted->used = strlen(newbuf);
-      xbt_free(newbuf);
-    }
+    newbuf = xbt_str_join(a, "\n");
+    strcpy(rctx->output_wanted->data, newbuf);
+    rctx->output_wanted->used = strlen(newbuf);
+    xbt_free(newbuf);
 
-    xbt_dynar_free(&b);
     xbt_dynar_free(&a);
   }
   xbt_strbuff_chomp(rctx->output_got);