Use raw string literals to avoid excessive escaping

kcat · kcat · commit 4e5db525ef10 · 2025-10-19T17:46:20.000-07:00
diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp
@@ -144,7 +144,7 @@ auto CALLBACK DSoundEnumDevices(GUID *guid, const WCHAR *desc, const WCHAR*, voi
     auto *guidstr = LPOLESTR{};
     if(const auto hr = StringFromCLSID(*guid, &guidstr); SUCCEEDED(hr))
     {
-        TRACE("Got device \"{}\", GUID \"{}\"", newentry.name, wstr_to_utf8(guidstr));
+        TRACE(R"(Got device "{}", GUID "{}")", newentry.name, wstr_to_utf8(guidstr));
         CoTaskMemFree(guidstr);
     }
 
diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp
@@ -585,7 +585,7 @@ void JackPlayback::start()
                 return false;
             }
             if(jack_connect(mClient, jack_port_name(port), portname))
-                ERR("Failed to connect output port \"{}\" to \"{}\"", jack_port_name(port),
+                ERR(R"(Failed to connect output port "{}" to "{}")", jack_port_name(port),
                     portname);
             return true;
         });
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
@@ -395,7 +395,7 @@ class PulseMainloop {
 
         const auto &newentry = PlaybackDevices.emplace_back(DevMap{std::move(newname),
             info->name, info->index});
-        TRACE("Got device \"{}\", \"{}\" ({})", newentry.name, newentry.device_name,
+        TRACE(R"(Got device "{}", "{}" ({}))", newentry.name, newentry.device_name,
             newentry.index);
 
         const auto msg = std::format("Device added: {}", newentry.device_name);
@@ -424,7 +424,7 @@ class PulseMainloop {
 
         const auto &newentry = CaptureDevices.emplace_back(DevMap{std::move(newname), info->name,
             info->index});
-        TRACE("Got device \"{}\", \"{}\" ({})", newentry.name, newentry.device_name,
+        TRACE(R"(Got device "{}", "{}" ({}))", newentry.name, newentry.device_name,
             newentry.index);
 
         const auto msg = std::format("Device added: {}", newentry.device_name);
diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
@@ -689,7 +689,7 @@ struct DeviceEnumHelper final : private IMMNotificationClient {
             newname = std::format("{} #{}", name, ++count);
         const auto &newentry = list.emplace_back(std::move(newname), std::move(guid), devid);
 
-        TRACE("Got device \"{}\", \"{}\", \"{}\"", newentry.name, newentry.endpoint_guid,
+        TRACE(R"(Got device "{}", "{}", "{}")", newentry.name, newentry.endpoint_guid,
             wstr_to_utf8(newentry.devid));
         return true;
     }
@@ -758,7 +758,7 @@ struct DeviceEnumHelper final : private IMMNotificationClient {
             auto const iter = std::ranges::find(list, deviceId, &DevMap::devid);
             if(iter == list.end()) continue;
 
-            TRACE("Removing device \"{}\", \"{}\", \"{}\"", iter->name, iter->endpoint_guid,
+            TRACE(R"(Removing device "{}", "{}", "{}")", iter->name, iter->endpoint_guid,
                 wstr_to_utf8(iter->devid));
 
             const auto msg = "Device removed: "+std::move(iter->name);
diff --git a/alc/panning.cpp b/alc/panning.cpp
@@ -1066,7 +1066,7 @@ auto InitHrtfPanning(al::Device *const device) -> std::unique_ptr<DirectHrtfStat
         auto mode = std::string_view{*modeopt};
         if(al::case_compare(mode, "basic"sv) == 0)
         {
-            ERR("HRTF mode \"{}\" deprecated, substituting \"{}\"", *modeopt, "ambi2");
+            ERR(R"(HRTF mode "{}" deprecated, substituting "{}")", *modeopt, "ambi2");
             mode = "ambi2";
         }
 
diff --git a/core/helpers.cpp b/core/helpers.cpp
@@ -302,7 +302,7 @@ auto GetProcBinary() -> const PathNamePair&
         else
             res.fname = pathname;
 
-        TRACE("Got binary: \"{}\", \"{}\"", res.path, res.fname);
+        TRACE(R"(Got binary: "{}", "{}")", res.path, res.fname);
         return res;
     });
     return procbin;

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ auto CALLBACK DSoundEnumDevices(GUID guid, const WCHAR desc, const WCHAR*, voi`
`144`	`144`	`auto *guidstr = LPOLESTR{};`
`145`	`145`	`if(const auto hr = StringFromCLSID(*guid, &guidstr); SUCCEEDED(hr))`
`146`	`146`	`{`
`147`		`- TRACE("Got device \"{}\", GUID \"{}\"", newentry.name, wstr_to_utf8(guidstr));`
	`147`	`+ TRACE(R"(Got device "{}", GUID "{}")", newentry.name, wstr_to_utf8(guidstr));`
`148`	`148`	`CoTaskMemFree(guidstr);`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ void JackPlayback::start()`
`585`	`585`	`return false;`
`586`	`586`	`}`
`587`	`587`	`if(jack_connect(mClient, jack_port_name(port), portname))`
`588`		`- ERR("Failed to connect output port \"{}\" to \"{}\"", jack_port_name(port),`
	`588`	`+ ERR(R"(Failed to connect output port "{}" to "{}")", jack_port_name(port),`
`589`	`589`	`portname);`
`590`	`590`	`return true;`
`591`	`591`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1066,7 +1066,7 @@ auto InitHrtfPanning(al::Device *const device) -> std::unique_ptr<DirectHrtfStat`
`1066`	`1066`	`auto mode = std::string_view{*modeopt};`
`1067`	`1067`	`if(al::case_compare(mode, "basic"sv) == 0)`
`1068`	`1068`	`{`
`1069`		`- ERR("HRTF mode \"{}\" deprecated, substituting \"{}\"", *modeopt, "ambi2");`
	`1069`	`+ ERR(R"(HRTF mode "{}" deprecated, substituting "{}")", *modeopt, "ambi2");`
`1070`	`1070`	`mode = "ambi2";`
`1071`	`1071`	`}`
`1072`	`1072`