ncurses 5.9 - patch 20130608

[ncurses.git] / test / dots_mvcur.c

diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c
index 611964c1eae823279eb412acefcba70218179970..752422727d1a57c1e35fa56891ed21399972fbd1 100644 (file)
--- a/test/dots_mvcur.c
+++ b/test/dots_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2007-2009,2013 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey - 2007
  *
 /*
  * Author: Thomas E. Dickey - 2007
  *

- * $Id: dots_mvcur.c,v 1.4 2009/10/10 16:14:24 tom Exp $
+ * $Id: dots_mvcur.c,v 1.8 2013/05/25 22:58:22 tom Exp $

  *
  * A simple demo of the terminfo interface, and mvcur.
  */
  *
  * A simple demo of the terminfo interface, and mvcur.
  */


@@ -46,8 +46,8 @@ static bool interrupted = FALSE;
 static long total_chars = 0;
 static time_t started;
 
 static long total_chars = 0;
 static time_t started;
 

-static int
-outc(TPUTS_ARG c)
+static
+TPUTS_PROTO(outc, c)

 {
     int rc = c;
 
 {
     int rc = c;
 


@@ -59,7 +59,7 @@ outc(TPUTS_ARG c)
        if (putc(c, stdout) == EOF)
            rc = EOF;
     }
        if (putc(c, stdout) == EOF)
            rc = EOF;
     }

-    return rc;
+    TPUTS_RETURN(rc);

 }
 
 static bool
 }
 
 static bool


@@ -83,7 +83,7 @@ cleanup(void)
 
     printf("\n\n%ld total chars, rate %.2f/sec\n",
           total_chars,
 
     printf("\n\n%ld total chars, rate %.2f/sec\n",
           total_chars,

-          ((double) (total_chars) / (time((time_t *) 0) - started)));
+          ((double) (total_chars) / (double) (time((time_t *) 0) - started)));

 }
 
 static void
 }
 
 static void


@@ -92,22 +92,21 @@ onsig(int n GCC_UNUSED)
     interrupted = TRUE;
 }
 
     interrupted = TRUE;
 }
 

-static float
+static double

 ranf(void)
 {
     long r = (rand() & 077777);
 ranf(void)
 {
     long r = (rand() & 077777);

-    return ((float) r / 32768.);
+    return ((double) r / 32768.);

 }
 
 int
 }
 
 int

-main(
-       int argc GCC_UNUSED,
-       char *argv[]GCC_UNUSED)
+main(int argc GCC_UNUSED,
+     char *argv[]GCC_UNUSED)

 {
     int x0 = 1, y0 = 1;
     int x, y, z, p;
 {
     int x0 = 1, y0 = 1;
     int x, y, z, p;

-    float r;
-    float c;
+    double r;
+    double c;

     SCREEN *sp;
 
     CATCHALL(onsig);
     SCREEN *sp;
 
     CATCHALL(onsig);


@@ -124,8 +123,8 @@ main(
            max_colors = -1;
     }
 
            max_colors = -1;
     }
 

-    r = (float) (lines - 4);
-    c = (float) (columns - 4);
+    r = (double) (lines - 4);
+    c = (double) (columns - 4);

     started = time((time_t *) 0);
 
     while (!interrupted) {
     started = time((time_t *) 0);
 
     while (!interrupted) {


@@ -156,6 +155,7 @@ main(
            }
        }
        outc(p);
            }
        }
        outc(p);

+       ++x0;

        fflush(stdout);
        ++total_chars;
     }
        fflush(stdout);
        ++total_chars;
     }