ncurses 5.6 - patch 20070812

[ncurses.git] / ncurses / base / lib_slkinit.c

diff --git a/ncurses/base/lib_slkinit.c b/ncurses/base/lib_slkinit.c
index 708442604d910d7130d203709501d1e897d7ab08..20c0baa596465563871a102567f7dca42177d241 100644 (file)
--- a/ncurses/base/lib_slkinit.c
+++ b/ncurses/base/lib_slkinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2000,2007 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            *


@@ -38,14 +38,17 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_slkinit.c,v 1.3 1998/02/11 12:13:56 tom Exp $")
+MODULE_ID("$Id: lib_slkinit.c,v 1.6 2007/05/12 18:14:21 tom Exp $")

 
 

-int
+NCURSES_EXPORT(int)

 slk_init(int format)
 {
 slk_init(int format)
 {

-       T((T_CALLED("slk_init(%d)"), format));
-       if (format < 0 || format > 3)
-               returnCode(ERR);
+    int code = ERR;
+
+    T((T_CALLED("slk_init(%d)"), format));
+    if (format >= 0 && format <= 3 && !_nc_slk_format) {

        _nc_slk_format = 1 + format;
        _nc_slk_format = 1 + format;

-       returnCode(OK);
+       code = _nc_ripoffline(-SLK_LINES(_nc_slk_format), _nc_slk_initialize);
+    }
+    returnCode(code);

 }
 }