MT#55283 switch from off_t to size_t

Change-Id: I38b7188e7662aff55eec8496c2fc5a56080d45b5
pull/2099/head
Richard Fuchs 4 weeks ago
parent 92da915c5a
commit 959bd66a1d

@ -410,8 +410,8 @@ void metafile_change(char *name) {
// Incomplete data - this is expected when file is being written // Incomplete data - this is expected when file is being written
// Log only at DEBUG level as this is a normal race condition // Log only at DEBUG level as this is a normal race condition
if (head < endp) { if (head < endp) {
dbg("Incomplete section header in %s%s%s (waiting for more data, %ld bytes remain)", dbg("Incomplete section header in %s%s%s (waiting for more data, %zu bytes remain)",
FMT_M(name), (long)(endp - head)); FMT_M(name), endp - head);
} }
break; break;
} }
@ -450,8 +450,8 @@ void metafile_change(char *name) {
// content // content
if (endp - head < slen) { if (endp - head < slen) {
dbg("Content truncated in section %s in %s%s%s (have %ld, need %lu, waiting for more data)", dbg("Content truncated in section %s in %s%s%s (have %zu, need %lu, waiting for more data)",
section, FMT_M(name), (long)(endp - head), slen); section, FMT_M(name), endp - head, slen);
break; break;
} }
char *content = head; char *content = head;
@ -483,12 +483,12 @@ void metafile_change(char *name) {
// Only update file position to reflect successfully parsed data // Only update file position to reflect successfully parsed data
// Calculate how many bytes from the buffer we successfully processed // Calculate how many bytes from the buffer we successfully processed
off_t bytes_parsed = last_good_pos - s->str; size_t bytes_parsed = last_good_pos - s->str;
mf->pos += bytes_parsed; mf->pos += bytes_parsed;
if (bytes_parsed < s->len) { if (bytes_parsed < s->len) {
dbg("Parsed %ld of %ld bytes for %s%s%s, will retry remaining %ld bytes on next event", dbg("Parsed %zu of %zu bytes for %s%s%s, will retry remaining %zu bytes on next event",
(long)bytes_parsed, (long)s->len, FMT_M(name), (long)(s->len - bytes_parsed)); bytes_parsed, s->len, FMT_M(name), s->len - bytes_parsed);
} }
g_string_free(s, TRUE); g_string_free(s, TRUE);

@ -154,7 +154,7 @@ struct metafile_s {
char *output_dest; char *output_dest;
char *output_path; char *output_path;
char *output_pattern; char *output_pattern;
off_t pos; size_t pos;
unsigned long long db_id; unsigned long long db_id;
unsigned int db_streams; unsigned int db_streams;
int64_t start_time_us; int64_t start_time_us;

Loading…
Cancel
Save