From 17b1793f3c7f8282c9d59cb7233c387e22e07a92 Mon Sep 17 00:00:00 2001
From: John Honniball <coredump@virginmedia.com>
Date: Sat, 8 Aug 2020 10:21:37 +0100
Subject: [PATCH] Make argument-parsing code consistent across all 'hpgllib'
 programs.

---
 allover12.c       | 5 ++---
 allover13.c       | 3 +--
 arches.c          | 5 ++---
 celticstep.c      | 3 +--
 circle_lines.c    | 5 ++---
 coords.c          | 2 +-
 cs_rosette.c      | 3 +--
 curve_stitching.c | 3 +--
 dala1.c           | 2 +-
 dala2.c           | 5 ++---
 dala2c.c          | 5 ++---
 dala3.c           | 2 +-
 ellipse.c         | 5 ++---
 fraserspiral.c    | 2 +-
 isogrid.c         | 5 ++---
 lissajous.c       | 5 ++---
 pappus.c          | 5 ++---
 pconic.c          | 5 ++---
 piscis.c          | 2 +-
 spiralsq.c        | 2 +-
 sqinsq.c          | 3 +--
 star_grid.c       | 5 ++---
 sutpent.c         | 3 +--
 ternary_arcs.c    | 2 +-
 24 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/allover12.c b/allover12.c
index 81b62cc..4c228b6 100644
--- 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
index f7f7b1e..c65888f 100644
--- 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
index 742ce7c..fab86ee 100644
--- 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
index 6a17b2f..fc8f77b 100644
--- 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
index f537685..759a71b 100644
--- 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
index a6a9602..37c1d47 100644
--- 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
index dfde809..d87a772 100644
--- 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
index 9b2a7ba..be33a82 100644
--- 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
index c2ef2e2..5d622d4 100644
--- 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
index 3b86fff..2fcbab5 100644
--- 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
index b443df3..096375c 100644
--- 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
index ed926bd..d67d9af 100644
--- 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
index 0d4b570..f52179a 100644
--- 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
index 7bb1994..981ae28 100644
--- 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
index 4270e8a..4c16c02 100644
--- 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
index 73e557c..767106f 100644
--- 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
index 4932387..334d1ac 100644
--- 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
index f5b8be3..8107a4d 100644
--- 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
index d58b3de..cd6854b 100644
--- 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
index e920122..53c618e 100644
--- 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
index 206a9a0..4d8d9ee 100644
--- 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
index 720b6f8..f811b80 100644
--- 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
index eb77609..55c85e8 100644
--- 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
index 3636eee..09484b9 100644
--- 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);
       }
    }