X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Ftrackfds.h;h=ed2ea57738227a046ee290ded817182d9bca1e4a;hb=d171e6bbecb87d793003230d2557575d2c6460c0;hp=f84e20daee373c405c9b95642e4306232123245a;hpb=9af3c2c72729536f5822c78572510b251895eb70;p=coloredstderr%2Fcoloredstderr.git diff --git a/src/trackfds.h b/src/trackfds.h index f84e20d..ed2ea57 100644 --- a/src/trackfds.h +++ b/src/trackfds.h @@ -51,6 +51,8 @@ static void tracked_fds_debug(void) { #endif static int init_tracked_fds_list(size_t count) { + assert(count > 0); + /* Reduce reallocs. */ count += TRACKFDS_REALLOC_STEP; @@ -164,6 +166,8 @@ next: } static char *update_environment_buffer_entry(char *x, int fd) { + assert(fd >= 0); + int length = snprintf(x, 10 + 1, "%d", fd); if (length >= 10 + 1) { /* Integer too big to fit the buffer, skip it. */ @@ -183,6 +187,8 @@ static char *update_environment_buffer_entry(char *x, int fd) { return x; } static void update_environment_buffer(char *x) { + assert(initialized); + size_t i; for (i = 0; i < TRACKFDS_STATIC_COUNT; i++) { if (tracked_fds[i]) { @@ -194,6 +200,8 @@ static void update_environment_buffer(char *x) { } } inline static size_t update_environment_buffer_size(void) { + assert(initialized); + /* Use the maximum count (TRACKFDS_STATIC_COUNT) of used descriptors * because it's simple and small enough not to be a problem. * @@ -229,6 +237,8 @@ static void update_environment(void) { static void tracked_fds_add(int fd) { + assert(fd >= 0); + if (fd < TRACKFDS_STATIC_COUNT) { tracked_fds[fd] = 1; #if 0 @@ -269,6 +279,8 @@ static void tracked_fds_add(int fd) { #endif } static int tracked_fds_remove(int fd) { + assert(fd >= 0); + if (fd < TRACKFDS_STATIC_COUNT) { int old_value = tracked_fds[fd]; tracked_fds[fd] = 0; @@ -313,7 +325,9 @@ static int tracked_fds_find_slow(int fd) noinline; * they are not called often enough. */ inline static int tracked_fds_find(int fd) always_inline; -static int tracked_fds_find(int fd) { +inline static int tracked_fds_find(int fd) { + assert(fd >= 0); + if (fd < TRACKFDS_STATIC_COUNT) { return tracked_fds[fd]; } @@ -321,6 +335,8 @@ static int tracked_fds_find(int fd) { return tracked_fds_find_slow(fd); } static int tracked_fds_find_slow(int fd) { + assert(initialized); + if (tracked_fds_list_count == 0) { return 0; }