Removed obsolete test code and disabled other tests

xorriso/parse_exec.c

@@ -1,7 +1,7 @@
 
 /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2 or later.
 
@@ -1741,18 +1741,15 @@ next_command:;
  } else if(strcmp(cmd,"test")==0) { /* This option does not exist. */
    /* install temporary test code here */;
 
+if (0) {
 /* Test setup for for Xorriso_push_outlists() et.al. */
 /* Test setup for Xorriso_parse_line */
-{
    int stack_handle = -1, line_count= 0;
    struct Xorriso_lsT *result_list, *info_list;
    int Xorriso_process_msg_lists(struct XorrisO *xorriso,
                                      struct Xorriso_lsT *result_list,
                                      struct Xorriso_lsT *info_list,
                                      int *line_count, int flag);
-   int pargc, pflag, max_words;
-   char **pargv= NULL, *pline, *prefix, *separators, *sev1, *sev2, *name;
-   int available;
 
    (*idx)++;
    if(strcmp(arg1, "push") == 0) {
@@ -1796,75 +1793,6 @@ next_command:;
      ret= Xorriso_stop_msg_watcher(xorriso, 0);
      fprintf(stderr, "xorriso -test: Xorriso_stop_msg_watcher() = %d\n", ret);
 
-   } else if(strcmp(arg1, "parse") == 0 || strcmp(arg1, "nullparse") == 0) {
-     (*idx)+= 5;
-     pline= "";
-     if(*idx - 5 < argc)
-       pline= argv[*idx - 5];
-     prefix= "";
-     if(*idx -  4 < argc)
-       prefix= argv[*idx - 4];
-     separators= "";
-     if(*idx - 3 < argc)
-       separators= argv[*idx - 3];
-     max_words= 0;
-     if(*idx - 2 < argc)
-       sscanf(argv[*idx - 2], "%d", &max_words);
-     pflag= 0;
-     if(*idx - 1 < argc)
-       sscanf(argv[*idx - 1], "%d", &pflag);
-     ret= Xorriso_parse_line(strcmp(arg1, "nullparse") == 0 ? NULL : xorriso, 
-                             pline, prefix, separators, max_words,
-                             &pargc, &pargv, pflag);
-     fprintf(stderr,
-        "xorriso_test: Xorriso_parse_line: ret= %d , argc= %d , argv= 0x%lX\n",
-        ret, pargc, (unsigned long) pargv);
-     if(ret == 1)
-       for(i= 0; i < pargc; i++)
-         fprintf(stderr, "xorriso_test: argv[%d]= '%s'\n", i, pargv[i]);
-     Xorriso__dispose_words(&pargc, &pargv);
-   } else if(strcmp(arg1, "severity_cmp") == 0) {
-     (*idx)+= 2;
-     sev1= "FATAL";
-     if(*idx - 2 < argc)
-       sev1= argv[*idx - 2];
-     sev2= "FATAL";
-     if(*idx - 1 < argc)
-       sev2= argv[*idx - 1];
-     ret= Xorriso__severity_cmp(sev1, sev2);
-     fprintf(stderr,
-             "xorriso_test: Xorriso__severity_cmp(\"%s\", \"%s\")= %d\n",
-             sev1, sev2, ret);
-   
-   } else if(strcmp(arg1, "sieve_big") == 0) {
-     ret= Xorriso_sieve_big(xorriso, 0);
-     fprintf(stderr, "xorriso_test: Xorriso_sieve_big: ret= %d\n", ret);
-
-   } else if(strcmp(arg1, "sieve_get_result") == 0) {
-     (*idx)++;
-     name= "Media summary:";
-     if(*idx - 1 < argc)
-       name= argv[*idx - 1];
-     ret= Xorriso_sieve_get_result(xorriso, name, &pargc, &pargv, &available,
-                                   0);
-     fprintf(stderr,
-         "xorriso_test: _sieve_get_result: ret= %d , argc= %d , argv= 0x%lX\n",
-         ret, pargc, (unsigned long) pargv);
-     if(ret == 1)
-       for(i= 0; i < pargc; i++)
-         fprintf(stderr, "xorriso_test: argv[%d]= '%s'\n", i, pargv[i]);
-     Xorriso__dispose_words(&pargc, &pargv);
-     fprintf(stderr, "xorriso_test: available= %d\n", available);
-
-   } else if(strcmp(arg1, "sieve_clear") == 0) {
-     ret= Xorriso_sieve_clear_results(xorriso, 0);
-     fprintf(stderr, "xorriso_test: Xorriso_sieve_clear_results: ret= %d\n",
-                     ret);
-
-   } else if(strcmp(arg1, "sieve_dispose") == 0) {
-     ret= Xorriso_sieve_dispose(xorriso, 0);
-     fprintf(stderr, "xorriso_test: Xorriso_sieve_dispose: ret= %d\n", ret);
-
    } else if(strcmp(arg1, "help") == 0) {
      fprintf(stderr, "-test [mode] [arguments]\n");
      fprintf(stderr, "   push\n");
@@ -1884,20 +1812,6 @@ next_command:;
      fprintf(stderr, "     perform Xorriso_start_msg_watcher()\n");
      fprintf(stderr, "   stop\n");
      fprintf(stderr, "     perform Xorriso_stop_msg_watcher()\n");
-     fprintf(stderr, "   parse line prefix separators max_words flag\n");
-     fprintf(stderr, "     parse by Xorriso_parse_line(xorriso, ...)\n");
-     fprintf(stderr, "   nullparse line prefix separators max_words flag\n");
-     fprintf(stderr, "     parse by Xorriso_parse_line(NULL, ...)\n");
-     fprintf(stderr, "   severity_cmp sev1 sev2\n");
-     fprintf(stderr, "     perform Xorriso__severity_cmp()\n");
-     fprintf(stderr, "   sieve_big\n");
-     fprintf(stderr, "     perform Xorriso_sieve_big()\n");
-     fprintf(stderr, "   sieve_get_result name\n");
-     fprintf(stderr, "     perform Xorriso_sieve_get_result()\n");
-     fprintf(stderr, "   sieve_clear\n");
-     fprintf(stderr, "     perform Xorriso_sieve_clear_results()\n");
-     fprintf(stderr, "   sieve_dispose\n");
-     fprintf(stderr, "     perform Xorriso_sieve_dispose()\n");
    } else {
      fprintf(stderr, "xorriso -test: unknwon mode: %s\n", arg1);
    }

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2013.01.01.152241"
+#define Xorriso_timestamP "2013.01.02.183011"