ncurses 5.6 - patch 20080329

[ncurses.git] / test / demo_panels.c

diff --git a/test/demo_panels.c b/test/demo_panels.c
index 8865f70ddff4a38b62e730e131b2d0b12648403a..b4594fb493fe01afc0f1f35b4e6718eb0189800a 100755 (executable)
--- a/test/demo_panels.c
+++ b/test/demo_panels.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2007,2008 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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_panels.c,v 1.26 2007/07/07 22:16:33 tom Exp $
+ * $Id: demo_panels.c,v 1.29 2008/02/09 23:05:37 tom Exp $
  *
  * Demonstrate a variety of functions from the panel library.
  */
@@ -234,7 +234,7 @@ my_remove_panel(PANEL ** pans, int which)
     if (pans[which] != 0) {
        PANEL *pan = pans[which];
        WINDOW *win = panel_window(pan);
-       char *user = panel_userptr(pan);
+       char *user = (char *) panel_userptr(pan);
 
        free(user);
        del_panel(pan);
@@ -634,7 +634,7 @@ get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit)
     if (log_in != 0) {
        if (fgets(buffer, limit - 3, log_in) != 0) {
            length = strlen(buffer);
-           while (length > 0 && isspace(buffer[length - 1]))
+           while (length > 0 && isspace(UChar(buffer[length - 1])))
                buffer[--length] = '\0';
            waddstr(win, buffer);
        } else {
@@ -759,7 +759,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((c = getopt(argc, argv, "i:o:mwx")) != EOF) {
+    while ((c = getopt(argc, argv, "i:o:mwx")) != -1) {
        switch (c) {
        case 'i':
            log_in = fopen(optarg, "r");