switch source tree from k&r to c99

win/curses/cursstat.c

@@ -30,18 +30,18 @@ static int curses_status_colors[MAXBLSTATS];
 static int hpbar_percent, hpbar_color;
 static int vert_status_dirty;
 
-static void NDECL(draw_status);
-static void FDECL(draw_vertical, (BOOLEAN_P));
-static void FDECL(draw_horizontal, (BOOLEAN_P));
+static void draw_status(void);
+static void draw_vertical(boolean);
+static void draw_horizontal(boolean);
 static void curs_HPbar(char *, int);
 static void curs_stat_conds(int, int, int *, int *, char *, boolean *);
 static void curs_vert_status_vals(int);
 #ifdef STATUS_HILITES
 #ifdef TEXTCOLOR
-static int FDECL(condcolor, (long, unsigned long *));
+static int condcolor(long, unsigned long *);
 #endif
-static int FDECL(condattr, (long, unsigned long *));
-static int FDECL(nhattr2curses, (int));
+static int condattr(long, unsigned long *);
+static int nhattr2curses(int);
 #endif /* STATUS_HILITES */
 
 /* width of a single line in vertical status orientation (one field per line;
@@ -49,7 +49,7 @@ static int FDECL(nhattr2curses, (int));
 #define STATVAL_WIDTH 60 /* overkill; was MAXCO (200), massive overkill */
 
 void
-curses_status_init()
+curses_status_init(void)
 {
     int i;
 
@@ -68,7 +68,7 @@ curses_status_init()
 }
 
 void
-curses_status_finish()
+curses_status_finish(void)
 {
     int i;
 
@@ -137,11 +137,8 @@ curses_status_finish()
 static int changed_fields = 0;
 
 void
-curses_status_update(fldidx, ptr, chg, percent, color_and_attr, colormasks)
-int fldidx, chg UNUSED,
-    percent, color_and_attr;
-genericptr_t ptr;
-unsigned long *colormasks;
+curses_status_update(int fldidx, genericptr_t ptr, int chg UNUSED, int percent,
+                     int color_and_attr, unsigned long *colormasks)
 {
     long *condptr = (long *) ptr;
     char *text = (char *) ptr;
@@ -206,7 +203,7 @@ unsigned long *colormasks;
 }
 
 static void
-draw_status()
+draw_status(void)
 {
     WINDOW *win = curses_get_nhwin(STATUS_WIN);
     orient statorient = (orient) curses_get_window_orientation(STATUS_WIN);
@@ -244,8 +241,7 @@ draw_status()
 
 /* horizontal layout on 2 or 3 lines */
 static void
-draw_horizontal(border)
-boolean border;
+draw_horizontal(boolean border)
 {
 #define blPAD BL_FLUSH
     /* almost all fields already come with a leading space;
@@ -650,8 +646,7 @@ boolean border;
 
 /* vertical layout, to left or right of map */
 static void
-draw_vertical(border)
-boolean border;
+draw_vertical(boolean border)
 {
     /* for blank lines, the digit prefix is the order in which they get
        removed if we need to shrink to fit within height limit (very rare) */
@@ -1258,9 +1253,7 @@ curs_vert_status_vals(int win_width)
  * be displayed in based on user settings.
  */
 static int
-condcolor(bm, bmarray)
-long bm;
-unsigned long *bmarray;
+condcolor(long bm, unsigned long *bmarray)
 {
     int i;
 
@@ -1274,9 +1267,7 @@ unsigned long *bmarray;
 #endif /* TEXTCOLOR */
 
 static int
-condattr(bm, bmarray)
-long bm;
-unsigned long *bmarray;
+condattr(long bm, unsigned long *bmarray)
 {
     int i, attr = 0;
 
@@ -1310,8 +1301,7 @@ unsigned long *bmarray;
 /* convert tty attributes to curses attributes;
    despite similar names, the mask fields have different values */
 static int
-nhattr2curses(attrmask)
-int attrmask;
+nhattr2curses(int attrmask)
 {
     int result = 0;