-rw-r--r-- | libical/src/libical/icalmemory.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libical/src/libical/icalmemory.c b/libical/src/libical/icalmemory.c index 058ef37..18d7ef9 100644 --- a/libical/src/libical/icalmemory.c +++ b/libical/src/libical/icalmemory.c | |||
@@ -60,26 +60,26 @@ | |||
60 | 60 | ||
61 | #include "icalmemory.h" | 61 | #include "icalmemory.h" |
62 | #include "icalerror.h" | 62 | #include "icalerror.h" |
63 | 63 | ||
64 | #include <stdio.h> /* for printf (debugging) */ | 64 | #include <stdio.h> /* for printf (debugging) */ |
65 | #include <stdlib.h> /* for malloc, realloc */ | 65 | #include <stdlib.h> /* for malloc, realloc */ |
66 | #include <string.h> /* for memset(), strdup */ | 66 | #include <string.h> /* for memset(), strdup */ |
67 | 67 | ||
68 | #ifdef WIN32 | 68 | #ifdef WIN32 |
69 | #include <windows.h> | 69 | #include <windows.h> |
70 | #endif | 70 | #endif |
71 | 71 | ||
72 | #define BUFFER_RING_SIZE 2500 | 72 | #define BUFFER_RING_SIZE 50 |
73 | #define MIN_BUFFER_SIZE 200 | 73 | #define MIN_BUFFER_SIZE 64 |
74 | 74 | ||
75 | 75 | ||
76 | /* HACK. Not threadsafe */ | 76 | /* HACK. Not threadsafe */ |
77 | 77 | ||
78 | typedef struct { | 78 | typedef struct { |
79 | int pos; | 79 | int pos; |
80 | void *ring[BUFFER_RING_SIZE]; | 80 | void *ring[BUFFER_RING_SIZE]; |
81 | } buffer_ring; | 81 | } buffer_ring; |
82 | 82 | ||
83 | void icalmemory_free_tmp_buffer (void* buf); | 83 | void icalmemory_free_tmp_buffer (void* buf); |
84 | void icalmemory_free_ring_byval(buffer_ring *br); | 84 | void icalmemory_free_ring_byval(buffer_ring *br); |
85 | 85 | ||
@@ -204,26 +204,27 @@ void icalmemory_free_ring_byval(buffer_ring *br) { | |||
204 | for(i=0; i<BUFFER_RING_SIZE; i++){ | 204 | for(i=0; i<BUFFER_RING_SIZE; i++){ |
205 | if ( br->ring[i] != 0){ | 205 | if ( br->ring[i] != 0){ |
206 | free( br->ring[i]); | 206 | free( br->ring[i]); |
207 | } | 207 | } |
208 | } | 208 | } |
209 | free(br); | 209 | free(br); |
210 | } | 210 | } |
211 | 211 | ||
212 | void icalmemory_free_ring() | 212 | void icalmemory_free_ring() |
213 | { | 213 | { |
214 | buffer_ring *br; | 214 | buffer_ring *br; |
215 | br = get_buffer_ring(); | 215 | br = get_buffer_ring(); |
216 | |||
217 | icalmemory_free_ring_byval(br); | 216 | icalmemory_free_ring_byval(br); |
217 | if ( global_buffer_ring == br ) | ||
218 | global_buffer_ring = 0; | ||
218 | } | 219 | } |
219 | 220 | ||
220 | 221 | ||
221 | 222 | ||
222 | /** Like strdup, but the buffer is on the ring. */ | 223 | /** Like strdup, but the buffer is on the ring. */ |
223 | char* | 224 | char* |
224 | icalmemory_tmp_copy(const char* str) | 225 | icalmemory_tmp_copy(const char* str) |
225 | { | 226 | { |
226 | char* b = icalmemory_tmp_buffer(strlen(str)+1); | 227 | char* b = icalmemory_tmp_buffer(strlen(str)+1); |
227 | 228 | ||
228 | strcpy(b,str); | 229 | strcpy(b,str); |
229 | 230 | ||