ncurses 6.2 - patch 20200301

[ncurses.git] / test / linedata.h

diff --git a/test/linedata.h b/test/linedata.h
index 2510ee72f646ece49d43941b9b85710c3c35cb32..f042ab44be0f8cde78ed0811475ed3e396f9ec79 100644 (file)
--- a/test/linedata.h
+++ b/test/linedata.h
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
+ * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2009-2010,2012 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            *


@@ -26,6 +27,16 @@
  * authorization.                                                           *
  ****************************************************************************/
 
  * authorization.                                                           *
  ****************************************************************************/
 

+/*
+ * $Id: linedata.h,v 1.8 2020/02/02 23:34:34 tom Exp $
+ *
+ * Utility functions for reading a line of text from a file.
+ */
+#ifndef LINEDATA_H_incl
+#define LINEDATA_H_incl 1
+
+#include <test.priv.h>
+

 #define isQUIT(c)     ((c) == QUIT || (c) == ESCAPE)
 
 #define key_RECUR     CTRL('W')
 #define isQUIT(c)     ((c) == QUIT || (c) == ESCAPE)
 
 #define key_RECUR     CTRL('W')


@@ -85,10 +96,8 @@ read_linedata(WINDOW *work)
                    beep();
                    continue;
                }
                    beep();
                    continue;
                }

-           } else if (code != ERR) {
-               result = (int) ch;
-               break;

            } else {
            } else {

+               result = (int) ch;

                break;
            }
        }
                break;
            }
        }


@@ -98,3 +107,5 @@ read_linedata(WINDOW *work)
     }
     return result;
 }
     }
     return result;
 }

+
+#endif /* LINEDATA_H_incl */