Remove remaining K&R style prototypes.

9 files changed, 18 insertions, 126 deletions

diff --git a/src/graph/view2D/buttons2d.c b/src/graph/view2D/buttons2d.c
index 3d7a4be6..226aeb26 100644
--- a/src/graph/view2D/buttons2d.c
+++ b/src/graph/view2D/buttons2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -58,12 +58,7 @@
  *****************************************************/
 
 int 
-#ifdef _NO_PROTO
-initButtons (buttons)
-buttonStruct *buttons;
-#else
 initButtons (buttonStruct *buttons)
-#endif
 {
   int ii, num = 0;
 
diff --git a/src/graph/view2D/control2d.c b/src/graph/view2D/control2d.c
index 5645e2ec..18409a49 100644
--- a/src/graph/view2D/control2d.c
+++ b/src/graph/view2D/control2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -80,11 +80,7 @@ static XPoint translateArrow[translateArrowN] = {
  ****************************/
 
 void 
-#ifdef _NO_PROTO
-writeControlTitle()
-#else
 writeControlTitle(void)
-#endif
 {
 
   int strlength;
@@ -100,12 +96,7 @@ writeControlTitle(void)
 } /* writeControlTitle() */
 
 void 
-#ifdef _NO_PROTO
-makeMessageFromData(whichGraph)
-int whichGraph;
-#else
 makeMessageFromData(int whichGraph)
-#endif
 {
   if (viewport->haveControl) {
     if ((graphStateArray[whichGraph].scaleX) > 99.0) {
@@ -144,11 +135,7 @@ makeMessageFromData(int whichGraph)
 
 
 void 
-#ifdef _NO_PROTO
-writeControlMessage()
-#else
 writeControlMessage(void)
-#endif
 {
   int                strlength;
   controlPanelStruct *cp;
@@ -171,11 +158,7 @@ writeControlMessage(void)
 /*********************************/
 
 void 
-#ifdef _NO_PROTO
-drawControlPanel()
-#else
 drawControlPanel(void)
-#endif
 {
 
   controlPanelStruct *cp;
@@ -381,12 +364,7 @@ drawControlPanel(void)
 }    /*** drawControlPanel ***/
 
 controlXY 
-#ifdef _NO_PROTO
-getControlXY(whereDoYouWantPanel)
-int whereDoYouWantPanel;
-#else
 getControlXY(int whereDoYouWantPanel)
-#endif
 {
   XWindowAttributes wAttr, wAttrib;
   controlXY         cXY;
@@ -450,11 +428,7 @@ getControlXY(int whereDoYouWantPanel)
 /************************************************/
 
 controlPanelStruct *
-#ifdef _NO_PROTO
-makeControlPanel()
-#else
 makeControlPanel(void)
-#endif
 {
 
   Window cw;
@@ -569,12 +543,7 @@ makeControlPanel(void)
    right hand corner of the viewport window. */
 
 void 
-#ifdef _NO_PROTO
-putControlPanelSomewhere(whereDoesPanelGo)
-int whereDoesPanelGo;
-#else
 putControlPanelSomewhere(int whereDoesPanelGo)
-#endif
 {
   controlPanelStruct *control;
   controlXY          whereControl;
@@ -605,11 +574,7 @@ putControlPanelSomewhere(int whereDoesPanelGo)
 /************************************/
 
 void 
-#ifdef _NO_PROTO
-clearControlMessage()
-#else
 clearControlMessage(void)
-#endif
 {
 
   strcpy(viewport->controlPanel->message,"");
diff --git a/src/graph/view2D/graph2d.c b/src/graph/view2D/graph2d.c
index 47960cd7..04d855e9 100644
--- a/src/graph/view2D/graph2d.c
+++ b/src/graph/view2D/graph2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All right reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -47,12 +47,7 @@
 
 
 void 
-#ifdef _NO_PROTO
-getGraphFromViewman(i)
-int i;
-#else
 getGraphFromViewman(int i)
-#endif
 {
  /** This routine should be called right after a read of the graph key 
      was made from the viewport manager (or defined in some other way). **/
@@ -145,12 +140,7 @@ getGraphFromViewman(int i)
 
 
 void 
-#ifdef _NO_PROTO
-freeGraph(i)
-int i;
-#else
 freeGraph(int i)
-#endif
 {
   int j;
   pointListStruct *llPtr;
diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index c7ade472..90405883 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -149,11 +149,7 @@ char    *PSfilename,    /* output file name used in user directory */
   *envAXIOM;    /* used as ps file pathnames */
 
 int
-#ifdef _NO_PROTO
-main() 
-#else
 main(void) 
-#endif
 {
 
   XGCValues       controlGCVals;
@@ -456,11 +452,7 @@ main(void)
 } /* main() */
 
 void 
-#ifdef _NO_PROTO
-mergeDatabases()
-#else
 mergeDatabases(void)
-#endif
 {
   /* using global
      rDB
diff --git a/src/graph/view2D/pot2d.c b/src/graph/view2D/pot2d.c
index 95443a4d..63b06ab3 100644
--- a/src/graph/view2D/pot2d.c
+++ b/src/graph/view2D/pot2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -41,12 +41,7 @@
 #include "all_2d.H1"
 
 mouseCoord 
-#ifdef _NO_PROTO
-getPotValue(eX,eY,xH,yH)
-  short eX,eY,xH,yH;
-#else
 getPotValue(short eX,short eY,short xH,short yH)
-#endif
 {
 
   mouseCoord whereMouse;
diff --git a/src/graph/view2D/spadAction2d.c b/src/graph/view2D/spadAction2d.c
index 900d4358..e837b47c 100644
--- a/src/graph/view2D/spadAction2d.c
+++ b/src/graph/view2D/spadAction2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -51,13 +51,7 @@
  ******************************/
 
 int 
-#ifdef _NO_PROTO
-readViewman(info,size)
-  void *info;
-  int size;
-#else
 readViewman(void * info,int size)
-#endif
 {
   int mold = 0;
 
@@ -73,11 +67,7 @@ readViewman(void * info,int size)
  ********************/
 extern int viewAloned;
 int 
-#ifdef _NO_PROTO
-spadAction()
-#else
 spadAction(void)
-#endif
 {
   int code,viewCommand;
   float f1,f2;
diff --git a/src/graph/view2D/stuff2d.c b/src/graph/view2D/stuff2d.c
index 1d5d75a5..9b0c396b 100644
--- a/src/graph/view2D/stuff2d.c
+++ b/src/graph/view2D/stuff2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -51,12 +51,7 @@
 /**************************/
 
 float 
-#ifdef _NO_PROTO
-absolute(x)
-  float x;
-#else
 absolute(float x)
-#endif
 {
   if (x<0.0) {
     return(-x);
@@ -72,12 +67,7 @@ absolute(float x)
 /************************/
 
 void 
-#ifdef _NO_PROTO
-goodbye(sig)
-int sig;
-#else
 goodbye(int sig)
-#endif
 {
   int Command,i;
 
diff --git a/src/graph/view2D/viewport2D.c b/src/graph/view2D/viewport2D.c
index a0a06aa9..a5934018 100644
--- a/src/graph/view2D/viewport2D.c
+++ b/src/graph/view2D/viewport2D.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -69,11 +69,7 @@ Atom    wm_delete_window;
  ***************************/
 
 void 
-#ifdef _NO_PROTO
-writeTitle()
-#else
 writeTitle(void)
-#endif
 {
 
   int strlength;
@@ -96,12 +92,7 @@ writeTitle(void)
 /********************************/
 
 void 
-#ifdef _NO_PROTO
-drawTheViewport(dFlag)
-int dFlag;              /* display flag: X, PS,... */
-#else
 drawTheViewport(int dFlag)
-#endif
 {
 
   Window            vw;
@@ -565,13 +556,7 @@ drawTheViewport(int dFlag)
  ************************************/
 
 viewPoints *
-#ifdef _NO_PROTO
-makeViewport(title,vX,vY,vW,vH,showCP)
-  char *title;
-  int vX,vY,vW,vH,showCP;
-#else
 makeViewport(char *title,int vX,int vY,int vW,int vH,int showCP)
-#endif
 {
   Pixmap               spadbits,spadmask;
   XSetWindowAttributes viewAttrib;
@@ -684,12 +669,7 @@ makeViewport(char *title,int vX,int vY,int vW,int vH,int showCP)
 
 
 viewPoints *
-#ifdef _NO_PROTO
-makeView2D(viewdata)
-  view2DStruct *viewdata;
-#else
 makeView2D(view2DStruct *viewdata)
-#endif
 {
   viewPoints *vPoints;  
 
diff --git a/src/graph/view2D/write2d.c b/src/graph/view2D/write2d.c
index 7a00fc68..4eaffbe2 100644
--- a/src/graph/view2D/write2d.c
+++ b/src/graph/view2D/write2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -50,12 +50,7 @@
 #define numBits (8*sizeof(int))
 
 int 
-#ifdef _NO_PROTO
-writeViewport(thingsToWrite)
-  int thingsToWrite;
-#else
 writeViewport(int thingsToWrite)
-#endif
 {
 
   FILE              *viewDataFile;