From b2e9308751ec0bc90dfbae69bc7309df62672e9f Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Fri, 9 Aug 2002 22:57:00 +0000
Subject: More shadowed variables in FLUID, plus use snprintf, strlcpy, and
 strlcat.

Don't use extra warning flags for normal compiles.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2568 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 test/bitmap.cxx   | 16 ++++++++--------
 test/checkers.cxx |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/bitmap.cxx b/test/bitmap.cxx
index 72dc8cfd0..755dd16c9 100644
--- a/test/bitmap.cxx
+++ b/test/bitmap.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: bitmap.cxx,v 1.4.2.3.2.3 2002/01/01 15:11:32 easysw Exp $"
+// "$Id: bitmap.cxx,v 1.4.2.3.2.4 2002/08/09 22:57:00 easysw Exp $"
 //
 // Bitmap label test program for the Fast Light Tool Kit (FLTK).
 //
@@ -117,9 +117,9 @@ void button_cb(Fl_Widget *,void *) {
 }
 
 int main(int argc, char **argv) {
-  Fl_Window window(400,400); ::w = &window;
-  Fl_Button b(140,160,120,120,"Bitmap"); ::b = &b;
-  (new Fl_Bitmap(sorceress_bits,sorceress_width,sorceress_height))->label(&b);
+  w = new Fl_Window(400,400);
+  b = new Fl_Button(140,160,120,120,"Bitmap");
+  b->image(new Fl_Bitmap(sorceress_bits,sorceress_width,sorceress_height));
   leftb = new Fl_Toggle_Button(25,50,50,25,"left");
   leftb->callback(button_cb);
   rightb = new Fl_Toggle_Button(75,50,50,25,"right");
@@ -134,12 +134,12 @@ int main(int argc, char **argv) {
   overb->callback(button_cb);
   inactb = new Fl_Toggle_Button(125,75,100,25,"inactive");
   inactb->callback(button_cb);
-  window.resizable(window);
-  window.end();
-  window.show(argc, argv);
+  w->resizable(w);
+  w->end();
+  w->show(argc, argv);
   return Fl::run();
 }
 
 //
-// End of "$Id: bitmap.cxx,v 1.4.2.3.2.3 2002/01/01 15:11:32 easysw Exp $".
+// End of "$Id: bitmap.cxx,v 1.4.2.3.2.4 2002/08/09 22:57:00 easysw Exp $".
 //
diff --git a/test/checkers.cxx b/test/checkers.cxx
index 65b33a4ca..555ff6ba1 100644
--- a/test/checkers.cxx
+++ b/test/checkers.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: checkers.cxx,v 1.9.2.7.2.2 2002/05/16 12:47:43 easysw Exp $"
+// "$Id: checkers.cxx,v 1.9.2.7.2.3 2002/08/09 22:57:00 easysw Exp $"
 //
 // Checkers game for the Fast Light Tool Kit (FLTK).
 //
@@ -184,7 +184,7 @@ char check(int target,int direction) {
   int src = target+direction;
   if (tb[src] == FRIENDKING);
   else if (direction < 0 || tb[src] != FRIEND) return(0);
-  piece a = tb[target]; piece b = tb[src];
+  piece aa = tb[target]; piece bb = tb[src];
   tb[target] = EMPTY; tb[src] = EMPTY;
   int safe =
     (tb[src-4]&FRIEND && tb[src-8]&ENEMY
@@ -195,7 +195,7 @@ char check(int target,int direction) {
      ||tb[src+5]&FRIEND && tb[src+10]==ENEMYKING
      ||tb[dst+4]==ENEMYKING && !tb[dst-4]
      ||tb[dst+5]==ENEMYKING && !tb[dst-5]);
-  tb[target] = a; tb[src] = b;
+  tb[target] = aa; tb[src] = bb;
   return(safe);
 }
 
@@ -1355,5 +1355,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: checkers.cxx,v 1.9.2.7.2.2 2002/05/16 12:47:43 easysw Exp $".
+// End of "$Id: checkers.cxx,v 1.9.2.7.2.3 2002/08/09 22:57:00 easysw Exp $".
 //
-- 
cgit v1.2.3