[libvirt PATCH 3/9] util: remove pointless wrappers for setrlimit/getrlimit
These wrappers added no semantic difference over calling the system
function directly.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/util/virprocess.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 2fd9b406a1..0462ae8465 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -736,24 +736,6 @@ virProcessPrLimit(pid_t pid G_GNUC_UNUSED,
}
#endif
-#if WITH_GETRLIMIT
-static int
-virProcessGetRLimit(int resource,
- struct rlimit *old_limit)
-{
- return getrlimit(resource, old_limit);
-}
-#endif /* WITH_GETRLIMIT */
-
-#if WITH_SETRLIMIT
-static int
-virProcessSetRLimit(int resource,
- const struct rlimit *new_limit)
-{
- return setrlimit(resource, new_limit);
-}
-#endif /* WITH_SETRLIMIT */
-
#if WITH_GETRLIMIT
static const char*
virProcessLimitResourceToLabel(int resource)
@@ -876,7 +858,7 @@ virProcessGetLimit(pid_t pid,
if (virProcessGetLimitFromProc(pid, resource, old_limit) == 0)
return 0;
- if (same_process && virProcessGetRLimit(resource, old_limit) == 0)
+ if (same_process && getrlimit(resource, old_limit) == 0)
return 0;
return -1;
@@ -895,7 +877,7 @@ virProcessSetLimit(pid_t pid,
if (virProcessPrLimit(pid, resource, new_limit, NULL) == 0)
return 0;
- if (same_process && virProcessSetRLimit(resource, new_limit) == 0)
+ if (same_process && setrlimit(resource, new_limit) == 0)
return 0;
return -1;
--
2.40.1