X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_bkgd.c;h=5dfe5c6d1dcde536b48625b5b90cdb8874cc6e57;hp=7bcd3ffb5a3fe1c0f532bb5f307a430e63be48d9;hb=603f0cb25b7acc8f04f4b18d2a2fe6f90039829a;hpb=64f44b13d30e0a7bc2921a9d43755423f81564fd

diff --git a/ncurses/base/lib_bkgd.c b/ncurses/base/lib_bkgd.c
index 7bcd3ffb..5dfe5c6d 100644
--- a/ncurses/base/lib_bkgd.c
+++ b/ncurses/base/lib_bkgd.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,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            *
@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_bkgd.c,v 1.48 2012/12/09 01:01:19 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.50 2016/05/28 23:11:26 tom Exp $")
 
 /*
  * Set the window's background information.
@@ -118,21 +118,23 @@ static NCURSES_INLINE int
 wbkgrnd(WINDOW *win, const ARG_CH_T ch)
 {
     int code = ERR;
-    int x, y;
 
     T((T_CALLED("wbkgd(%p,%s)"), (void *) win, _tracech_t(ch)));
 
     if (win) {
 	NCURSES_CH_T new_bkgd = CHDEREF(ch);
 	NCURSES_CH_T old_bkgrnd;
+	int y;
 
 	memset(&old_bkgrnd, 0, sizeof(old_bkgrnd));
-	wgetbkgrnd(win, &old_bkgrnd);
+	(void) wgetbkgrnd(win, &old_bkgrnd);
 
 	(void) wbkgrndset(win, CHREF(new_bkgd));
 	(void) wattrset(win, (int) AttrOf(win->_nc_bkgd));
 
 	for (y = 0; y <= win->_maxy; y++) {
+	    int x;
+
 	    for (x = 0; x <= win->_maxx; x++) {
 		if (CharEq(win->_line[y].text[x], old_bkgrnd)) {
 		    win->_line[y].text[x] = win->_nc_bkgd;