From 4f1a1c8b16bf4f7027da16595efe64df00594872 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 8 Feb 2007 14:59:20 +0000
Subject: [PATCH] Fixed return in readString.

---
 src/osgPlugins/ive/DataInputStream.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/osgPlugins/ive/DataInputStream.cpp b/src/osgPlugins/ive/DataInputStream.cpp
index 9c8092c41..ed3cd6ed7 100644
--- a/src/osgPlugins/ive/DataInputStream.cpp
+++ b/src/osgPlugins/ive/DataInputStream.cpp
@@ -281,7 +281,8 @@ unsigned long DataInputStream::readULong(){
     return l;
 }
 
-double DataInputStream::readDouble(){
+double DataInputStream::readDouble()
+{
     double d;
     _istream->read((char*)&d, DOUBLESIZE);
     if (_istream->rdstate() & _istream->failbit)
@@ -292,11 +293,13 @@ double DataInputStream::readDouble(){
     return d;
 }
 
-std::string DataInputStream::readString(){
+std::string DataInputStream::readString()
+{
     std::string s;
     int size = readInt();
     if (size == 0)
-        return NULL;
+        return std::string();
+        
     s.resize(size);
     _istream->read((char*)s.c_str(), size);
     //if (_istream->rdstate() & _istream->failbit)
@@ -307,7 +310,8 @@ std::string DataInputStream::readString(){
     return s;
 }
 
-void DataInputStream::readCharArray(char* data, int size){
+void DataInputStream::readCharArray(char* data, int size)
+{
     _istream->read(data, size);
     if (_istream->rdstate() & _istream->failbit)
         throw Exception("DataInputStream::readCharArray(): Failed to read char value.");