[Bug 267] Fix gcc warnings in -Wall mode

Cleanups to correct problems with my merge of Aidan and Patrice's work.

diff --git a/util/Str.c++ b/util/Str.c++
index 51e2b85938a547925037858bc338f0c6e700afcd..66d553b21a774f7f736bf7a50fb651f32e1e622e 100644 (file)
--- a/util/Str.c++
+++ b/util/Str.c++
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdarg.h>
+#include <errno.h>
 
 #define DEFAULT_FORMAT_BUFFER 4096
 
@@ -153,7 +154,9 @@ fxStr::format(const char* fmt ...)
     int len = vsnprintf(s.data, size, fmt, ap);
     va_end(ap);
     while (len < 0 || len >= size) {
-        if (len >= size) {
+       if (len < 0 && errno != 0)
+           return s;
+       if (len >= size) {
             size = len + 1;
         } else {
             size *= 2;

diff --git a/util/Str.h b/util/Str.h
index 4c41047d719c570e83b5d6a98e98c7da52ead1f4..51f6c1beca822828cae00278dbf6c8e174cf0c78 100644 (file)
--- a/util/Str.h
+++ b/util/Str.h
@@ -101,6 +101,8 @@ public:
     /////////////////////////////////////////////////////
     u_long hash() const;
 
+operator char*()
+       { return data; }
     operator const char*() const
        { return data; }
     operator const char*()