ncurses 6.1 - patch 20180224

[ncurses.git] / ncurses / widechar / lib_unget_wch.c

diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c
index 7a626a9eee8487dbc9d03400aed8327b84d0ffb8..6a2346d570a3d1848bd7585956ddfd03b53e3708 100644 (file)
--- a/ncurses/widechar/lib_unget_wch.c
+++ b/ncurses/widechar/lib_unget_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2011,2016 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            *
@@ -39,7 +39,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_unget_wch.c,v 1.14 2010/07/24 11:35:21 tom Exp $")
+MODULE_ID("$Id: lib_unget_wch.c,v 1.16 2016/05/28 23:36:34 tom Exp $")
 
 /*
  * Wrapper for wcrtomb() which obtains the length needed for the given
@@ -55,7 +55,7 @@ _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
        const wchar_t *tempp = temp;
        temp[0] = source;
        temp[1] = 0;
-       result = (int) wcsrtombs(NULL, &tempp, 0, state);
+       result = (int) wcsrtombs(NULL, &tempp, (size_t) 0, state);
     } else {
        result = (int) wcrtomb(target, source, state);
     }
@@ -70,7 +70,6 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
     int result = OK;
     mbstate_t state;
     size_t length;
-    int n;
 
     T((T_CALLED("unget_wch(%p, %#lx)"), (void *) SP_PARM, (unsigned long) wch));
 
@@ -82,6 +81,8 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
        char *string;
 
        if ((string = (char *) malloc(length)) != 0) {
+           int n;
+
            init_mb(state);
            /* ignore the result, since we already validated the character */
            IGNORE_RC((int) wcrtomb(string, wch, &state));