]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
util: remove pointless wrappers for setrlimit/getrlimit
authorDaniel P. Berrangé <berrange@redhat.com>
Wed, 21 Jun 2023 12:43:35 +0000 (13:43 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Thu, 20 Jul 2023 09:58:00 +0000 (10:58 +0100)
These wrappers added no semantic difference over calling the system
function directly.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/util/virprocess.c

index 2fd9b406a14a90f172d34d0b2d5f23bac5c80660..0462ae84657e9bf059742f3e6b0df0112d32ec3c 100644 (file)
@@ -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;