commit befa9a143a2432b98bcf126e63d3a7537dfbc86a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 19:47:15 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 06 19:47:15 2020 +0000
tree ea47dd7b1d334f06f63c6d0a5ee692d1b9d7bd71
parent ec87b1e8f1e1ccb85f57e87445fddf3b78b7a7c8
parent 3332850cde7f452dbff6fcba4f34a42d83ba223b

Merge "init: use ErrnoErrorf() instead of ErrnoError() << StringPrintf()" am: 62662cf189 am: 487cda5deb

Change-Id: Ica4b456b262e5fbe402cd94f6703646ac23617d8

init/service_utils.cpp

diff --git a/init/service_utils.cpp b/init/service_utils.cpp
index 93cffd8..eec5717 100644
--- a/init/service_utils.cpp
+++ b/init/service_utils.cpp
@@ -249,9 +249,8 @@
 
     for (const auto& rlimit : attr.rlimits) {
         if (setrlimit(rlimit.first, &rlimit.second) == -1) {
-            return ErrnoError() << StringPrintf(
-                           "setrlimit(%d, {rlim_cur=%ld, rlim_max=%ld}) failed", rlimit.first,
-                           rlimit.second.rlim_cur, rlimit.second.rlim_max);
+            return ErrnoErrorf("setrlimit({}, {{rlim_cur={}, rlim_max={}}}) failed", rlimit.first,
+                               rlimit.second.rlim_cur, rlimit.second.rlim_max);
         }
     }