diff options
| author | Sjoerd Mullender <sjoerd@acm.org> | 1993-11-01 13:46:50 (GMT) |
|---|---|---|
| committer | Sjoerd Mullender <sjoerd@acm.org> | 1993-11-01 13:46:50 (GMT) |
| commit | 615194a3526ce2cd50a255113470ba24e3fca0b9 (patch) | |
| tree | b4619ccf736036474866cbbe53a22bafd96b6bc0 /Objects/stringobject.c | |
| parent | 0a2fa75a9c2d6618b5fc9e4745551adfc7dd4aba (diff) | |
| download | cpython-615194a3526ce2cd50a255113470ba24e3fca0b9.zip cpython-615194a3526ce2cd50a255113470ba24e3fca0b9.tar.gz cpython-615194a3526ce2cd50a255113470ba24e3fca0b9.tar.bz2 | |
Fixed bugs in resizetuple and extended the interface.
Added ifdefs in stringobject.c for shared strings of length 1.
Renamed free_list in tupleobject.c to free_tuples.
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 61863b6..0d03a3b 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -39,7 +39,9 @@ int null_strings, one_strings; #endif static stringobject *characters[UCHAR_MAX + 1]; +#ifndef DONT_SHARE_SHORT_STRINGS static stringobject *nullstring; +#endif /* Newsizedstringobject() and newstringobject() try in certain cases @@ -62,6 +64,7 @@ newsizedstringobject(str, size) int size; { register stringobject *op; +#ifndef DONT_SHARE_SHORT_STRINGS if (size == 0 && (op = nullstring) != NULL) { #ifdef COUNT_ALLOCS null_strings++; @@ -76,6 +79,7 @@ newsizedstringobject(str, size) INCREF(op); return (object *)op; } +#endif /* DONT_SHARE_SHORT_STRINGS */ op = (stringobject *) malloc(sizeof(stringobject) + size * sizeof(char)); if (op == NULL) @@ -89,6 +93,7 @@ newsizedstringobject(str, size) if (str != NULL) memcpy(op->ob_sval, str, size); op->ob_sval[size] = '\0'; +#ifndef DONT_SHARE_SHORT_STRINGS if (size == 0) { nullstring = op; INCREF(op); @@ -96,6 +101,7 @@ newsizedstringobject(str, size) characters[*str & UCHAR_MAX] = op; INCREF(op); } +#endif return (object *) op; } @@ -105,6 +111,7 @@ newstringobject(str) { register unsigned int size = strlen(str); register stringobject *op; +#ifndef DONT_SHARE_SHORT_STRINGS if (size == 0 && (op = nullstring) != NULL) { #ifdef COUNT_ALLOCS null_strings++; @@ -119,6 +126,7 @@ newstringobject(str) INCREF(op); return (object *)op; } +#endif /* DONT_SHARE_SHORT_STRINGS */ op = (stringobject *) malloc(sizeof(stringobject) + size * sizeof(char)); if (op == NULL) @@ -130,6 +138,7 @@ newstringobject(str) #endif NEWREF(op); strcpy(op->ob_sval, str); +#ifndef DONT_SHARE_SHORT_STRINGS if (size == 0) { nullstring = op; INCREF(op); @@ -137,6 +146,7 @@ newstringobject(str) characters[*str & UCHAR_MAX] = op; INCREF(op); } +#endif return (object *) op; } |