From cab8363d442fecceb448da970479d86b3dd63260 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 27 Nov 2017 17:31:22 -0600
Subject: [PATCH] apps/graphics/pdcurses:  Fix some miscellaneous, harmless
 typos and standard violations.

---
 examples/pdcurses/testcurs_main.c  | 16 +++++++++++-----
 graphics/pdcurs34/nuttx/pdcnuttx.h |  2 +-
 include/graphics/curses.h          |  2 +-
 include/graphics/panel.h           |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/examples/pdcurses/testcurs_main.c b/examples/pdcurses/testcurs_main.c
index 1e9892637..1adfed9dd 100644
--- a/examples/pdcurses/testcurs_main.c
+++ b/examples/pdcurses/testcurs_main.c
@@ -797,8 +797,10 @@ static void output_test(WINDOW *win)
 static void resize_test(WINDOW *dummy)
 {
   WINDOW *win1;
-  int nwidth = 135, nheight = 52;
-  int owidth = COLS, oheight = LINES;
+  int nwidth = 135;
+  int nheight = 52;
+  int owidth = COLS;
+  int oheight = LINES;
 
   savetty();
 
@@ -845,7 +847,8 @@ static void resize_test(WINDOW *dummy)
 
 static void pad_test(WINDOW *dummy)
 {
-  WINDOW *pad, *spad;
+  WINDOW *pad;
+  WINDOW *spad;
 
   pad = newpad(50, 100);
   wattron(pad, A_REVERSE);
@@ -886,7 +889,8 @@ static void clipboard_test(WINDOW *win)
   static const char *text =
     "This string placed in clipboard by PDCurses test program, testcurs.";
   char *ptr = NULL;
-  long i, length = 0;
+  long length = 0;
+  long i;
 
   mvaddstr(1, 1, "This test will display the contents of the system clipboard");
 
@@ -1201,7 +1205,9 @@ int testcurs_main(int argc, char *argv[])
 #endif
 {
   WINDOW *win;
-  int key, old_option = -1, new_option = 0;
+  int key;
+  int old_option = -1;
+  int new_option = 0;
   bool quit = false;
 
 #ifdef CONFIG_LIBC_LOCALE
diff --git a/graphics/pdcurs34/nuttx/pdcnuttx.h b/graphics/pdcurs34/nuttx/pdcnuttx.h
index 9094f106c..ca1022c7d 100644
--- a/graphics/pdcurs34/nuttx/pdcnuttx.h
+++ b/graphics/pdcurs34/nuttx/pdcnuttx.h
@@ -117,7 +117,7 @@
 #  define PDCURSES_PPB_MASK      (PDCURSES_PPB - 1)
 #  define PDCURSES_PPB_SHIFT     3
 #  define PDCURSES_INIT_COLOR    CONFIG_PDCURSES_BGCOLOR_GREYLEVEL
-#  define PDCURSES_MONOCHROME    2
+#  define PDCURSES_MONOCHROME    1
 #elif defined(CONFIG_PDCURSES_COLORFMT_Y2)
 #  define PDCURSES_COLORFMT      FB_FMT_Y2
 #  define PDCURSES_BPP           2
diff --git a/include/graphics/curses.h b/include/graphics/curses.h
index 6e9910104..6817ea1cf 100644
--- a/include/graphics/curses.h
+++ b/include/graphics/curses.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/graphics/include/curses.h
+ * apps/include/graphics/curses.h
  * Public Domain Curses
  * $Id: curses.h,v 1.295 2008/07/15 17:13:25 wmcbrine Exp $
  *
diff --git a/include/graphics/panel.h b/include/graphics/panel.h
index 6ad639f9c..de10096e0 100644
--- a/include/graphics/panel.h
+++ b/include/graphics/panel.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/graphics/include/curses.h
+ * apps/include/graphics/panel.h
  * Public Domain Curses -- Panels for PDCurses
  * $Id: panel.h,v 1.19 2008/07/13 16:08:16 wmcbrine Exp $
  *