pgen: Declare steppers and so on as being `pgen_proc's.

Just saves some mental effort reading them, and finger effort writing
them.

diff --git a/dsa.h b/dsa.h
index 95bd156f323f4fd878dbe6758e793a81c0ee73f6..48ed07d91a6bd51123dad12d46dacf54cb5e85aa 100644 (file)
--- a/dsa.h
+++ b/dsa.h
@@ -130,7 +130,7 @@ typedef struct dsa_stepctx {
  * divisibility by small primes.
  */
 
  * divisibility by small primes.
  */
 

-extern int dsa_step(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc dsa_step;

 
 /*----- Functions provided ------------------------------------------------*/
 
 
 /*----- Functions provided ------------------------------------------------*/
 

diff --git a/limlee.h b/limlee.h
index 9c7b357c50140c6e528b5a06ac9b7c2fac1e1e2a..6ccb8a4eab0583d48043724eafe6a68b1fc95709 100644 (file)
--- a/limlee.h
+++ b/limlee.h
@@ -95,7 +95,7 @@ typedef struct limlee_primeops {
 
 /*----- The Lim-Lee stepper function --------------------------------------*/
 
 
 /*----- The Lim-Lee stepper function --------------------------------------*/
 

-extern int limlee_step(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc limlee_step;

 
 /*----- Functions provided ------------------------------------------------*/
 
 
 /*----- Functions provided ------------------------------------------------*/
 

diff --git a/pgen.h b/pgen.h
index 4bc90460c7fa1aa70bb6e9e156c377b8f1486488..548fadb89cdf1c9493322f198dd1eb17625d07ef 100644 (file)
--- a/pgen.h
+++ b/pgen.h
@@ -145,7 +145,7 @@ typedef struct pgen_filterctx {
   pfilt f;                             /* The rapid prime filter */
 } pgen_filterctx;
 
   pfilt f;                             /* The rapid prime filter */
 } pgen_filterctx;
 

-extern int pgen_filter(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_filter;

 
 /* --- @pgen_jump@ --- *
  *
 
 /* --- @pgen_jump@ --- *
  *


@@ -158,7 +158,7 @@ typedef struct pgen_jumpctx {
   pfilt f;
 } pgen_jumpctx;
 
   pfilt f;
 } pgen_jumpctx;
 

-extern int pgen_jump(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_jump;

 
 /* --- @pgen_test@ --- *
  *
 
 /* --- @pgen_test@ --- *
  *


@@ -166,7 +166,7 @@ extern int pgen_jump(int /*rq*/, pgen_event */*ev*/, void */*p*/);
  * @rabin@ context.
  */
 
  * @rabin@ context.
  */
 

-extern int pgen_test(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_test;

 
 /*----- Safe prime functions ----------------------------------------------*/
 
 
 /*----- Safe prime functions ----------------------------------------------*/
 


@@ -180,7 +180,7 @@ typedef struct pgen_safestepctx {
   pfilt q, p;
 } pgen_safestepctx;
 
   pfilt q, p;
 } pgen_safestepctx;
 

-extern int pgen_safestep(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_safestep;

 
 /* --- @pgen_safejump@ --- *
  *
 
 /* --- @pgen_safejump@ --- *
  *


@@ -193,7 +193,7 @@ typedef struct pgen_safejumpctx {
   pfilt p, jp;
 } pgen_safejumpctx;
 
   pfilt p, jp;
 } pgen_safejumpctx;
 

-extern int pgen_safejump(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_safejump;

 
 /* --- @pgen_safetest@ --- *
  *
 
 /* --- @pgen_safetest@ --- *
  *


@@ -205,7 +205,7 @@ typedef struct pgen_safetestctx {
   rabin q, p;
 } pgen_safetestctx;
 
   rabin q, p;
 } pgen_safetestctx;
 

-extern int pgen_safetest(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_safetest;

 
 /*----- Miscellaneous steppers and testers --------------------------------*/
 
 
 /*----- Miscellaneous steppers and testers --------------------------------*/
 


@@ -223,7 +223,7 @@ typedef struct pgen_gcdstepctx {
  * %$\gcd(p, r) \le max$%.
  */
 
  * %$\gcd(p, r) \le max$%.
  */
 

-extern int pgen_gcdstep(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_gcdstep;

 
 /*----- Standard event handlers -------------------------------------------*/
 
 
 /*----- Standard event handlers -------------------------------------------*/
 


@@ -232,21 +232,21 @@ extern int pgen_gcdstep(int /*rq*/, pgen_event */*ev*/, void */*p*/);
  * Displays a spinning baton to show progress.
  */
 
  * Displays a spinning baton to show progress.
  */
 

-extern int pgen_evspin(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_evspin;

 
 /* --- @pgen_ev@ --- *
  *
  * Traditional event handler, shows dots for each test.
  */
 
 
 /* --- @pgen_ev@ --- *
  *
  * Traditional event handler, shows dots for each test.
  */
 

-extern int pgen_ev(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_ev;

 
 /* --- @pgen_subev@ --- *
  *
  * Subsidiary event handler, mainly for Lim-Lee searches and so on.
  */
 
 
 /* --- @pgen_subev@ --- *
  *
  * Subsidiary event handler, mainly for Lim-Lee searches and so on.
  */
 

-extern int pgen_subev(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc pgen_subev;

 
 /*----- The main driver ---------------------------------------------------*/
 
 
 /*----- The main driver ---------------------------------------------------*/
 

diff --git a/prim.h b/prim.h
index 193d0582b9c7e666ab8877eaa98c25c08db98277..e0788c05695403e050fc639ef676c0b24ca8d234 100644 (file)
--- a/prim.h
+++ b/prim.h
@@ -76,11 +76,11 @@ typedef struct prim_ctx {
 
 /* --- @prim_test@ --- */
 
 
 /* --- @prim_test@ --- */
 

-extern int prim_test(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc prim_test;

 
 /* --- @prim_step@ --- */
 
 
 /* --- @prim_step@ --- */
 

-extern int prim_step(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc prim_step;

 
 /*----- That's all, folks -------------------------------------------------*/
 
 
 /*----- That's all, folks -------------------------------------------------*/