Home | History | Annotate | Download | only in yasm
      1 diff --git a/frontends/tasm/tasm.c b/frontends/tasm/tasm.c
      2 index 58954b6..568f478 100644
      3 --- a/frontends/tasm/tasm.c
      4 +++ b/frontends/tasm/tasm.c
      5 @@ -228,7 +228,6 @@ static opt_option options[] =
      6  /* version message */
      7  /*@observer@*/ static const char *version_msg[] = {
      8      PACKAGE_STRING,
      9 -    "Compiled on " __DATE__ ".",
     10      "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.",
     11      "Run yasm --license for licensing overview and summary."
     12  };
     13 diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
     14 index ff4c59e..015ae8d 100644
     15 --- a/frontends/yasm/yasm.c
     16 +++ b/frontends/yasm/yasm.c
     17 @@ -217,7 +217,6 @@ static opt_option options[] =
     18  /* version message */
     19  /*@observer@*/ static const char *version_msg[] = {
     20      PACKAGE_STRING,
     21 -    "Compiled on " __DATE__ ".",
     22      "Copyright (c) 2001-2014 Peter Johnson and other Yasm developers.",
     23      "Run yasm --license for licensing overview and summary."
     24  };
     25 diff --git a/libyasm/genmodule.c b/libyasm/genmodule.c
     26 index 867d93a..027e2fe 100644
     27 --- a/libyasm/genmodule.c
     28 +++ b/libyasm/genmodule.c
     29 @@ -58,9 +58,14 @@ main(int argc, char *argv[])
     30      include *inc;
     31      int isam = 0;
     32      int linecont = 0;
     33 -
     34 -    if (argc != 3) {
     35 -        fprintf(stderr, "Usage: %s <module.in> <Makefile[.am]>\n", argv[0]);
     36 +    char *outfile;
     37 +
     38 +    if (argc == 3) {
     39 +        outfile = OUTPUT;
     40 +    } else if (argc == 4) {
     41 +        outfile = argv[3];
     42 +    } else {
     43 +        fprintf(stderr, "Usage: %s <module.in> <Makefile[.am]> [<outfile>]\n", argv[0]);
     44          return EXIT_FAILURE;
     45      }
     46  
     47 @@ -167,10 +172,10 @@ keepgoing:
     48          fclose(in);
     49      }
     50  
     51 -    out = fopen(OUTPUT, "wt");
     52 +    out = fopen(outfile, "wt");
     53  
     54      if (!out) {
     55 -        fprintf(stderr, "Could not open `%s'.\n", OUTPUT);
     56 +        fprintf(stderr, "Could not open `%s'.\n", outfile);
     57          return EXIT_FAILURE;
     58      }
     59  
     60 @@ -181,7 +186,7 @@ keepgoing:
     61      if (!in) {
     62          fprintf(stderr, "Could not open `%s'.\n", argv[1]);
     63          fclose(out);
     64 -        remove(OUTPUT);
     65 +        remove(outfile);
     66          return EXIT_FAILURE;
     67      }
     68  
     69 diff --git a/tools/genperf/perfect.c b/tools/genperf/perfect.c
     70 index a9a14c0..e45f9c5 100644
     71 --- a/tools/genperf/perfect.c
     72 +++ b/tools/genperf/perfect.c
     73 @@ -563,7 +563,7 @@ static int perfect(
     74          if (!augment(tabb, tabh, tabq, blen, scramble, smax, &tabb[i], nkeys, 
     75                       i+1, form))
     76          {
     77 -          fprintf(stderr, "fail to map group of size %ld for tab size %ld\n", j, blen);
     78 +          /* Do not print an error. The caller may retry with a larger table. */
     79            return FALSE;
     80          }
     81  
     82