The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7c7299df76e2c4b43a2a52d0df66ee977bb6773b
commit 7c7299df76e2c4b43a2a52d0df66ee977bb6773b
Author: Minsoo Choo <minsoochoo0...@proton.me>
AuthorDate: 2024-04-12 19:05:09 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2024-04-12 19:05:09 +0000
libc: Remove support for pre-C99 C standards
Reviewed by: jhb
Differential Revision: https://reviews.freebsd.org/D43254
---
lib/libc/stdlib/div.c | 30 +-----------------------------
lib/libc/stdlib/imaxdiv.c | 7 +------
lib/libc/stdlib/ldiv.c | 7 +------
lib/libc/stdlib/lldiv.c | 7 +------
4 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c
index af6f95553435..351dca870553 100644
--- a/lib/libc/stdlib/div.c
+++ b/lib/libc/stdlib/div.c
@@ -41,34 +41,6 @@ div(int num, int denom)
r.quot = num / denom;
r.rem = num % denom;
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
- /*
- * The ANSI standard says that |r.quot| <= |n/d|, where
- * n/d is to be computed in infinite precision. In other
- * words, we should always truncate the quotient towards
- * 0, never -infinity.
- *
- * Machine division and remainer may work either way when
- * one or both of n or d is negative. If only one is
- * negative and r.quot has been truncated towards -inf,
- * r.rem will have the same sign as denom and the opposite
- * sign of num; if both are negative and r.quot has been
- * truncated towards -inf, r.rem will be positive (will
- * have the opposite sign of num). These are considered
- * `wrong'.
- *
- * If both are num and denom are positive, r will always
- * be positive.
- *
- * This all boils down to:
- * if num >= 0, but r.rem < 0, we got the wrong answer.
- * In that case, to get the right answer, add 1 to r.quot and
- * subtract denom from r.rem.
- */
- if (num >= 0 && r.rem < 0) {
- r.quot++;
- r.rem -= denom;
- }
-#endif
+
return (r);
}
diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c
index de72ead031d5..bf9737a3c47a 100644
--- a/lib/libc/stdlib/imaxdiv.c
+++ b/lib/libc/stdlib/imaxdiv.c
@@ -36,11 +36,6 @@ imaxdiv(intmax_t numer, intmax_t denom)
retval.quot = numer / denom;
retval.rem = numer % denom;
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
- if (numer >= 0 && retval.rem < 0) {
- retval.quot++;
- retval.rem -= denom;
- }
-#endif
+
return (retval);
}
diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c
index 999e8472042d..4c73bcc14af4 100644
--- a/lib/libc/stdlib/ldiv.c
+++ b/lib/libc/stdlib/ldiv.c
@@ -43,11 +43,6 @@ ldiv(long num, long denom)
r.quot = num / denom;
r.rem = num % denom;
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
- if (num >= 0 && r.rem < 0) {
- r.quot++;
- r.rem -= denom;
- }
-#endif
+
return (r);
}
diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c
index f7030e7ae1ff..6feeb74bacd6 100644
--- a/lib/libc/stdlib/lldiv.c
+++ b/lib/libc/stdlib/lldiv.c
@@ -36,11 +36,6 @@ lldiv(long long numer, long long denom)
retval.quot = numer / denom;
retval.rem = numer % denom;
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
- if (numer >= 0 && retval.rem < 0) {
- retval.quot++;
- retval.rem -= denom;
- }
-#endif
+
return (retval);
}
