Ditch gcc 4.6 support

11 files changed, 383 insertions, 383 deletions

diff --git a/src/mmo/config_parse.cpp b/src/mmo/config_parse.cpp
index b954e8b..a6dfd6e 100644
--- a/src/mmo/config_parse.cpp
+++ b/src/mmo/config_parse.cpp
@@ -30,7 +30,7 @@
 
 bool is_comment(XString line)
 {
-    return not line or line.startswith("//");
+    return not line or line.startswith("//"_s);
 }
 
 template<class ZS>
@@ -72,7 +72,7 @@ bool load_config_file(ZString filename, ConfigItemParser slave)
     io::LineReader in(filename);
     if (!in.is_open())
     {
-        PRINTF("Unable to open file: %s\n", filename);
+        PRINTF("Unable to open file: %s\n"_fmt, filename);
         return false;
     }
     io::Line line;
@@ -85,16 +85,16 @@ bool load_config_file(ZString filename, ConfigItemParser slave)
         ZString value;
         if (!config_split(line.text, &key, &value))
         {
-            line.error("Bad config line");
+            line.error("Bad config line"_s);
             rv = false;
             continue;
         }
-        if (key == "import")
+        if (key == "import"_s)
         {
             rv &= load_config_file(value, slave);
             continue;
         }
-        else if (key == "version-lt")
+        else if (key == "version-lt"_s)
         {
             Version vers;
             if (!extract(value, &vers))
@@ -106,7 +106,7 @@ bool load_config_file(ZString filename, ConfigItemParser slave)
                 continue;
             break;
         }
-        else if (key == "version-le")
+        else if (key == "version-le"_s)
         {
             Version vers;
             if (!extract(value, &vers))
@@ -118,7 +118,7 @@ bool load_config_file(ZString filename, ConfigItemParser slave)
                 continue;
             break;
         }
-        else if (key == "version-gt")
+        else if (key == "version-gt"_s)
         {
             Version vers;
             if (!extract(value, &vers))
@@ -130,7 +130,7 @@ bool load_config_file(ZString filename, ConfigItemParser slave)
                 continue;
             break;
         }
-        else if (key == "version-ge")
+        else if (key == "version-ge"_s)
         {
             Version vers;
             if (!extract(value, &vers))
@@ -144,7 +144,7 @@ bool load_config_file(ZString filename, ConfigItemParser slave)
         }
         else if (!slave(key, value))
         {
-            line.error("Bad config key or value");
+            line.error("Bad config key or value"_s);
             rv = false;
             continue;
         }
diff --git a/src/mmo/core.cpp b/src/mmo/core.cpp
index 68b7823..8b3690a 100644
--- a/src/mmo/core.cpp
+++ b/src/mmo/core.cpp
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
 
     if (!runflag)
     {
-        PRINTF("Fatal error during startup; exiting\n");
+        PRINTF("Fatal error during startup; exiting\n"_fmt);
         return 1;
     }
     // set up exit handlers *after* the initialization has happened.
