core/main: use saturate_add() where appropriate

(cherry picked from commit 0fcad6eead8abc0f9af5e9b5412abc573250a5e2)
(cherry picked from commit 62d871134079bd2fd643e70df44917ccda12bacc)
(cherry picked from commit 7d5979d54e854761c27ffcc6a3bdd72752501702)

diff --git a/src/core/main.c b/src/core/main.c
index 82d755125898c5c5a645d277d97e2bfc90dbb663..1e105cac2741b13190916e6c58b0490044d5d1ff 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2803,7 +2803,7 @@ static void determine_default_oom_score_adjust(void) {
                 return (void) log_warning_errno(r, "Failed to determine current OOM score adjustment value, ignoring: %m");
 
         assert_cc(100 <= OOM_SCORE_ADJ_MAX);
-        b = a >= OOM_SCORE_ADJ_MAX - 100 ? OOM_SCORE_ADJ_MAX : a + 100;
+        b = saturate_add(a, 100, OOM_SCORE_ADJ_MAX);
 
         if (a == b)
                 return;