Fix gtx_create calls to all share a prototype

All of the different _create calls need to share a prototype, so
function pointers can be stuffed into a structure. Use an anonymous
pointer so that we can acheive this.

Reviewed-on: http://gerrit.openafs.org/187
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/gtx/X11windows.c b/src/gtx/X11windows.c
index 1473179..b3d853c 100644 (file)
--- a/src/gtx/X11windows.c
+++ b/src/gtx/X11windows.c
@@ -121,7 +121,7 @@ gator_X11gwin_init(int adebug)
  *------------------------------------------------------------------------*/
 
 struct gwin *
-gator_X11gwin_create(struct gator_X11gwin_params *params)
+gator_X11gwin_create(void *rock)
 {                              /*gator_X11gwin_create */
 
     static char rn[] = "gator_X11gwin_create"; /*Routine name */

diff --git a/src/gtx/curseswindows.c b/src/gtx/curseswindows.c
index 7dc59b8..6d60096 100644 (file)
--- a/src/gtx/curseswindows.c
+++ b/src/gtx/curseswindows.c
@@ -195,10 +195,10 @@ gator_cursesgwin_init(int adebug)
  *------------------------------------------------------------------------*/
 
 struct gwin *
-gator_cursesgwin_create(struct gator_cursesgwin_params *params)
-{                              /*gator_cursesgwin_create */
-
+gator_cursesgwin_create(void * rock)
+{
     static char rn[] = "gator_cursesgwin_create";      /*Routine name */
+    struct gator_cursesgwin_params *params = (struct gator_cursesgwin_params *)rock;
     struct gwin *newgwin;      /*Ptr to new curses window */
     struct gator_cursesgwin *c_data;   /*Ptr to curses-specific data */
     WINDOW *newcursgwin;       /*Ptr to new curses window */

diff --git a/src/gtx/dumbwindows.c b/src/gtx/dumbwindows.c
index dbed3d4..446b9e5 100644 (file)
--- a/src/gtx/dumbwindows.c
+++ b/src/gtx/dumbwindows.c
@@ -117,11 +117,10 @@ gator_dumbgwin_init(int adebug)
  *------------------------------------------------------------------------*/
 
 struct gwin *
-gator_dumbgwin_create(struct gator_dumbgwin_params *params)
+gator_dumbgwin_create(void *rock)
 {                              /*gator_dumbgwin_create */
 
     static char rn[] = "gator_dumbgwin_create";        /*Routine name */
-
     if (dumb_debug)
        fprintf(stderr, "[%s:%s] Called\n", mn, rn);
 

diff --git a/src/gtx/gtxX11win.h b/src/gtx/gtxX11win.h
index a60f07c..ca76933 100644 (file)
--- a/src/gtx/gtxX11win.h
+++ b/src/gtx/gtxX11win.h
@@ -50,7 +50,7 @@ extern int gator_X11gwin_init(int);
 
 /*X11 window's creation routine*/
 
-extern struct gwin *gator_X11gwin_create(struct gator_X11gwin_params *);
+extern struct gwin *gator_X11gwin_create(void *);
     /*
      * Summary:
      *    Create a X11 window.

diff --git a/src/gtx/gtxcurseswin.h b/src/gtx/gtxcurseswin.h
index 19b6e11..9c6dd07 100644 (file)
--- a/src/gtx/gtxcurseswin.h
+++ b/src/gtx/gtxcurseswin.h
@@ -58,7 +58,7 @@ extern int gator_cursesgwin_init(int adebug);
 
 /*Curses window's creation routine*/
 
-extern struct gwin *gator_cursesgwin_create(struct gator_cursesgwin_params *);
+extern struct gwin *gator_cursesgwin_create(void *);
     /*
      * Summary:
      *    Create a curses window.

diff --git a/src/gtx/gtxdumbwin.h b/src/gtx/gtxdumbwin.h
index 771439c..3a03741 100644 (file)
--- a/src/gtx/gtxdumbwin.h
+++ b/src/gtx/gtxdumbwin.h
@@ -50,7 +50,7 @@ extern int gator_dumbgwin_init(int);
 
 /*Dumb window's creation routine*/
 
-extern struct gwin *gator_dumbgwin_create(struct gator_dumbgwin_params *);
+extern struct gwin *gator_dumbgwin_create(void *);
     /*
      * Summary:
      *    Create a dumb window.