diff --git a/src/mmo/extract_test.cpp b/src/mmo/extract_test.cpp
index 60ab49e..c405de1 100644
--- a/src/mmo/extract_test.cpp
+++ b/src/mmo/extract_test.cpp
@@ -28,154 +28,154 @@ TEST(extract, record_int)
 {
     int x, y, z;
     x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' '>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 2 3 4 "_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 3 4", record<' '>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 2 3 4"_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3 ", record<' '>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2 3 "_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3", record<' '>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2 3"_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 ", record<' '>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 2 "_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("1 2", record<' '>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 2"_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("1 ", record<' '>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 "_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("1", record<' '>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1"_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract(" ", record<' '>(&x, &y, &z)));
+    EXPECT_FALSE(extract(" "_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(0, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("", record<' '>(&x, &y, &z)));
+    EXPECT_FALSE(extract(""_s, record<' '>(&x, &y, &z)));
     EXPECT_EQ(0, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
 
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' ', 2>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 2 3 4 "_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 3 4", record<' ', 2>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 2 3 4"_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3 ", record<' ', 2>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2 3 "_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3", record<' ', 2>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2 3"_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 ", record<' ', 2>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2 "_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2", record<' ', 2>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2"_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("1 ", record<' ', 2>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 "_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("1", record<' ', 2>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1"_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract(" ", record<' ', 2>(&x, &y, &z)));
+    EXPECT_FALSE(extract(" "_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(0, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("", record<' ', 2>(&x, &y, &z)));
+    EXPECT_FALSE(extract(""_s, record<' ', 2>(&x, &y, &z)));
     EXPECT_EQ(0, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
 
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' ', 1>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 2 3 4 "_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("1 2 3 4", record<' ', 1>(&x, &y, &z)));
+    EXPECT_FALSE(extract("1 2 3 4"_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3 ", record<' ', 1>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2 3 "_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 3", record<' ', 1>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2 3"_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(3, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2 ", record<' ', 1>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2 "_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 2", record<' ', 1>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 2"_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(2, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1 ", record<' ', 1>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1 "_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_TRUE(extract("1", record<' ', 1>(&x, &y, &z)));
+    EXPECT_TRUE(extract("1"_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(1, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract(" ", record<' ', 1>(&x, &y, &z)));
+    EXPECT_FALSE(extract(" "_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(0, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
     x = y = z = 0;
-    EXPECT_FALSE(extract("", record<' ', 1>(&x, &y, &z)));
+    EXPECT_FALSE(extract(""_s, record<' ', 1>(&x, &y, &z)));
     EXPECT_EQ(0, x);
     EXPECT_EQ(0, y);
     EXPECT_EQ(0, z);
@@ -185,170 +185,170 @@ TEST(extract, record_int)
 TEST(extract, record_str)
 {
     XString x, y, z;
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2 3 4", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract(" ", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("", record<' '>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract("1 2 3 4 "_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract("1 2 3 4"_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2 3 "_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2 3"_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2 "_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract("1 2"_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract("1 "_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract("1"_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract(" "_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ(""_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract(""_s, record<' '>(&x, &y, &z)));
+    EXPECT_EQ(""_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
 
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2 3 4", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract(" ", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("", record<' ', 2>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
+    EXPECT_FALSE(extract("1 2 3 4 "_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract("1 2 3 4"_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2 3 "_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2 3"_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2 "_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2"_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 "_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract("1"_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract(" "_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ(""_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract(""_s, record<' ', 2>(&x, &y, &z)));
+    EXPECT_EQ(""_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
 
-    EXPECT_FALSE(extract("1 2 3 4 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_FALSE(extract("1 2 3 4", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 3", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("3", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 2", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("2", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1 ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("1", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("1", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract(" ", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
-    EXPECT_TRUE(extract("", record<' ', 1>(&x, &y, &z)));
-    EXPECT_EQ("", x);
-    EXPECT_EQ("", y);
-    EXPECT_EQ("", z);
-    x = y = z = "";
+    EXPECT_FALSE(extract("1 2 3 4 "_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_FALSE(extract("1 2 3 4"_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2 3 "_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2 3"_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ("3"_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2 "_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 2"_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ("2"_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1 "_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract("1"_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ("1"_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract(" "_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ(""_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
+    EXPECT_TRUE(extract(""_s, record<' ', 1>(&x, &y, &z)));
+    EXPECT_EQ(""_s, x);
+    EXPECT_EQ(""_s, y);
+    EXPECT_EQ(""_s, z);
+    x = y = z = ""_s;
 }
 
 TEST(extract, mapname)
 {
     MapName map;
-    EXPECT_TRUE(extract("abc", &map));
-    EXPECT_EQ(map, "abc");
-    EXPECT_TRUE(extract("abc.gat", &map));
-    EXPECT_EQ(map, "abc");
-    EXPECT_TRUE(extract("abcdefghijklmno", &map));
-    EXPECT_EQ(map, "abcdefghijklmno");
-    EXPECT_TRUE(extract("abcdefghijklmno.gat", &map));
-    EXPECT_EQ(map, "abcdefghijklmno");
+    EXPECT_TRUE(extract("abc"_s, &map));
+    EXPECT_EQ(map, "abc"_s);
+    EXPECT_TRUE(extract("abc.gat"_s, &map));
+    EXPECT_EQ(map, "abc"_s);
+    EXPECT_TRUE(extract("abcdefghijklmno"_s, &map));
+    EXPECT_EQ(map, "abcdefghijklmno"_s);
+    EXPECT_TRUE(extract("abcdefghijklmno.gat"_s, &map));
+    EXPECT_EQ(map, "abcdefghijklmno"_s);
 }
diff --git a/src/mmo/human_time_diff.hpp b/src/mmo/human_time_diff.hpp
index 689b8d9..aace438 100644
--- a/src/mmo/human_time_diff.hpp
+++ b/src/mmo/human_time_diff.hpp
@@ -61,21 +61,21 @@ bool extract(XString str, HumanTimeDiff *iv)
         str = str.xislice_t(it2);
 
         short *ptr = nullptr;
-        if (suffix == "y" || suffix == "a")
+        if (suffix == "y"_s || suffix == "a"_s)
             ptr = &iv->year;
-        else if (suffix == "m")
+        else if (suffix == "m"_s)
             ptr = &iv->month;
-        else if (suffix == "j" || suffix == "d")
+        else if (suffix == "j"_s || suffix == "d"_s)
             ptr = &iv->day;
-        else if (suffix == "h")
+        else if (suffix == "h"_s)
             ptr = &iv->hour;
-        else if (suffix == "mn")
+        else if (suffix == "mn"_s)
             ptr = &iv->minute;
-        else if (suffix == "s")
+        else if (suffix == "s"_s)
             ptr = &iv->second;
         else
             return false;
-        if (number.startswith('+') && !number.startswith("+-"))
+        if (number.startswith('+') && !number.startswith("+-"_s))
             number = number.xslice_t(1);
         if (*ptr || !extract(number, ptr))
             return false;
diff --git a/src/mmo/human_time_diff_test.cpp b/src/mmo/human_time_diff_test.cpp
index 138849b..fb9522e 100644
--- a/src/mmo/human_time_diff_test.cpp
+++ b/src/mmo/human_time_diff_test.cpp
@@ -28,7 +28,7 @@ TEST(humantimediff, single)
 {
     HumanTimeDiff diff;
 
-    EXPECT_TRUE(extract("42y", &diff));
+    EXPECT_TRUE(extract("42y"_s, &diff));
     EXPECT_EQ(42, diff.year);
     EXPECT_EQ(0, diff.month);
     EXPECT_EQ(0, diff.day);
@@ -36,7 +36,7 @@ TEST(humantimediff, single)
     EXPECT_EQ(0, diff.minute);
     EXPECT_EQ(0, diff.second);
 
-    EXPECT_TRUE(extract("42m", &diff));
+    EXPECT_TRUE(extract("42m"_s, &diff));
     EXPECT_EQ(0, diff.year);
     EXPECT_EQ(42, diff.month);
     EXPECT_EQ(0, diff.day);
@@ -44,7 +44,7 @@ TEST(humantimediff, single)
     EXPECT_EQ(0, diff.minute);
     EXPECT_EQ(0, diff.second);
 
-    EXPECT_TRUE(extract("42d", &diff));
+    EXPECT_TRUE(extract("42d"_s, &diff));
     EXPECT_EQ(0, diff.year);
     EXPECT_EQ(0, diff.month);
     EXPECT_EQ(42, diff.day);
@@ -52,7 +52,7 @@ TEST(humantimediff, single)
     EXPECT_EQ(0, diff.minute);
     EXPECT_EQ(0, diff.second);
 
-    EXPECT_TRUE(extract("42h", &diff));
+    EXPECT_TRUE(extract("42h"_s, &diff));
     EXPECT_EQ(0, diff.year);
     EXPECT_EQ(0, diff.month);
     EXPECT_EQ(0, diff.day);
@@ -60,7 +60,7 @@ TEST(humantimediff, single)
     EXPECT_EQ(0, diff.minute);
     EXPECT_EQ(0, diff.second);
 
-    EXPECT_TRUE(extract("42mn", &diff));
+    EXPECT_TRUE(extract("42mn"_s, &diff));
     EXPECT_EQ(0, diff.year);
     EXPECT_EQ(0, diff.month);
     EXPECT_EQ(0, diff.day);
@@ -68,7 +68,7 @@ TEST(humantimediff, single)
     EXPECT_EQ(42, diff.minute);
     EXPECT_EQ(0, diff.second);
 
-    EXPECT_TRUE(extract("42s", &diff));
+    EXPECT_TRUE(extract("42s"_s, &diff));
     EXPECT_EQ(0, diff.year);
     EXPECT_EQ(0, diff.month);
     EXPECT_EQ(0, diff.day);
@@ -76,28 +76,28 @@ TEST(humantimediff, single)
     EXPECT_EQ(0, diff.minute);
     EXPECT_EQ(42, diff.second);
 
-    EXPECT_TRUE(extract("+42y", &diff));
+    EXPECT_TRUE(extract("+42y"_s, &diff));
     EXPECT_EQ(42, diff.year);
-    EXPECT_TRUE(extract("-42y", &diff));
+    EXPECT_TRUE(extract("-42y"_s, &diff));
     EXPECT_EQ(-42, diff.year);
-    EXPECT_FALSE(extract("++42y", &diff));
-    EXPECT_FALSE(extract("+-42y", &diff));
-    EXPECT_FALSE(extract("-+42y", &diff));
-    EXPECT_FALSE(extract("--42y", &diff));
-    EXPECT_FALSE(extract("4+2y", &diff));
-    EXPECT_FALSE(extract("42z", &diff));
+    EXPECT_FALSE(extract("++42y"_s, &diff));
+    EXPECT_FALSE(extract("+-42y"_s, &diff));
+    EXPECT_FALSE(extract("-+42y"_s, &diff));
+    EXPECT_FALSE(extract("--42y"_s, &diff));
+    EXPECT_FALSE(extract("4+2y"_s, &diff));
+    EXPECT_FALSE(extract("42z"_s, &diff));
 }
 
 TEST(humantimediff, multiple)
 {
     HumanTimeDiff diff;
 
-    EXPECT_TRUE(extract("42y23m-2d", &diff));
+    EXPECT_TRUE(extract("42y23m-2d"_s, &diff));
     EXPECT_EQ(42, diff.year);
     EXPECT_EQ(23, diff.month);
     EXPECT_EQ(-2, diff.day);
     EXPECT_EQ(0, diff.hour);
     EXPECT_EQ(0, diff.minute);
     EXPECT_EQ(0, diff.second);
-    EXPECT_FALSE(extract("1y2y", &diff));
+    EXPECT_FALSE(extract("1y2y"_s, &diff));
 }
diff --git a/src/mmo/ip.cpp b/src/mmo/ip.cpp
index 146734a..67d6435 100644
--- a/src/mmo/ip.cpp
+++ b/src/mmo/ip.cpp
@@ -104,11 +104,11 @@ bool extract(XString str, IP4Mask *rv)
 VString<15> convert_for_printf(IP4Address a_)
 {
     const uint8_t *a = a_.bytes();
-    return STRNPRINTF(16, "%hhu.%hhu.%hhu.%hhu", a[0], a[1], a[2], a[3]);
+    return STRNPRINTF(16, "%hhu.%hhu.%hhu.%hhu"_fmt, a[0], a[1], a[2], a[3]);
 }
 
 VString<31> convert_for_printf(IP4Mask a)
 {
-    return STRNPRINTF(32, "%s/%s",
+    return STRNPRINTF(32, "%s/%s"_fmt,
             a.addr(), a.mask());
 }
diff --git a/src/mmo/ip_test.cpp b/src/mmo/ip_test.cpp
index 8e50453..01f714e 100644
--- a/src/mmo/ip_test.cpp
+++ b/src/mmo/ip_test.cpp
@@ -66,32 +66,32 @@ TEST(ip4addr, cmp)
 TEST(ip4addr, str)
 {
     IP4Address a;
-    EXPECT_EQ("0.0.0.0", STRNPRINTF(17, "%s", a));
-    EXPECT_EQ("127.0.0.1", STRNPRINTF(17, "%s", IP4_LOCALHOST));
-    EXPECT_EQ("255.255.255.255", STRNPRINTF(17, "%s", IP4_BROADCAST));
+    EXPECT_EQ("0.0.0.0"_s, STRNPRINTF(17, "%s"_fmt, a));
+    EXPECT_EQ("127.0.0.1"_s, STRNPRINTF(17, "%s"_fmt, IP4_LOCALHOST));
+    EXPECT_EQ("255.255.255.255"_s, STRNPRINTF(17, "%s"_fmt, IP4_BROADCAST));
 }
 
 TEST(ip4addr, extract)
 {
     IP4Address a;
-    EXPECT_TRUE(extract("0.0.0.0", &a));
-    EXPECT_EQ("0.0.0.0", STRNPRINTF(16, "%s", a));
-    EXPECT_TRUE(extract("127.0.0.1", &a));
-    EXPECT_EQ("127.0.0.1", STRNPRINTF(16, "%s", a));
-    EXPECT_TRUE(extract("255.255.255.255", &a));
-    EXPECT_EQ("255.255.255.255", STRNPRINTF(16, "%s", a));
-    EXPECT_TRUE(extract("1.2.3.4", &a));
-    EXPECT_EQ("1.2.3.4", STRNPRINTF(16, "%s", a));
+    EXPECT_TRUE(extract("0.0.0.0"_s, &a));
+    EXPECT_EQ("0.0.0.0"_s, STRNPRINTF(16, "%s"_fmt, a));
+    EXPECT_TRUE(extract("127.0.0.1"_s, &a));
+    EXPECT_EQ("127.0.0.1"_s, STRNPRINTF(16, "%s"_fmt, a));
+    EXPECT_TRUE(extract("255.255.255.255"_s, &a));
+    EXPECT_EQ("255.255.255.255"_s, STRNPRINTF(16, "%s"_fmt, a));
+    EXPECT_TRUE(extract("1.2.3.4"_s, &a));
+    EXPECT_EQ("1.2.3.4"_s, STRNPRINTF(16, "%s"_fmt, a));
 
-    EXPECT_FALSE(extract("1.2.3.4.5", &a));
-    EXPECT_FALSE(extract("1.2.3.4.", &a));
-    EXPECT_FALSE(extract("1.2.3.", &a));
-    EXPECT_FALSE(extract("1.2.3", &a));
-    EXPECT_FALSE(extract("1.2.", &a));
-    EXPECT_FALSE(extract("1.2", &a));
-    EXPECT_FALSE(extract("1.", &a));
-    EXPECT_FALSE(extract("1", &a));
-    EXPECT_FALSE(extract("", &a));
+    EXPECT_FALSE(extract("1.2.3.4.5"_s, &a));
+    EXPECT_FALSE(extract("1.2.3.4."_s, &a));
+    EXPECT_FALSE(extract("1.2.3."_s, &a));
+    EXPECT_FALSE(extract("1.2.3"_s, &a));
+    EXPECT_FALSE(extract("1.2."_s, &a));
+    EXPECT_FALSE(extract("1.2"_s, &a));
+    EXPECT_FALSE(extract("1."_s, &a));
+    EXPECT_FALSE(extract("1"_s, &a));
+    EXPECT_FALSE(extract(""_s, &a));
 }
 
 
@@ -108,139 +108,139 @@ TEST(ip4mask, body)
 TEST(ip4mask, str)
 {
     IP4Mask m;
-    EXPECT_EQ("0.0.0.0/0.0.0.0", STRNPRINTF(33, "%s", m));
+    EXPECT_EQ("0.0.0.0/0.0.0.0"_s, STRNPRINTF(33, "%s"_fmt, m));
     m = IP4Mask(IP4_LOCALHOST, IP4_BROADCAST);
-    EXPECT_EQ("127.0.0.1/255.255.255.255", STRNPRINTF(33, "%s", m));
+    EXPECT_EQ("127.0.0.1/255.255.255.255"_s, STRNPRINTF(33, "%s"_fmt, m));
 }
 
 TEST(ip4mask, extract)
 {
     IP4Mask m;
-    EXPECT_FALSE(extract("9.8.7.6/33", &m));
-    EXPECT_FALSE(extract("9.8.7.6.5", &m));
-    EXPECT_FALSE(extract("9.8.7.6/", &m));
-    EXPECT_FALSE(extract("9.8.7", &m));
-    EXPECT_FALSE(extract("9.8", &m));
-    EXPECT_FALSE(extract("9", &m));
+    EXPECT_FALSE(extract("9.8.7.6/33"_s, &m));
+    EXPECT_FALSE(extract("9.8.7.6.5"_s, &m));
+    EXPECT_FALSE(extract("9.8.7.6/"_s, &m));
+    EXPECT_FALSE(extract("9.8.7"_s, &m));
+    EXPECT_FALSE(extract("9.8"_s, &m));
+    EXPECT_FALSE(extract("9"_s, &m));
 
-    EXPECT_TRUE(extract("127.0.0.1", &m));
-    EXPECT_EQ("127.0.0.1/255.255.255.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("127.0.0.1.", &m));
-    EXPECT_EQ("127.0.0.1/255.255.255.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("127.0.0.", &m));
-    EXPECT_EQ("127.0.0.0/255.255.255.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("127.0.", &m));
-    EXPECT_EQ("127.0.0.0/255.255.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("127.", &m));
-    EXPECT_EQ("127.0.0.0/255.0.0.0", STRNPRINTF(32, "%s", m));
+    EXPECT_TRUE(extract("127.0.0.1"_s, &m));
+    EXPECT_EQ("127.0.0.1/255.255.255.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("127.0.0.1."_s, &m));
+    EXPECT_EQ("127.0.0.1/255.255.255.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("127.0.0."_s, &m));
+    EXPECT_EQ("127.0.0.0/255.255.255.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("127.0."_s, &m));
+    EXPECT_EQ("127.0.0.0/255.255.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("127."_s, &m));
+    EXPECT_EQ("127.0.0.0/255.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
 
-    EXPECT_TRUE(extract("1.2.3.4/255.255.255.255", &m));
-    EXPECT_EQ("1.2.3.4/255.255.255.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("1.2.3.0/255.255.255.0", &m));
-    EXPECT_EQ("1.2.3.0/255.255.255.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("1.2.0.4/255.255.0.255", &m));
-    EXPECT_EQ("1.2.0.4/255.255.0.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("1.2.0.0/255.255.0.0", &m));
-    EXPECT_EQ("1.2.0.0/255.255.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("1.0.3.4/255.0.255.255", &m));
-    EXPECT_EQ("1.0.3.4/255.0.255.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("1.0.3.0/255.0.255.0", &m));
-    EXPECT_EQ("1.0.3.0/255.0.255.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("1.0.0.4/255.0.0.255", &m));
-    EXPECT_EQ("1.0.0.4/255.0.0.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("1.0.0.0/255.0.0.0", &m));
-    EXPECT_EQ("1.0.0.0/255.0.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.2.3.4/0.255.255.255", &m));
-    EXPECT_EQ("0.2.3.4/0.255.255.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.2.3.0/0.255.255.0", &m));
-    EXPECT_EQ("0.2.3.0/0.255.255.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.2.0.4/0.255.0.255", &m));
-    EXPECT_EQ("0.2.0.4/0.255.0.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.2.0.0/0.255.0.0", &m));
-    EXPECT_EQ("0.2.0.0/0.255.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.3.4/0.0.255.255", &m));
-    EXPECT_EQ("0.0.3.4/0.0.255.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.3.0/0.0.255.0", &m));
-    EXPECT_EQ("0.0.3.0/0.0.255.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.4/0.0.0.255", &m));
-    EXPECT_EQ("0.0.0.4/0.0.0.255", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/0.0.0.0", &m));
-    EXPECT_EQ("0.0.0.0/0.0.0.0", STRNPRINTF(32, "%s", m));
+    EXPECT_TRUE(extract("1.2.3.4/255.255.255.255"_s, &m));
+    EXPECT_EQ("1.2.3.4/255.255.255.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("1.2.3.0/255.255.255.0"_s, &m));
+    EXPECT_EQ("1.2.3.0/255.255.255.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("1.2.0.4/255.255.0.255"_s, &m));
+    EXPECT_EQ("1.2.0.4/255.255.0.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("1.2.0.0/255.255.0.0"_s, &m));
+    EXPECT_EQ("1.2.0.0/255.255.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("1.0.3.4/255.0.255.255"_s, &m));
+    EXPECT_EQ("1.0.3.4/255.0.255.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("1.0.3.0/255.0.255.0"_s, &m));
+    EXPECT_EQ("1.0.3.0/255.0.255.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("1.0.0.4/255.0.0.255"_s, &m));
+    EXPECT_EQ("1.0.0.4/255.0.0.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("1.0.0.0/255.0.0.0"_s, &m));
+    EXPECT_EQ("1.0.0.0/255.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.2.3.4/0.255.255.255"_s, &m));
+    EXPECT_EQ("0.2.3.4/0.255.255.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.2.3.0/0.255.255.0"_s, &m));
+    EXPECT_EQ("0.2.3.0/0.255.255.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.2.0.4/0.255.0.255"_s, &m));
+    EXPECT_EQ("0.2.0.4/0.255.0.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.2.0.0/0.255.0.0"_s, &m));
+    EXPECT_EQ("0.2.0.0/0.255.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.3.4/0.0.255.255"_s, &m));
+    EXPECT_EQ("0.0.3.4/0.0.255.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.3.0/0.0.255.0"_s, &m));
+    EXPECT_EQ("0.0.3.0/0.0.255.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.4/0.0.0.255"_s, &m));
+    EXPECT_EQ("0.0.0.4/0.0.0.255"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/0.0.0.0"_s, &m));
+    EXPECT_EQ("0.0.0.0/0.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
 
     // please don't do this
-    EXPECT_TRUE(extract("120.248.200.217/89.57.126.5", &m));
-    EXPECT_EQ("88.56.72.1/89.57.126.5", STRNPRINTF(32, "%s", m));
+    EXPECT_TRUE(extract("120.248.200.217/89.57.126.5"_s, &m));
+    EXPECT_EQ("88.56.72.1/89.57.126.5"_s, STRNPRINTF(32, "%s"_fmt, m));
 
-    EXPECT_TRUE(extract("0.0.0.0/32", &m));
-    EXPECT_EQ("0.0.0.0/255.255.255.255", STRNPRINTF(32, "%s", m));
+    EXPECT_TRUE(extract("0.0.0.0/32"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.255.255"_s, STRNPRINTF(32, "%s"_fmt, m));
 
-    EXPECT_TRUE(extract("0.0.0.0/31", &m));
-    EXPECT_EQ("0.0.0.0/255.255.255.254", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/30", &m));
-    EXPECT_EQ("0.0.0.0/255.255.255.252", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/29", &m));
-    EXPECT_EQ("0.0.0.0/255.255.255.248", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/28", &m));
-    EXPECT_EQ("0.0.0.0/255.255.255.240", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/27", &m));
-    EXPECT_EQ("0.0.0.0/255.255.255.224", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/26", &m));
-    EXPECT_EQ("0.0.0.0/255.255.255.192", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/25", &m));
-    EXPECT_EQ("0.0.0.0/255.255.255.128", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/24", &m));
-    EXPECT_EQ("0.0.0.0/255.255.255.0", STRNPRINTF(32, "%s", m));
+    EXPECT_TRUE(extract("0.0.0.0/31"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.255.254"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/30"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.255.252"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/29"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.255.248"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/28"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.255.240"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/27"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.255.224"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/26"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.255.192"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/25"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.255.128"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/24"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.255.0"_s, STRNPRINTF(32, "%s"_fmt, m));
 
-    EXPECT_TRUE(extract("0.0.0.0/23", &m));
-    EXPECT_EQ("0.0.0.0/255.255.254.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/22", &m));
-    EXPECT_EQ("0.0.0.0/255.255.252.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/21", &m));
-    EXPECT_EQ("0.0.0.0/255.255.248.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/20", &m));
-    EXPECT_EQ("0.0.0.0/255.255.240.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/19", &m));
-    EXPECT_EQ("0.0.0.0/255.255.224.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/18", &m));
-    EXPECT_EQ("0.0.0.0/255.255.192.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/17", &m));
-    EXPECT_EQ("0.0.0.0/255.255.128.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/16", &m));
-    EXPECT_EQ("0.0.0.0/255.255.0.0", STRNPRINTF(32, "%s", m));
+    EXPECT_TRUE(extract("0.0.0.0/23"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.254.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/22"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.252.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/21"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.248.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/20"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.240.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/19"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.224.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/18"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.192.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/17"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.128.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/16"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.255.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
 
-    EXPECT_TRUE(extract("0.0.0.0/15", &m));
-    EXPECT_EQ("0.0.0.0/255.254.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/14", &m));
-    EXPECT_EQ("0.0.0.0/255.252.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/13", &m));
-    EXPECT_EQ("0.0.0.0/255.248.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/12", &m));
-    EXPECT_EQ("0.0.0.0/255.240.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/11", &m));
-    EXPECT_EQ("0.0.0.0/255.224.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/10", &m));
-    EXPECT_EQ("0.0.0.0/255.192.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/9", &m));
-    EXPECT_EQ("0.0.0.0/255.128.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/8", &m));
-    EXPECT_EQ("0.0.0.0/255.0.0.0", STRNPRINTF(32, "%s", m));
+    EXPECT_TRUE(extract("0.0.0.0/15"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.254.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/14"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.252.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/13"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.248.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/12"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.240.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/11"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.224.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/10"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.192.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/9"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.128.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/8"_s, &m));
+    EXPECT_EQ("0.0.0.0/255.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
 
-    EXPECT_TRUE(extract("0.0.0.0/7", &m));
-    EXPECT_EQ("0.0.0.0/254.0.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/6", &m));
-    EXPECT_EQ("0.0.0.0/252.0.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/5", &m));
-    EXPECT_EQ("0.0.0.0/248.0.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/4", &m));
-    EXPECT_EQ("0.0.0.0/240.0.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/3", &m));
-    EXPECT_EQ("0.0.0.0/224.0.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/2", &m));
-    EXPECT_EQ("0.0.0.0/192.0.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/1", &m));
-    EXPECT_EQ("0.0.0.0/128.0.0.0", STRNPRINTF(32, "%s", m));
-    EXPECT_TRUE(extract("0.0.0.0/0", &m));
-    EXPECT_EQ("0.0.0.0/0.0.0.0", STRNPRINTF(32, "%s", m));
+    EXPECT_TRUE(extract("0.0.0.0/7"_s, &m));
+    EXPECT_EQ("0.0.0.0/254.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/6"_s, &m));
+    EXPECT_EQ("0.0.0.0/252.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/5"_s, &m));
+    EXPECT_EQ("0.0.0.0/248.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/4"_s, &m));
+    EXPECT_EQ("0.0.0.0/240.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/3"_s, &m));
+    EXPECT_EQ("0.0.0.0/224.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/2"_s, &m));
+    EXPECT_EQ("0.0.0.0/192.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/1"_s, &m));
+    EXPECT_EQ("0.0.0.0/128.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
+    EXPECT_TRUE(extract("0.0.0.0/0"_s, &m));
+    EXPECT_EQ("0.0.0.0/0.0.0.0"_s, STRNPRINTF(32, "%s"_fmt, m));
 }
 
 TEST(ip4mask, cover)
@@ -344,7 +344,7 @@ TEST(ip4mask, cover)
     EXPECT_FALSE(m.covers(IP4Address({192, 169, 0, 0})));
 
     // OTOH this is crazy
-    EXPECT_TRUE(extract("120.248.200.217/89.57.126.5", &m));
+    EXPECT_TRUE(extract("120.248.200.217/89.57.126.5"_s, &m));
     EXPECT_TRUE(m.covers(IP4Address({120, 248, 200, 217})));
     EXPECT_TRUE(m.covers(IP4Address({88, 56, 72, 1})));
     EXPECT_FALSE(m.covers(IP4Address({88, 56, 72, 0})));
diff --git a/src/mmo/md5more.cpp b/src/mmo/md5more.cpp
index 3fce5c7..cc17d37 100644
--- a/src/mmo/md5more.cpp
+++ b/src/mmo/md5more.cpp
@@ -103,7 +103,7 @@ AccountCrypt MD5_saltcrypt(AccountPass key, SaltString salt)
     VString<31> obuf;
 
     // This truncates the string, but we have to keep it like that for compatibility
-    SNPRINTF(obuf, 32, "!%s$%s", salt, tbuf3);
+    SNPRINTF(obuf, 32, "!%s$%s"_fmt, salt, tbuf3);
     return stringish<AccountCrypt>(obuf);
 }
 
@@ -134,7 +134,7 @@ IP4Address MD5_ip(IP4Address ip)
 
     // MD5sum a secret + the IP address
     VString<31> ipbuf;
-    SNPRINTF(ipbuf, 32, "%s %s", ip, secret);
+    SNPRINTF(ipbuf, 32, "%s %s"_fmt, ip, secret);
     md5_binary obuf;
     MD5_to_bin(MD5_from_string(ipbuf), obuf);
 
diff --git a/src/mmo/mmo.hpp b/src/mmo/mmo.hpp
index c9d62ca..3fba7e6 100644
--- a/src/mmo/mmo.hpp
+++ b/src/mmo/mmo.hpp
@@ -85,7 +85,7 @@ struct ServerName : VString<19> {};
 struct PartyName : VString<23> {};
 struct VarName : VString<31> {};
 
-# define DEFAULT_EMAIL stringish<AccountEmail>("a@a.com")
+# define DEFAULT_EMAIL stringish<AccountEmail>("a@a.com"_s)
 
 // It is decreed: a mapname shall not contain an extension
 class MapName : public strings::_crtp_string<MapName, MapName, strings::ZPair>
diff --git a/src/mmo/socket.cpp b/src/mmo/socket.cpp
index 48cd149..364e769 100644
--- a/src/mmo/socket.cpp
+++ b/src/mmo/socket.cpp
@@ -158,7 +158,7 @@ void send_from_fifo(Session *s)
 static
 void null_parse(Session *s)
 {
-    PRINTF("null_parse : %d\n", s);
+    PRINTF("null_parse : %d\n"_fmt, s);
     RFIFOSKIP(s, RFIFOREST(s));
 }
 
@@ -177,7 +177,7 @@ void connect_client(Session *ls)
     }
     if (fd.uncast_dammit() >= SOFT_LIMIT)
     {
-        FPRINTF(stderr, "softlimit reached, disconnecting : %d\n", fd.uncast_dammit());
+        FPRINTF(stderr, "softlimit reached, disconnecting : %d\n"_fmt, fd.uncast_dammit());
         fd.shutdown(SHUT_RDWR);
         fd.close();
         return;
@@ -389,12 +389,12 @@ void WFIFOSET(Session *s, size_t len)
     if (s->wdata_size + len + 16384 > s->max_wdata)
     {
         realloc_fifo(s, s->max_rdata, s->max_wdata << 1);
-        PRINTF("socket: %d wdata expanded to %zu bytes.\n", s, s->max_wdata);
+        PRINTF("socket: %d wdata expanded to %zu bytes.\n"_fmt, s, s->max_wdata);
     }
     if (s->wdata_size + len + 2048 < s->max_wdata)
         s->wdata_size += len;
     else
-        FPRINTF(stderr, "socket: %d wdata lost !!\n", s), abort();
+        FPRINTF(stderr, "socket: %d wdata lost !!\n"_fmt, s), abort();
 }
 
 void do_sendrecv(interval_t next_ms)
@@ -415,7 +415,7 @@ void do_sendrecv(interval_t next_ms)
     {
         if (!has_timers())
         {
-            PRINTF("Shutting down - nothing to do\n");
+            PRINTF("Shutting down - nothing to do\n"_fmt);
             runflag = false;
         }
         return;
@@ -460,7 +460,7 @@ void do_parsepacket(void)
         if (!s->connected
             && static_cast<time_t>(TimeT::now()) - static_cast<time_t>(s->created) > CONNECT_TIMEOUT)
         {
-            PRINTF("Session #%d timed out\n", s);
+            PRINTF("Session #%d timed out\n"_fmt, s);
             s->eof = 1;
         }
         if (!s->rdata_size && !s->eof)
@@ -489,7 +489,7 @@ void RFIFOSKIP(Session *s, size_t len)
 
     if (s->rdata_size < s->rdata_pos)
     {
-        FPRINTF(stderr, "too many skip\n");
+        FPRINTF(stderr, "too many skip\n"_fmt);
         abort();
     }
 }
diff --git a/src/mmo/utils.cpp b/src/mmo/utils.cpp
index a1316d1..5765eaf 100644
--- a/src/mmo/utils.cpp
+++ b/src/mmo/utils.cpp
@@ -57,9 +57,9 @@ bool e_mail_check(XString email)
         return 0;
     if (hostname.front() == '.' || hostname.back() == '.')
         return 0;
-    if (hostname.contains_seq(".."))
+    if (hostname.contains_seq(".."_s))
         return 0;
-    if (email.contains_any(" ;"))
+    if (email.contains_any(" ;"_s))
         return 0;
     return email.is_print();
 }
@@ -70,18 +70,18 @@ bool e_mail_check(XString email)
 //-------------------------------------------------
 int config_switch(ZString str)
 {
-    if (str == "true" || str == "on" || str == "yes"
-        || str == "oui" || str == "ja"
-        || str == "si")
+    if (str == "true"_s || str == "on"_s || str == "yes"_s
+        || str == "oui"_s || str == "ja"_s
+        || str == "si"_s)
         return 1;
-    if (str == "false" || str == "off" || str == "no"
-        || str == "non" || str == "nein")
+    if (str == "false"_s || str == "off"_s || str == "no"_s
+        || str == "non"_s || str == "nein"_s)
         return 0;
 
     int rv;
     if (extract(str, &rv))
         return rv;
-    FPRINTF(stderr, "Fatal: bad option value %s", str);
+    FPRINTF(stderr, "Fatal: bad option value %s"_fmt, str);
     abort();
 }
 
@@ -93,7 +93,7 @@ void stamp_time(timestamp_seconds_buffer& out, const TimeT *t)
     struct tm when = t ? *t : TimeT::now();
     char buf[20];
     strftime(buf, 20, "%Y-%m-%d %H:%M:%S", &when);
-    out = stringish<timestamp_seconds_buffer>(const_(buf));
+    out = stringish<timestamp_seconds_buffer>(VString<19>(strings::really_construct_from_a_pointer, buf));
 }
 void stamp_time(timestamp_milliseconds_buffer& out)
 {
@@ -103,7 +103,7 @@ void stamp_time(timestamp_milliseconds_buffer& out)
     char buf[24];
     strftime(buf, 20, "%Y-%m-%d %H:%M:%S", &when);
     sprintf(buf + 19, ".%03d", static_cast<int>(tv.tv_usec / 1000));
-    out = stringish<timestamp_milliseconds_buffer>(const_(buf));
+    out = stringish<timestamp_milliseconds_buffer>(VString<23>(strings::really_construct_from_a_pointer, buf));
 }
 
 void log_with_timestamp(io::WriteFile& out, XString line)