src: avoid copying strings in FSPermission::Apply

tniessen · RafaelGSS · commit 0fb35b6a6734 · 2023-11-29T09:46:32.000-03:00
The use of string_view and subsequent copying to a string was supposed to be a minor optimization in 640a7918, however, since 413c16e, no string splitting occurs anymore. Therefore, we can simply pass around some references instead of using string_view or copying strings. Refs: #48491 Refs: #49047 PR-URL: #50662 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/src/permission/fs_permission.cc b/src/permission/fs_permission.cc
@@ -119,10 +119,8 @@ namespace permission {
 // allow = '/tmp/,/home/example.js'
 void FSPermission::Apply(const std::vector<std::string>& allow,
                          PermissionScope scope) {
-  using std::string_view_literals::operator""sv;
-
-  for (const std::string_view res : allow) {
-    if (res == "*"sv) {
+  for (const std::string& res : allow) {
+    if (res == "*") {
       if (scope == PermissionScope::kFileSystemRead) {
         deny_all_in_ = false;
         allow_all_in_ = true;
@@ -132,7 +130,7 @@ void FSPermission::Apply(const std::vector<std::string>& allow,
       }
       return;
     }
-    GrantAccess(scope, std::string(res.data(), res.size()));
+    GrantAccess(scope, res);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -119,10 +119,8 @@ namespace permission {`
`119`	`119`	`// allow = '/tmp/,/home/example.js'`
`120`	`120`	`void FSPermission::Apply(const std::vector<std::string>& allow,`
`121`	`121`	`PermissionScope scope) {`
`122`		`- using std::string_view_literals::operator""sv;`
`123`		`-`
`124`		`- for (const std::string_view res : allow) {`
`125`		`- if (res == "*"sv) {`
	`122`	`+ for (const std::string& res : allow) {`
	`123`	`+ if (res == "*") {`
`126`	`124`	`if (scope == PermissionScope::kFileSystemRead) {`
`127`	`125`	`deny_all_in_ = false;`
`128`	`126`	`allow_all_in_ = true;`
`@@ -132,7 +130,7 @@ void FSPermission::Apply(const std::vector<std::string>& allow,`
`132`	`130`	`}`
`133`	`131`	`return;`
`134`	`132`	`}`
`135`		`- GrantAccess(scope, std::string(res.data(), res.size()));`
	`133`	`+ GrantAccess(scope, res);`
`136`	`134`	`}`
`137`	`135`	`}`
`138`	`136`