Removed duplicated buffering code from GLString.

Also more asserts.

include/utils/strings.h

@@ -19,7 +19,15 @@ bool stringEndsWith(const char *str, const char *suffix);
 
 /*!
  * \brief Generates a buffered string for the printf call
- * \param string Format string like for printf
+ * \param string format string like for printf
+ * \param args arguments matching format string
+ * \returns string in a buffer
+ */
+char *bufferString(const char *string, va_list args) __attribute__((format(printf, 1, 0)));
+
+/*!
+ * \brief Generates a buffered string for the printf call
+ * \param string format string like for printf
  * \returns string in a buffer
  */
 char *bufferString(const char *string, ...) __attribute__((format(printf, 1, 2)));

src/GLString.cpp

@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <assert.h>
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
@@ -18,6 +19,7 @@
 #endif
 
 #include "Texture.h"
+#include "utils/strings.h"
 #include "GLString.h"
 
 GLString::GLString() {
@@ -40,8 +42,7 @@ GLString::~GLString() {
 
 
 void GLString::Init(unsigned int max_strings) {
-    if (!max_strings)
-        return;
+    assert(max_strings > 0);
 
     _num_string_max = max_strings;
     _string = new gl_string_t[max_strings];
@@ -50,121 +51,82 @@ void GLString::Init(unsigned int max_strings) {
 
 void GLString::SetChar(unsigned int string, unsigned int pos, char c) {
     gl_string_t *str = GetString(string);
-    if (str && pos < str->len)
+    assert(str != NULL);
+    if (pos < str->len)
         str->text[pos] = c;
 }
 
 
 unsigned int GLString::GetStringLen(unsigned int string) {
     gl_string_t *str = GetString(string);
-    if (str)
-        return str->len;
-    return 0;
+    assert(str != NULL);
+    return str->len;
 }
 
 
 char *GLString::GetBuffer(unsigned int string) {
     gl_string_t *str = GetString(string);
-    if (str)
-        return str->text;
-    return 0;
+    assert(str != NULL);
+    return str->text;
 }
 
 
 void GLString::setActive(unsigned int string, bool active) {
     gl_string_t *str = GetString(string);
-    if (str)
-        str->active = active;
+    assert(str != NULL);
+    str->active = active;
 }
 
 
 void GLString::SetString(unsigned int string, const char *s, ...) {
     va_list args;
-    gl_string_t *str;
+    gl_string_t *str = GetString(string);
 
-    str = GetString(string);
+    assert(s != NULL);
+    assert(s[0] != '\0');
+    assert(str != NULL);
 
-    if (s && s[0] && str) {
-        str->active = true;
+    delete [] str->text;
 
-        va_start(args, s);
-        vsnprintf(str->text, str->len-2, s, args);
-        str->text[str->len-1] = 0;
-        va_end(args);
-    }
-}
+    va_start(args, s);
+    str->text = bufferString(s, args);
+    va_end(args);
 
+    str->active = true;
+    str->len = (unsigned short)strlen(str->text);
+}
 
 void GLString::Scale(float scale) {
     _scale = scale;
 }
 
-
 int GLString::glPrintf(int x, int y, const char *string, ...) {
-    int sz = 60;
-    int n;
     va_list args;
 
-
-    // Mongoose 2002.01.01, Only allow valid strings
-    //   we must assume it's NULL terminated also if it passes...
-    if (!string || !string[0])
-        return -1;
+    assert(string != NULL);
+    assert(string[0] != '\0');
 
     if (_num_string > _num_string_max)
         return -2;
 
-    // xythobuz 2014.02.23, Activate, so we don't have to call SetString
-    // directly after glPrintf, with the same text...
-    _string[_num_string].active = true;
-
-    // Mongoose 2002.01.01, Assume no longer than 'sz' wide lines
-    //   on first try
-    _string[_num_string].text = new char[sz];
+    va_start(args, string);
 
-    // Mongoose 2002.01.03, Setup scale factor
+    _string[_num_string].active = true;
     _string[_num_string].scale = _scale;
-
-    //  Mongoose 2002.01.01, Setup position
     _string[_num_string].x = x;
     _string[_num_string].y = y;
+    _string[_num_string].text = bufferString(string, args);
 
-    va_start(args, string);
-
-    // Mongoose 2002.01.01, Get exact size needed if the first try fails
-    n = vsnprintf(_string[_num_string].text, sz, string, args);
-
-    // Mongoose 2002.01.01, Realloc correct amount if truncated
-    while (1) {
-        if (n > -1 && n < sz)
-            break;
-
-        if (n > -1) { // glibc 2.1
-            sz = n + 1;
-            delete [] _string[_num_string].text;
-            _string[_num_string].text = new char[sz];
-            n = vsnprintf(_string[_num_string].text, sz, string, args);
-            break;
-        } else { // glibc 2.0
-            sz *= 2;
-            delete [] _string[_num_string].text;
-            _string[_num_string].text = new char[sz];
-            n = vsnprintf(_string[_num_string].text, sz, string, args);
-        }
-    }
-    va_end(args);
-
-    // Mongoose 2002.01.04, Remeber string size, for future rebuffering use
-    _string[_num_string].len = (unsigned short)sz;
+    //! \fixme All this is really unnecessary complex!
+    _string[_num_string].len = (unsigned short)strlen(_string[_num_string].text);
 
-    // Mongoose 2002.01.01, Incement string counter, since we just
-    //   allocated a string
     ++_num_string;
 
+    va_end(args);
+
     return 0;
 }
 
-
 void GLString::Render() {
     for (unsigned int i = 0; i < _num_string; ++i) {
         if (_string[i].active)
@@ -172,10 +134,9 @@ void GLString::Render() {
     }
 }
 
-
 gl_string_t *GLString::GetString(unsigned int id) {
-    if (id < _num_string)
-        return _string + id;
-    return NULL;
+    assert(id < _num_string);
+
+    return _string + id;
 }
 

src/Sound.cpp

@@ -22,6 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <assert.h>
 
 #include "Sound.h"
 
@@ -78,8 +79,9 @@ int Sound::init()
 
 void Sound::listenAt(float pos[3], float angle[3])
 {
-    if (!mInit)
-        return;
+    assert(mInit == true);
+    assert(pos != NULL);
+    assert(angle != NULL);
 
     alListenerfv(AL_POSITION, pos);
     alListenerfv(AL_ORIENTATION, angle);
@@ -88,8 +90,9 @@ void Sound::listenAt(float pos[3], float angle[3])
 
 void Sound::sourceAt(int source, float pos[3])
 {
-    if (!mInit || source < 0)
-        return;
+    assert(mInit == true);
+    assert(source >= 0);
+    assert(pos != NULL);
 
     alSourcefv(mSource[source-1], AL_POSITION, pos);
 }
@@ -103,12 +106,10 @@ int Sound::addFile(const char *filename, int *source, unsigned int flags)
     ALenum format;
     ALvoid *data;
 
-
-    if (!mInit || !filename || !source)
-    {
-        printf("Sound::AddFile> ERROR pre condition assertion failed\n");
-        return -1000;
-    }
+    assert(mInit == true);
+    assert(filename != NULL);
+    assert(filename[0] != '\0');
+    assert(source != NULL);
 
     *source = -1;
 
@@ -167,11 +168,9 @@ int Sound::addWave(unsigned char *wav, unsigned int length, int *source, unsigne
     ALvoid *data;
     int error = 0;
 
-    if (!mInit || !wav || !source)
-    {
-        printf("Sound::AddWave> ERROR pre condition assertion failed\n");
-        return -1000;
-    }
+    assert(mInit == true);
+    assert(wav != NULL);
+    assert(source != NULL);
 
     *source = -1;
 
@@ -233,17 +232,8 @@ int Sound::addWave(unsigned char *wav, unsigned int length, int *source, unsigne
 
 void Sound::play(int source)
 {
-    if (!mInit)
-    {
-        printf("Sound::Play> ERROR: Sound not initialized\n");
-        return;
-    }
-
-    if (source < 0)
-    {
-        printf("Sound::Play> ERROR: Source Id invalid\n");
-        return;
-    }
+    assert(mInit == true);
+    assert(source >= 0);
 
     alSourcePlay(mSource[source-1]);
 }
@@ -251,11 +241,8 @@ void Sound::play(int source)
 
 void Sound::stop(int source)
 {
-    if (!mInit || source < 0)
-    {
-        printf("Sound::Stop> ERROR pre condition assertion failed\n");
-        return;
-    }
+    assert(mInit == true);
+    assert(source >= 0);
 
     alSourceStop(mSource[source-1]);
 }

src/System.cpp

@@ -14,6 +14,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <cmath>
+#include <assert.h>
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
@@ -58,16 +59,18 @@ System::~System() {
 }
 
 unsigned int System::addCommandMode(const char *command) {
-    if (command && command[0] == '[') {
-        mCmdModes.pushBack(command);
-        return (mCmdModes.size() - 1);
-    } else {
-        return 0;
-    }
+    assert(command != NULL);
+    assert(command[0] == '[');
+
+    mCmdModes.pushBack(command);
+    return (mCmdModes.size() - 1);
 }
 
 //! \fixme Modifer support later
 void System::bindKeyCommand(const char *cmd, unsigned int key, int event) {
+    assert(cmd != NULL);
+    assert(cmd[0] != '\0');
+
     printf("Bound command '%s' -> event %i (0x%x key)\n", cmd, event, key);
     mKeyEvents[key] = event;
 }
@@ -76,8 +79,8 @@ void System::command(const char *cmd) {
     bool modeFound = false;
     char *cmdbuf;
 
-    if (!cmd || !cmd[0]) // Null command string
-        return;
+    assert(cmd != NULL);
+    assert(cmd[0] != '\0');
 
     if (cmd[0] == '[') { // Set a mode, eg "[Engine.OpenGL.Driver]"
         for (mCmdModes.start(); mCmdModes.forward(); mCmdModes.next()) {
@@ -105,6 +108,9 @@ int System::loadResourceFile(const char *filename) {
     char c;
     int i, j;
 
+    assert(filename != NULL);
+    assert(filename[0] != '\0');
+
     f = fopen(filename, "r");
 
     if (!f) {
@@ -191,10 +197,8 @@ void System::setDriverGL(const char *driver) {
 }
 
 void System::resizeGL(unsigned int w, unsigned int h) {
-    if (!w || !h) {
-        printf("resizeGL> ERROR assertions 'w > 0', 'h > 0' failed\n");
-        return;
-    }
+    assert(w > 0);
+    assert(h > 0);
 
     glViewport(0, 0, w, h);
     glMatrixMode(GL_PROJECTION);

src/utils/strings.cpp

@@ -31,19 +31,16 @@ bool stringEndsWith(const char *str, const char *suffix) {
     return strncmp(str + lenstr - lensuffix, suffix, lensuffix) == 0;
 }
 
-char *bufferString(const char *string, ...) {
+char *bufferString(const char *string, va_list args) {
     int sz = 60;
     int n;
     char *text;
-    va_list args;
 
     assert(string != NULL);
     assert(string[0] != '\0');
 
     text = new char[sz];
 
-    va_start(args, string);
-
     n = vsnprintf(text, sz, string, args);
 
     if (n < 0) {
@@ -56,8 +53,14 @@ char *bufferString(const char *string, ...) {
         n = vsnprintf(text, sz, string, args);
     }
 
-    va_end(args);
+    return text;
+}
 
+char *bufferString(const char *string, ...) {
+    va_list args;
+    va_start(args, string);
+    char *text = bufferString(string, args);
+    va_end(args);
     return text;
 }