Changeset 1025

Timestamp:

08/13/20 15:11:55 (4 years ago)

Author:

Maciej Komosinski

Message:

Added a repr() function that converts a string using only printable characters or ascii codes when necessary

Location:

cpp/common

Files:

• util-string.cpp (modified) (3 diffs)
• util-string.h (modified) (2 diffs)

cpp/common/util-string.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -15 +15 @@
 #include <android/log.h> //only needed to print error messages related to a workaround for Android bug
 #endif
+
+string repr(const char *str)
+{
+        string out = "";
+        char hex[4];
+        while (*str)
+        {
+                if (*str >= 32 && *str < 128)
+                        out += *str;
+                else
+                {
+                        if (*str == 10) out += "\\n"; else
+                                if (*str == 13) out += "\\r"; else
+                                {
+                                        sprintf(hex, "%X", *str);
+                                        out += "\\x";
+                                        out += hex;
+                                }
+                }
+                str++;
+        }
+        return out;
+}
+
 
 string ssprintf_va(const char* format, va_list ap)
@@ -31 +55 @@
 #endif
 
-        while (1)
+        while (true)
         {
                 buf = (char*)malloc(size);

cpp/common/util-string.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -8 +8 @@
 #include "nonstd_stl.h"
 #include <stdarg.h>
+
+string repr(const char *str);
 
 char* strmove(char *a, char *b); //strcpy that works well for overlapping strings ("Source and destination overlap")