Make argument-parsing code consistent across all 'hpgllib' programs.

anachrocomputer · Aug 8, 2020 · 17b1793 · 17b1793
1 parent d947011
commit 17b1793
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 52 deletions.
diff --git a/allover12.c b/allover12.c
@@ -25,7 +25,7 @@ int main(int argc, char * const argv[])
    double d2;
    double maxx, maxy;
 
-   while ((opt = getopt (argc, argv, "no:p:s:t:v:")) != -1) {
+   while ((opt = getopt(argc, argv, "no:p:s:t:v:")) != -1) {
       switch (opt) {
       case 'n':
       case 'o':
@@ -36,8 +36,7 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
          exit(EXIT_FAILURE);
       }

diff --git a/allover13.c b/allover13.c
@@ -40,8 +40,7 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
          exit(EXIT_FAILURE);
       }

diff --git a/arches.c b/arches.c
@@ -31,10 +31,9 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/celticstep.c b/celticstep.c
@@ -51,8 +51,7 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
          exit(EXIT_FAILURE);
       }

diff --git a/circle_lines.c b/circle_lines.c
@@ -46,10 +46,9 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/coords.c b/coords.c
@@ -31,7 +31,7 @@ int main(int argc, char * const argv[])
       default: /* '?' */
          fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/cs_rosette.c b/cs_rosette.c
@@ -46,8 +46,7 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
          exit(EXIT_FAILURE);
       }

diff --git a/curve_stitching.c b/curve_stitching.c
@@ -43,8 +43,7 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
          exit(EXIT_FAILURE);
       }

diff --git a/dala1.c b/dala1.c
@@ -38,7 +38,7 @@ int main(int argc, char * const argv[])
       default: /* '?' */
          fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/dala2.c b/dala2.c
@@ -78,10 +78,9 @@ int main (int argc, char * const argv[])
          plotopt (opt, optarg);
          break;
       default: /* '?' */
-         fprintf (stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf (stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf (stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit (EXIT_FAILURE);
+         exit (EXIT_FAILURE);
       }
    }
 

diff --git a/dala2c.c b/dala2c.c
@@ -46,10 +46,9 @@ int main (int argc, char * const argv[])
          plotopt (opt, optarg);
          break;
       default: /* '?' */
-         fprintf (stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf (stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf (stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit (EXIT_FAILURE);
+         exit (EXIT_FAILURE);
       }
    }
 

diff --git a/dala3.c b/dala3.c
@@ -38,7 +38,7 @@ int main(int argc, char * const argv[])
       default: /* '?' */
          fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/ellipse.c b/ellipse.c
@@ -31,10 +31,9 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/fraserspiral.c b/fraserspiral.c
@@ -35,7 +35,7 @@ int main(int argc, char * const argv[])
       default: /* '?' */
          fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/isogrid.c b/isogrid.c
@@ -23,7 +23,7 @@ int main(int argc, char * const argv[])
    double xc, yc;
    double maxx, maxy;
 
-   while ((opt = getopt (argc, argv, "no:p:s:t:v:")) != -1) {
+   while ((opt = getopt(argc, argv, "no:p:s:t:v:")) != -1) {
       switch (opt) {
       case 's':
       case 'n':
@@ -34,8 +34,7 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
          exit(EXIT_FAILURE);
       }

diff --git a/lissajous.c b/lissajous.c
@@ -28,10 +28,9 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/pappus.c b/pappus.c
@@ -35,10 +35,9 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/pconic.c b/pconic.c
@@ -73,10 +73,9 @@ int main (int argc, char * const argv[])
          plotopt (opt, optarg);
          break;
       default: /* '?' */
-         fprintf (stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf (stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf (stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit (EXIT_FAILURE);
+         exit (EXIT_FAILURE);
       }
    }
 

diff --git a/piscis.c b/piscis.c
@@ -29,7 +29,7 @@ int main(int argc, char * const argv[])
       default: /* '?' */
          fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/spiralsq.c b/spiralsq.c
@@ -38,7 +38,7 @@ int main(int argc, char * const argv[])
       default: /* '?' */
          fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/sqinsq.c b/sqinsq.c
@@ -38,8 +38,7 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
          exit(EXIT_FAILURE);
       }

diff --git a/star_grid.c b/star_grid.c
@@ -46,10 +46,9 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }
 

diff --git a/sutpent.c b/sutpent.c
@@ -39,8 +39,7 @@ int main(int argc, char * const argv[])
          plotopt(opt, optarg);
          break;
       default: /* '?' */
-         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n",
-                  argv[0]);
+         fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
          exit(EXIT_FAILURE);
       }

diff --git a/ternary_arcs.c b/ternary_arcs.c
@@ -39,7 +39,7 @@ int main(int argc, char * const argv[])
       default: /* '?' */
          fprintf(stderr, "Usage: %s [-p pen] [-s <size>] [-t title]\n", argv[0]);
          fprintf(stderr, "       <size> ::= A1 | A2 | A3 | A4 | A5\n");
-//       exit(EXIT_FAILURE);
+         exit(EXIT_FAILURE);
       }
    }