Fix some leftover size_t references · rs2/pandas@3171674 (original) (raw)
`@@ -305,11 +305,11 @@ static int make_stream_space(parser_t *self, size_t nbytes) {
`
305
305
`"self->words_cap=%d\n",
`
306
306
`nbytes, self->words_cap))
`
307
307
`newptr = safe_realloc((void *)self->word_starts,
`
308
``
`-
sizeof(size_t) * self->words_cap);
`
``
308
`+
sizeof(int64_t) * self->words_cap);
`
309
309
`if (newptr == NULL) {
`
310
310
`return PARSER_OUT_OF_MEMORY;
`
311
311
` } else {
`
312
``
`-
self->word_starts = (size_t *)newptr;
`
``
312
`+
self->word_starts = (int64_t *)newptr;
`
313
313
` }
`
314
314
` }
`
315
315
``
`@@ -318,8 +318,8 @@ static int make_stream_space(parser_t *self, size_t nbytes) {
`
318
318
` */
`
319
319
`cap = self->lines_cap;
`
320
320
`self->line_start =
`
321
``
`-
(size_t *)grow_buffer((void *)self->line_start, self->lines + 1,
`
322
``
`-
&self->lines_cap, nbytes, sizeof(size_t), &status);
`
``
321
`+
(int64_t *)grow_buffer((void *)self->line_start, self->lines + 1,
`
``
322
`+
&self->lines_cap, nbytes, sizeof(int64_t), &status);
`
323
323
`TRACE((
`
324
324
`"make_stream_space: grow_buffer(self->line_start, %zu, %zu, %zu, %d)\n",
`
325
325
`self->lines + 1, self->lines_cap, nbytes, status))
`
`@@ -332,11 +332,11 @@ static int make_stream_space(parser_t *self, size_t nbytes) {
`
332
332
`TRACE(("make_stream_space: cap != self->lines_cap, nbytes = %d\n",
`
333
333
`nbytes))
`
334
334
`newptr = safe_realloc((void *)self->line_fields,
`
335
``
`-
sizeof(size_t) * self->lines_cap);
`
``
335
`+
sizeof(int64_t) * self->lines_cap);
`
336
336
`if (newptr == NULL) {
`
337
337
`return PARSER_OUT_OF_MEMORY;
`
338
338
` } else {
`
339
``
`-
self->line_fields = (size_t *)newptr;
`
``
339
`+
self->line_fields = (int64_t *)newptr;
`
340
340
` }
`
341
341
` }
`
342
342
``
`@@ -718,8 +718,8 @@ int skip_this_line(parser_t *self, int64_t rownum) {
`
718
718
` }
`
719
719
`}
`
720
720
``
721
``
`-
int tokenize_bytes(parser_t *self, size_t line_limit, size_t start_lines) {
`
722
``
`-
size_t i, slen;
`
``
721
`+
int tokenize_bytes(parser_t *self, size_t line_limit, int64_t start_lines) {
`
``
722
`+
int64_t i, slen;
`
723
723
`int should_skip;
`
724
724
`char c;
`
725
725
`char *stream;
`
`@@ -1235,7 +1235,7 @@ int parser_trim_buffers(parser_t *self) {
`
1235
1235
`size_t new_cap;
`
1236
1236
`void *newptr;
`
1237
1237
``
1238
``
`-
size_t i;
`
``
1238
`+
int64_t i;
`
1239
1239
``
1240
1240
`/* trim words, word_starts */
`
1241
1241
`new_cap = _next_pow2(self->words_len) + 1;
`
`@@ -1248,11 +1248,11 @@ int parser_trim_buffers(parser_t *self) {
`
1248
1248
`self->words = (char **)newptr;
`
1249
1249
` }
`
1250
1250
`newptr = safe_realloc((void *)self->word_starts,
`
1251
``
`-
new_cap * sizeof(size_t));
`
``
1251
`+
new_cap * sizeof(int64_t));
`
1252
1252
`if (newptr == NULL) {
`
1253
1253
`return PARSER_OUT_OF_MEMORY;
`
1254
1254
` } else {
`
1255
``
`-
self->word_starts = (size_t *)newptr;
`
``
1255
`+
self->word_starts = (int64_t *)newptr;
`
1256
1256
`self->words_cap = new_cap;
`
1257
1257
` }
`
1258
1258
` }
`
`@@ -1299,18 +1299,18 @@ int parser_trim_buffers(parser_t *self) {
`
1299
1299
`if (new_cap < self->lines_cap) {
`
1300
1300
`TRACE(("parser_trim_buffers: new_cap < self->lines_cap\n"));
`
1301
1301
`newptr = safe_realloc((void *)self->line_start,
`
1302
``
`-
new_cap * sizeof(size_t));
`
``
1302
`+
new_cap * sizeof(int64_t));
`
1303
1303
`if (newptr == NULL) {
`
1304
1304
`return PARSER_OUT_OF_MEMORY;
`
1305
1305
` } else {
`
1306
``
`-
self->line_start = (size_t *)newptr;
`
``
1306
`+
self->line_start = (int64_t *)newptr;
`
1307
1307
` }
`
1308
1308
`newptr = safe_realloc((void *)self->line_fields,
`
1309
``
`-
new_cap * sizeof(size_t));
`
``
1309
`+
new_cap * sizeof(int64_t));
`
1310
1310
`if (newptr == NULL) {
`
1311
1311
`return PARSER_OUT_OF_MEMORY;
`
1312
1312
` } else {
`
1313
``
`-
self->line_fields = (size_t *)newptr;
`
``
1313
`+
self->line_fields = (int64_t *)newptr;
`
1314
1314
`self->lines_cap = new_cap;
`
1315
1315
` }
`
1316
1316
` }
`
`@@ -1319,7 +1319,7 @@ int parser_trim_buffers(parser_t *self) {
`
1319
1319
`}
`
1320
1320
``
1321
1321
`void debug_print_parser(parser_t *self) {
`
1322
``
`-
size_t j, line;
`
``
1322
`+
int64_t j, line;
`
1323
1323
`char *token;
`
1324
1324
``
1325
1325
`for (line = 0; line < self->lines; ++line) {
`
`@@ -1340,7 +1340,7 @@ void debug_print_parser(parser_t *self) {
`
1340
1340
``
1341
1341
`int _tokenize_helper(parser_t *self, size_t nrows, int all) {
`
1342
1342
`int status = 0;
`
1343
``
`-
size_t start_lines = self->lines;
`
``
1343
`+
int64_t start_lines = self->lines;
`
1344
1344
``
1345
1345
`if (self->state == FINISHED) {
`
1346
1346
`return 0;
`