From e754fc5aab53130c1ece25a2ca0119fe1b194491 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 17 Dec 2008 10:34:09 +0000
Subject: [PATCH] From Sekender, fixed warnins

---
 src/osgPlugins/bsp/ReaderWriterVTF.cpp   | 1 -
 src/osgPlugins/bsp/VBSPReader.cpp        | 3 +--
 src/osgPlugins/curl/ReaderWriterCURL.cpp | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/osgPlugins/bsp/ReaderWriterVTF.cpp b/src/osgPlugins/bsp/ReaderWriterVTF.cpp
index 30e453433..d71848ecf 100644
--- a/src/osgPlugins/bsp/ReaderWriterVTF.cpp
+++ b/src/osgPlugins/bsp/ReaderWriterVTF.cpp
@@ -357,7 +357,6 @@ osg::Image* ReadVTFFile(std::istream& _istream)
     int               s, t, r;
     unsigned int      lrSize;
     unsigned char *   imageData;
-    unsigned char *   imageDataPtr;
     unsigned int      base;
     unsigned int      size;
     int               mip;
diff --git a/src/osgPlugins/bsp/VBSPReader.cpp b/src/osgPlugins/bsp/VBSPReader.cpp
index 150c7d9b5..c1e4b6c37 100644
--- a/src/osgPlugins/bsp/VBSPReader.cpp
+++ b/src/osgPlugins/bsp/VBSPReader.cpp
@@ -440,7 +440,6 @@ std::string VBSPReader::findFileIgnoreCase(std::string filePath)
 
 ref_ptr<Texture> VBSPReader::readTextureFile(std::string textureName)
 {
-    int           i;
     std::string   texFile;
     std::string   texPath;
     Image *       texImage;
@@ -811,7 +810,7 @@ void VBSPReader::createScene()
     char *               mtlPtr = 0;
     char *               tmpPtr = 0;
     char                 tempTex[256];
-    int                  i, j;
+    int                  i;
     ref_ptr<StateSet>    stateSet;
 
     // Create the root group for the scene
diff --git a/src/osgPlugins/curl/ReaderWriterCURL.cpp b/src/osgPlugins/curl/ReaderWriterCURL.cpp
index 38984592b..ba10e1688 100644
--- a/src/osgPlugins/curl/ReaderWriterCURL.cpp
+++ b/src/osgPlugins/curl/ReaderWriterCURL.cpp
@@ -403,7 +403,7 @@ bool ReaderWriterCURL::read(std::istream& fin, std::string& destination) const
                        15 + 32 // autodected zlib or gzip header
                        );
     if (ret != Z_OK)
-        return ret;
+        return false;
 
     /* decompress until deflate stream ends or end of file */
     do {