/****************************************************************************
- * Copyright 2018-2020,2022 Thomas E. Dickey *
+ * Copyright 2018-2022,2023 Thomas E. Dickey *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
* authorization. *
****************************************************************************/
/*
- * $Id: pair_content.c,v 1.15 2022/04/16 18:27:24 tom Exp $
+ * $Id: pair_content.c,v 1.22 2023/02/25 16:43:56 tom Exp $
*/
#define NEED_TIME_H
static MYPAIR *expected;
-#if HAVE_GETTIMEOFDAY
-static struct timeval initial_time;
-static struct timeval finish_time;
-#endif
+static TimeType initial_time;
+static TimeType finish_time;
+
+static GCC_NORETURN void
+finish(int code)
+{
+ free(expected);
+ ExitProgram(code);
+}
static void
failed(const char *msg)
printw("%s", msg);
getch();
endwin();
- ExitProgram(EXIT_FAILURE);
+ finish(EXIT_FAILURE);
}
#if USE_EXTENDED_COLOR
} else {
failed("This demo requires a color terminal");
}
-#if HAVE_GETTIMEOFDAY
- gettimeofday(&initial_time, 0);
-#endif
+ GetClockTime(&initial_time);
}
static void
endwin();
}
-#if HAVE_GETTIMEOFDAY
-static double
-seconds(struct timeval *mark)
-{
- double result = (double) mark->tv_sec;
- result += ((double) mark->tv_usec / 1e6);
- return result;
-}
-#endif
-
static void
-usage(void)
+usage(int ok)
{
static const char *msg[] =
{
"Usage: pair_content [options]"
,""
+ ,USAGE_COMMON
,"Options:"
," -f PAIR first color pair to test (default: 1)"
," -i interactive, showing test-progress"
size_t n;
for (n = 0; n < SIZEOF(msg); n++)
fprintf(stderr, "%s\n", msg[n]);
- ExitProgram(EXIT_FAILURE);
+ ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
{
- int i;
+ int ch;
- while ((i = getopt(argc, argv, "f:il:npr:sx")) != -1) {
- switch (i) {
+ while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) {
+ switch (ch) {
case 'f':
if ((f_opt = atoi(optarg)) <= 0)
- usage();
+ usage(FALSE);
break;
case 'i':
i_opt = 1;
break;
case 'l':
if ((l_opt = atoi(optarg)) <= 0)
- usage();
+ usage(FALSE);
break;
case 'n':
n_opt = 1;
break;
case 'r':
if ((r_opt = atoi(optarg)) <= 0)
- usage();
+ usage(FALSE);
break;
case 's':
s_opt = 1;
x_opt = 1;
break;
#endif
+ case OPTS_VERSION:
+ show_version(argv);
+ ExitProgram(EXIT_SUCCESS);
default:
- usage();
+ usage(ch == OPTS_USAGE);
+ /* NOTREACHED */
}
}
if (optind < argc)
- usage();
+ usage(FALSE);
if (r_opt <= 0)
r_opt = 1;
setup_test();
if (p_opt) {
+ int i;
endwin();
for (i = f_opt; i < l_opt; ++i) {
my_color_t fg, bg;
addch('\n');
}
printw("DONE: ");
-#if HAVE_GETTIMEOFDAY
- gettimeofday(&finish_time, 0);
- printw("%.03f seconds",
- seconds(&finish_time)
- - seconds(&initial_time));
-#endif
+ GetClockTime(&finish_time);
+ printw("%.03f seconds", ElapsedSeconds(&initial_time, &finish_time));
finish_test();
}
- ExitProgram(EXIT_SUCCESS);
+ finish(EXIT_SUCCESS);
}