diff options
| author | Richard M. Stallman | 1998-03-21 07:06:14 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-03-21 07:06:14 +0000 |
| commit | fc932ac6c7b54ac6f79222a2548707a97d3a44f4 (patch) | |
| tree | 88f9f2ff546b9d84c11515967b4bb5cc3c16d080 /src/alloc.c | |
| parent | e7654b4a743e7c54c08629ee336e10a5f1089da6 (diff) | |
| download | emacs-fc932ac6c7b54ac6f79222a2548707a97d3a44f4.tar.gz emacs-fc932ac6c7b54ac6f79222a2548707a97d3a44f4.zip | |
Use STRING_BYTES and SET_STRING_BYTES.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/alloc.c b/src/alloc.c index 337a7f0ede5..5948229cc4b 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1376,7 +1376,7 @@ make_uninit_multibyte_string (length, length_byte) | |||
| 1376 | 1376 | ||
| 1377 | string_chars_consed += fullsize; | 1377 | string_chars_consed += fullsize; |
| 1378 | XSTRING (val)->size = length; | 1378 | XSTRING (val)->size = length; |
| 1379 | XSTRING (val)->size_byte = length_byte; | 1379 | SET_STRING_BYTES (XSTRING (val), length_byte); |
| 1380 | XSTRING (val)->data[length_byte] = 0; | 1380 | XSTRING (val)->data[length_byte] = 0; |
| 1381 | INITIALIZE_INTERVAL (XSTRING (val), NULL_INTERVAL); | 1381 | INITIALIZE_INTERVAL (XSTRING (val), NULL_INTERVAL); |
| 1382 | 1382 | ||
| @@ -1442,7 +1442,7 @@ make_pure_string (data, length, length_byte) | |||
| 1442 | error ("Pure Lisp storage exhausted"); | 1442 | error ("Pure Lisp storage exhausted"); |
| 1443 | XSETSTRING (new, PUREBEG + pureptr); | 1443 | XSETSTRING (new, PUREBEG + pureptr); |
| 1444 | XSTRING (new)->size = length; | 1444 | XSTRING (new)->size = length; |
| 1445 | XSTRING (new)->size_byte = length_byte; | 1445 | SET_STRING_BYTES (XSTRING (new), length_byte); |
| 1446 | bcopy (data, XSTRING (new)->data, length_byte); | 1446 | bcopy (data, XSTRING (new)->data, length_byte); |
| 1447 | XSTRING (new)->data[length_byte] = 0; | 1447 | XSTRING (new)->data[length_byte] = 0; |
| 1448 | 1448 | ||
| @@ -1548,7 +1548,7 @@ Does not copy symbols.") | |||
| 1548 | #endif /* LISP_FLOAT_TYPE */ | 1548 | #endif /* LISP_FLOAT_TYPE */ |
| 1549 | else if (STRINGP (obj)) | 1549 | else if (STRINGP (obj)) |
| 1550 | return make_pure_string (XSTRING (obj)->data, XSTRING (obj)->size, | 1550 | return make_pure_string (XSTRING (obj)->data, XSTRING (obj)->size, |
| 1551 | XSTRING (obj)->size_byte); | 1551 | STRING_BYTES (XSTRING (obj))); |
| 1552 | else if (COMPILEDP (obj) || VECTORP (obj)) | 1552 | else if (COMPILEDP (obj) || VECTORP (obj)) |
| 1553 | { | 1553 | { |
| 1554 | register struct Lisp_Vector *vec; | 1554 | register struct Lisp_Vector *vec; |
| @@ -2646,7 +2646,7 @@ compact_strings () | |||
| 2646 | 2646 | ||
| 2647 | register struct Lisp_String *newaddr; | 2647 | register struct Lisp_String *newaddr; |
| 2648 | register EMACS_INT size = nextstr->size; | 2648 | register EMACS_INT size = nextstr->size; |
| 2649 | EMACS_INT size_byte = nextstr->size_byte; | 2649 | EMACS_INT size_byte = STRING_BYTES (nextstr); |
| 2650 | 2650 | ||
| 2651 | /* NEXTSTR is the old address of the next string. | 2651 | /* NEXTSTR is the old address of the next string. |
| 2652 | Just skip it if it isn't marked. */ | 2652 | Just skip it if it isn't marked. */ |