Remove SYSTEM.H includes (string.h and stdint.h).

This commit is contained in:
David Brown 2016-08-22 18:24:03 +01:00
parent a39eefaf18
commit f3ecbd5c2b
51 changed files with 424 additions and 377 deletions

View file

@ -22,7 +22,7 @@ INTEGER Strings_Length (CHAR *s, LONGINT s__len)
INTEGER i;
__DUP(s, s__len, CHAR);
i = 0;
while (((LONGINT)i < s__len && s[__X(i, s__len)] != 0x00)) {
while (((SYSTEM_INT64)i < s__len && s[__X(i, s__len)] != 0x00)) {
i += 1;
}
_o_result = i;
@ -37,11 +37,11 @@ void Strings_Append (CHAR *extra, LONGINT extra__len, CHAR *dest, LONGINT dest__
n1 = Strings_Length(dest, dest__len);
n2 = Strings_Length(extra, extra__len);
i = 0;
while ((i < n2 && (LONGINT)(i + n1) < dest__len)) {
while ((i < n2 && (SYSTEM_INT64)(i + n1) < dest__len)) {
dest[__X(i + n1, dest__len)] = extra[__X(i, extra__len)];
i += 1;
}
if ((LONGINT)(i + n1) < dest__len) {
if ((SYSTEM_INT64)(i + n1) < dest__len) {
dest[__X(i + n1, dest__len)] = 0x00;
}
__DEL(extra);
@ -60,10 +60,10 @@ void Strings_Insert (CHAR *source, LONGINT source__len, INTEGER pos, CHAR *dest,
Strings_Append(dest, dest__len, (void*)source, source__len);
return;
}
if ((LONGINT)(pos + n2) < dest__len) {
if ((SYSTEM_INT64)(pos + n2) < dest__len) {
i = n1;
while (i >= pos) {
if ((LONGINT)(i + n2) < dest__len) {
if ((SYSTEM_INT64)(i + n2) < dest__len) {
dest[__X(i + n2, dest__len)] = dest[__X(i, dest__len)];
}
i -= 1;
@ -92,7 +92,7 @@ void Strings_Delete (CHAR *s, LONGINT s__len, INTEGER pos, INTEGER n)
s[__X(i - n, s__len)] = s[__X(i, s__len)];
i += 1;
}
if ((LONGINT)(i - n) < s__len) {
if ((SYSTEM_INT64)(i - n) < s__len) {
s[__X(i - n, s__len)] = 0x00;
}
} else {
@ -122,7 +122,7 @@ void Strings_Extract (CHAR *source, LONGINT source__len, INTEGER pos, INTEGER n,
return;
}
i = 0;
while (((((LONGINT)(pos + i) <= source__len && source[__X(pos + i, source__len)] != 0x00)) && i < n)) {
while (((((SYSTEM_INT64)(pos + i) <= source__len && source[__X(pos + i, source__len)] != 0x00)) && i < n)) {
if (i < destLen) {
dest[__X(i, dest__len)] = source[__X(pos + i, source__len)];
}