summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2001-05-16 14:34:47 +0000
committerru <ru@FreeBSD.org>2001-05-16 14:34:47 +0000
commit6560bf44e92e4d136ec44a5e9744caec257046fc (patch)
tree17d51232e76b29a32100ee3a50d2d23a1b2deef8 /lib
parentb9f33f3993fb48e463c0875a9841beca42165a64 (diff)
downloadFreeBSD-src-6560bf44e92e4d136ec44a5e9744caec257046fc.zip
FreeBSD-src-6560bf44e92e4d136ec44a5e9744caec257046fc.tar.gz
Unbreak world; _DIAGASSERT macro is not available in FreeBSD.
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/string/wcscat.c3
-rw-r--r--lib/libc/string/wcschr.c2
-rw-r--r--lib/libc/string/wcscmp.c3
-rw-r--r--lib/libc/string/wcscpy.c3
-rw-r--r--lib/libc/string/wcscspn.c3
-rw-r--r--lib/libc/string/wcslcat.c3
-rw-r--r--lib/libc/string/wcslcpy.c3
-rw-r--r--lib/libc/string/wcslen.c2
-rw-r--r--lib/libc/string/wcsncat.c3
-rw-r--r--lib/libc/string/wcsncmp.c3
-rw-r--r--lib/libc/string/wcsncpy.c3
-rw-r--r--lib/libc/string/wcspbrk.c3
-rw-r--r--lib/libc/string/wcsrchr.c2
-rw-r--r--lib/libc/string/wcsspn.c3
-rw-r--r--lib/libc/string/wcsstr.c3
-rw-r--r--lib/libc/string/wcswidth.c2
-rw-r--r--lib/libc/string/wmemchr.c2
-rw-r--r--lib/libc/string/wmemcmp.c3
-rw-r--r--lib/libc/string/wmemcpy.c3
-rw-r--r--lib/libc/string/wmemmove.c3
-rw-r--r--lib/libc/string/wmemset.c2
21 files changed, 0 insertions, 57 deletions
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
index ce6bc58..25161d3 100644
--- a/lib/libc/string/wcscat.c
+++ b/lib/libc/string/wcscat.c
@@ -46,9 +46,6 @@ wcscat(s1, s2)
wchar_t *q;
const wchar_t *r;
- _DIAGASSERT(s1 != NULL);
- _DIAGASSERT(s2 != NULL);
-
p = s1;
while (*p)
p++;
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
index 9c600bf..9c253dc 100644
--- a/lib/libc/string/wcschr.c
+++ b/lib/libc/string/wcschr.c
@@ -45,8 +45,6 @@ wcschr(s, c)
{
const wchar_t *p;
- _DIAGASSERT(s != NULL);
-
p = s;
while (*p) {
if (*p == c) {
diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c
index af5e212..d0eb1ee 100644
--- a/lib/libc/string/wcscmp.c
+++ b/lib/libc/string/wcscmp.c
@@ -58,9 +58,6 @@ wcscmp(s1, s2)
const wchar_t *s1, *s2;
{
- _DIAGASSERT(s1 != NULL);
- _DIAGASSERT(s2 != NULL);
-
while (*s1 == *s2++)
if (*s1++ == 0)
return (0);
diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
index 9dfdeab..6d0b40d 100644
--- a/lib/libc/string/wcscpy.c
+++ b/lib/libc/string/wcscpy.c
@@ -46,9 +46,6 @@ wcscpy(s1, s2)
wchar_t *p;
const wchar_t *q;
- _DIAGASSERT(s1 != NULL);
- _DIAGASSERT(s2 != NULL);
-
*s1 = '\0';
p = s1;
q = s2;
diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c
index ad52f44..10a3e80 100644
--- a/lib/libc/string/wcscspn.c
+++ b/lib/libc/string/wcscspn.c
@@ -46,9 +46,6 @@ wcscspn(s, set)
const wchar_t *p;
const wchar_t *q;
- _DIAGASSERT(s != NULL);
- _DIAGASSERT(set != NULL);
-
p = s;
while (*p) {
q = set;
diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c
index d6c669a..3145eaf 100644
--- a/lib/libc/string/wcslcat.c
+++ b/lib/libc/string/wcslcat.c
@@ -57,9 +57,6 @@ wcslcat(dst, src, siz)
size_t n = siz;
size_t dlen;
- _DIAGASSERT(dst != NULL);
- _DIAGASSERT(src != NULL);
-
/* Find the end of dst and adjust bytes left but don't go past end */
while (*d != '\0' && n-- != 0)
d++;
diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c
index c8086b8..ff883e0 100644
--- a/lib/libc/string/wcslcpy.c
+++ b/lib/libc/string/wcslcpy.c
@@ -54,9 +54,6 @@ wcslcpy(dst, src, siz)
const wchar_t *s = src;
size_t n = siz;
- _DIAGASSERT(dst != NULL);
- _DIAGASSERT(src != NULL);
-
/* Copy as many bytes as will fit */
if (n != 0 && --n != 0) {
do {
diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c
index d47d01e..1e03817 100644
--- a/lib/libc/string/wcslen.c
+++ b/lib/libc/string/wcslen.c
@@ -44,8 +44,6 @@ wcslen(s)
{
const wchar_t *p;
- _DIAGASSERT(s != NULL);
-
p = s;
while (*p)
p++;
diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c
index 4d01128..a0410df 100644
--- a/lib/libc/string/wcsncat.c
+++ b/lib/libc/string/wcsncat.c
@@ -48,9 +48,6 @@ wcsncat(s1, s2, n)
wchar_t *q;
const wchar_t *r;
- _DIAGASSERT(s1 != NULL);
- _DIAGASSERT(s2 != NULL);
-
p = s1;
while (*p)
p++;
diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c
index 93a20b8..0b406af 100644
--- a/lib/libc/string/wcsncmp.c
+++ b/lib/libc/string/wcsncmp.c
@@ -53,9 +53,6 @@ wcsncmp(s1, s2, n)
size_t n;
{
- _DIAGASSERT(s1 != NULL);
- _DIAGASSERT(s2 != NULL);
-
if (n == 0)
return (0);
do {
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
index d3f61d2..b184628 100644
--- a/lib/libc/string/wcsncpy.c
+++ b/lib/libc/string/wcsncpy.c
@@ -47,9 +47,6 @@ wcsncpy(s1, s2, n)
wchar_t *p;
const wchar_t *q;
- _DIAGASSERT(s1 != NULL);
- _DIAGASSERT(s2 != NULL);
-
*s1 = '\0';
p = s1;
q = s2;
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
index 488d418..8c3e066 100644
--- a/lib/libc/string/wcspbrk.c
+++ b/lib/libc/string/wcspbrk.c
@@ -46,9 +46,6 @@ wcspbrk(s, set)
const wchar_t *p;
const wchar_t *q;
- _DIAGASSERT(s != NULL);
- _DIAGASSERT(set != NULL);
-
p = s;
while (*p) {
q = set;
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
index f19940c..5b3d789 100644
--- a/lib/libc/string/wcsrchr.c
+++ b/lib/libc/string/wcsrchr.c
@@ -45,8 +45,6 @@ wcsrchr(s, c)
{
const wchar_t *p;
- _DIAGASSERT(s != NULL);
-
p = s;
while (*p)
p++;
diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c
index 05dfe71..2f91f60 100644
--- a/lib/libc/string/wcsspn.c
+++ b/lib/libc/string/wcsspn.c
@@ -46,9 +46,6 @@ wcsspn(s, set)
const wchar_t *p;
const wchar_t *q;
- _DIAGASSERT(s != NULL);
- _DIAGASSERT(set != NULL);
-
p = s;
while (*p) {
q = set;
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
index 2026352..f6eb89d 100644
--- a/lib/libc/string/wcsstr.c
+++ b/lib/libc/string/wcsstr.c
@@ -47,9 +47,6 @@ wcsstr(big, little)
const wchar_t *q;
const wchar_t *r;
- _DIAGASSERT(big != NULL);
- _DIAGASSERT(little != NULL);
-
if (!*little) {
/* LINTED interface specification */
return (wchar_t *)big;
diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c
index 0bc2ebe..ed3eb9d 100644
--- a/lib/libc/string/wcswidth.c
+++ b/lib/libc/string/wcswidth.c
@@ -45,8 +45,6 @@ wcswidth(s, n)
{
int w;
- _DIAGASSERT(s != NULL);
-
w = 0;
while (n && *s) {
w += wcwidth(*s);
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
index f98d61b..80add2a 100644
--- a/lib/libc/string/wmemchr.c
+++ b/lib/libc/string/wmemchr.c
@@ -46,8 +46,6 @@ wmemchr(s, c, n)
{
size_t i;
- _DIAGASSERT(s != NULL);
-
for (i = 0; i < n; i++) {
if (*s == c) {
/* LINTED const castaway */
diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c
index 7ed1cb3..1ce3946 100644
--- a/lib/libc/string/wmemcmp.c
+++ b/lib/libc/string/wmemcmp.c
@@ -46,9 +46,6 @@ wmemcmp(s1, s2, n)
{
size_t i;
- _DIAGASSERT(s1 != NULL);
- _DIAGASSERT(s2 != NULL);
-
for (i = 0; i < n; i++) {
if (*s1 != *s2) {
/* wchar might be unsigned */
diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c
index 122f054..af2ae99 100644
--- a/lib/libc/string/wmemcpy.c
+++ b/lib/libc/string/wmemcpy.c
@@ -46,8 +46,5 @@ wmemcpy(d, s, n)
size_t n;
{
- _DIAGASSERT(d != NULL);
- _DIAGASSERT(s != NULL);
-
return (wchar_t *)memcpy(d, s, n * sizeof(wchar_t));
}
diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c
index 5143ab4..2b9e275 100644
--- a/lib/libc/string/wmemmove.c
+++ b/lib/libc/string/wmemmove.c
@@ -46,8 +46,5 @@ wmemmove(d, s, n)
size_t n;
{
- _DIAGASSERT(d != NULL);
- _DIAGASSERT(s != NULL);
-
return (wchar_t *)memmove(d, s, n * sizeof(wchar_t));
}
diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c
index 7e36d1d..c456385 100644
--- a/lib/libc/string/wmemset.c
+++ b/lib/libc/string/wmemset.c
@@ -47,8 +47,6 @@ wmemset(s, c, n)
size_t i;
wchar_t *p;
- _DIAGASSERT(s != NULL);
-
p = (wchar_t *)s;
for (i = 0; i < n; i++) {
*p = c;
OpenPOWER on IntegriCloud