Fix compiler warning nits

This commit is contained in:
Bruce Hill 2021-05-31 12:56:49 -07:00
parent da6c8857d6
commit a67a257044
4 changed files with 13 additions and 11 deletions

18
files.c
View File

@ -98,14 +98,16 @@ file_t *load_file(file_t **files, const char *filename)
skip_mmap:
f->mmapped = false;
size_t capacity = 1000;
length = 0;
f->memory = xcalloc(sizeof(char), capacity);
ssize_t just_read;
while ((just_read=read(fd, &f->memory[length], capacity - length)) > 0) {
length += (size_t)just_read;
if (length >= capacity)
f->memory = xrealloc(f->memory, sizeof(char)*(capacity *= 2) + 1);
{
size_t capacity = 1000;
length = 0;
f->memory = xcalloc(sizeof(char), capacity);
ssize_t just_read;
while ((just_read=read(fd, &f->memory[length], capacity - length)) > 0) {
length += (size_t)just_read;
if (length >= capacity)
f->memory = xrealloc(f->memory, sizeof(char)*(capacity *= 2) + 1);
}
}
finished_loading:

View File

@ -472,7 +472,7 @@ static match_t *match(def_t *defs, file_t *f, const char *str, pat_t *pat, bool
return p ? new_match(pat, str, p->end, p) : NULL;
}
default: {
errx(EXIT_FAILURE, "Unknown pattern type: %d", pat->type);
errx(EXIT_FAILURE, "Unknown pattern type: %u", pat->type);
return NULL;
}
}

View File

@ -274,9 +274,8 @@ static void _print_match(FILE *out, printer_t *pr, match_t *m)
_print_match(out, pr, m->child);
return;
}
size_t line_start = get_line_number(pr->file, m->start);
size_t line = get_line_number(pr->file, m->start);
size_t line_end = get_line_number(pr->file, m->end);
size_t line = line_start;
if (pr->use_color && current_color != color_replace) {
fprintf(out, "%s", color_replace);

View File

@ -26,6 +26,7 @@ const char *after_spaces(const char *str)
while (*str && *str != '\n') ++str;
goto skip_whitespace;
}
default: break;
}
return str;
}