Fixed: Update string formatting patterns

skyjake · Sep 1, 2019 · ee216f3 · ee216f3
1 parent 96eb7f3
commit ee216f3
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/doomsday/apps/client/src/render/skydrawable.cpp b/doomsday/apps/client/src/render/skydrawable.cpp
@@ -131,7 +131,7 @@ struct Hemisphere
             {
                 res::Uri const pTexUri = pTex.manifest().composeUri();
                 throw Error("Hemisphere::capColor",
-                            stringf("Texture \"%s\" has no Average%2ColorAnalysis",
+                            stringf("Texture \"%s\" has no Average%sColorAnalysis",
                                     pTexUri.pathCStr(),
                                     hemisphere == UpperHemisphere ? "Top" : "Bottom"));
             }

diff --git a/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp b/doomsday/apps/client/src/ui/dialogs/serverinfodialog.cpp
@@ -331,7 +331,7 @@ DE_GUI_PIMPL(ServerInfoDialog)
                         if (auto *pkgFile = PackageLoader::get().select(id_ver.first))
                         {
                             localVersion = Package::versionForFile(*pkgFile);
-                            missing << Stringf("%1 " _E(s) "(you have: %s)" _E(.),
+                            missing << Stringf("%s " _E(s) "(you have: %s)" _E(.),
                                                       pkgId.c_str(),
                                                       localVersion.fullNumber().c_str());
                             continue;

diff --git a/doomsday/apps/client/src/updater/updateavailabledialog.cpp b/doomsday/apps/client/src/updater/updateavailabledialog.cpp
@@ -136,7 +136,7 @@ DE_GUI_PIMPL(UpdateAvailableDialog)
         {
             self().title().setText("Up to Date");
             self().message().setText(
-                Stringf("The installed %1 is the latest available %2 build.",
+                Stringf("The installed %s is the latest available %s build.",
                                currentVersion.asHumanReadableText().c_str(),
                                (_E(b) + channel + _E(.)).c_str()));
         }

diff --git a/doomsday/apps/plugins/common/src/menu/widgets/inputbindingwidget.cpp b/doomsday/apps/plugins/common/src/menu/widgets/inputbindingwidget.cpp
@@ -493,7 +493,7 @@ int InputBindingWidget::handleEvent_Privileged(event_t const &event)
             stateFlags += "-inverse";
         }
 
-        cmd = Stringf("bindcontrol {%1} {%2%3%4}",
+        cmd = Stringf("bindcontrol {%s} {%s%s%s}",
                              binds->controlName,
                              name.c_str(),
                              stateFlags.c_str(),

diff --git a/doomsday/apps/plugins/doom/src/m_cheat.cpp b/doomsday/apps/plugins/doom/src/m_cheat.cpp
@@ -577,7 +577,7 @@ D_CMD(CheatWhere)
     mobj_t *plrMo = plr->plr->mo;
     if(!plrMo) return true;
 
-    String const text = Stringf("Map:%1 position:%2",
+    String const text = Stringf("Map:%s position:%s",
                                        gfw_Session()->mapUri().asText().c_str(),
                                        Vec3d(plrMo->origin).asText().c_str());
     P_SetMessageWithFlags(plr, text, LMF_NO_HIDE);

diff --git a/doomsday/libs/core/src/data/string.cpp b/doomsday/libs/core/src/data/string.cpp
@@ -432,6 +432,7 @@ String &String::replace(const RegExp &before, const CString &after)
     RegExpMatch found;
     while (before.match(*this, found))
     {
+        DE_ASSERT(found.end() > found.begin());
         const iRangecc prefix{remaining.start, found.begin()};
         appendRange_String(result.i_str(), &prefix);
         appendRange_String(result.i_str(), &newTerm);

diff --git a/doomsday/libs/doomsday/src/console/var.cpp b/doomsday/libs/doomsday/src/console/var.cpp
@@ -675,7 +675,7 @@ static Value *Function_Console_Set(Context &, Function::ArgumentValues const &ar
     if (!var)
     {
         throw Error("Function_Console_Set",
-                    stringf("Unknown console variable: %1", name.c_str()));
+                    stringf("Unknown console variable: %s", name.c_str()));
     }
 
     Value const &value = *args.at(1);

diff --git a/doomsday/libs/doomsday/src/game.cpp b/doomsday/libs/doomsday/src/game.cpp
@@ -532,7 +532,7 @@ String Game::filesAsText(int rflags, bool withStatus) const
                 }
 
                 // Format the resource name list.
-                text += Stringf(_E(>) "%1%2",
+                text += Stringf(_E(>) "%s%s",
                         !resourceFound? _E(D) : "",
                         String::join(manifest.names(), _E(l) " or " _E(.)).c_str());
 

diff --git a/doomsday/libs/doomsday/src/resource/databundle.cpp b/doomsday/libs/doomsday/src/resource/databundle.cpp
@@ -1432,7 +1432,7 @@ StringList DataBundle::gameTags()
 
 String DataBundle::anyGameTagPattern()
 {
-    return Stringf("\\b(%1)\\b", String::join(gameTags(), "|").c_str());
+    return Stringf("\\b(%s)\\b", String::join(gameTags(), "|").c_str());
 }
 
 String DataBundle::cleanIdentifier(String const &text)