From b6ea75cfc9712b77a0886c4348d6fb519641e40e Mon Sep 17 00:00:00 2001
From: Karl Ramm <kcr@mit.edu>
Date: Mon, 21 Jan 2008 03:11:44 +0000
Subject: de K&Rify, fix prototypes

---
 zwgc/xmark.c | 60 +++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

(limited to 'zwgc/xmark.c')

diff --git a/zwgc/xmark.c b/zwgc/xmark.c
index 1c796f3..7285834 100644
--- a/zwgc/xmark.c
+++ b/zwgc/xmark.c
@@ -43,10 +43,11 @@ x_gram *oldgram = NULL;
    (STARTCHAR != -1) && (ENDCHAR != -1) && \
    (STARTPIXEL != -1) && (ENDPIXEL != -1))
 
-void xmarkSetBound(gram,x,y,which)
-     x_gram *gram;
-     int x,y;
-     int which;
+void
+xmarkSetBound(x_gram *gram,
+	      int x,
+	      int y,
+	      int which)
 {
    int i,xofs,yofs;
    XFontStruct *font;
@@ -136,8 +137,9 @@ void xmarkSetBound(gram,x,y,which)
 }
 
 /* needs both bounds to be valid (!= -1) */
-static int xmarkNearest(x,y)
-     int x,y;
+static int
+xmarkNearest(int x,
+	     int y)
 {
    int middle;
 
@@ -157,11 +159,14 @@ static int xmarkNearest(x,y)
    }
 }
 
-void xmarkExpose(dpy,w,gram,b1,p1,b2,p2)
-     Display *dpy;
-     Window w;
-     x_gram *gram;
-     unsigned int b1,p1,b2,p2;
+void
+xmarkExpose(Display *dpy,
+	    Window w,
+	    x_gram *gram,
+	    unsigned int b1,
+	    unsigned int p1,
+	    unsigned int b2,
+	    unsigned int p2)
 {
 #define swap(x,y) temp=(x); (x)=(y); (y)=temp
    int i,temp;
@@ -226,11 +231,11 @@ void xmarkExpose(dpy,w,gram,b1,p1,b2,p2)
 
 /* Public functions: */
 
-void xmarkRedraw(dpy,w,gram,range)
-     Display *dpy;
-     Window w;
-     x_gram *gram;
-     int range;
+void
+xmarkRedraw(Display *dpy,
+	    Window w,
+	    x_gram *gram,
+	    int range)
 {
 #define ob1 ((unsigned int) oldblock[XMARK_START_BOUND])
 #define ob2 ((unsigned int) oldblock[XMARK_END_BOUND])
@@ -262,7 +267,8 @@ void xmarkRedraw(dpy,w,gram,range)
 }
 
 /* needs both bounds to be valid (!= -1) */
-int xmarkSecond()
+int
+xmarkSecond(void)
 {
    if (STARTBLOCK > ENDBLOCK)
      return(XMARK_START_BOUND);
@@ -278,7 +284,8 @@ int xmarkSecond()
    }
 }
 
-void xmarkClear()
+void
+xmarkClear(void)
 {
    oldblock[0]=markblock[0];
    oldblock[1]=markblock[1];
@@ -295,9 +302,10 @@ void xmarkClear()
    markgram=NULL;
 }
 
-int xmarkExtendFromFirst(gram,x,y)
-     x_gram *gram;
-     int x,y;
+int
+xmarkExtendFromFirst(x_gram *gram,
+		     int x,
+		     int y)
 {
    if (markgram != gram) {
       xmarkClear();
@@ -317,9 +325,10 @@ int xmarkExtendFromFirst(gram,x,y)
    }
 }
 
-int xmarkExtendFromNearest(gram,x,y)
-     x_gram *gram;
-     int x,y;
+int
+xmarkExtendFromNearest(x_gram *gram,
+		       int x,
+		       int y)
 {
    int bound;
 
@@ -341,7 +350,8 @@ int xmarkExtendFromNearest(gram,x,y)
    }
 }
 
-char *xmarkGetText()
+char *
+xmarkGetText(void)
 {
     int i, index, len;
     int last_y = -1;
-- 
cgit v1.2.3