Inline check_handle_fd() into hook macros.

[coloredstderr/coloredstderr.git] / src / coloredstderr.c

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index 8775541a61e8c6b42d871b0c8cf78628d31f6a0f..a95486dc4be6bbf865aaef66718ab8eefdf7b061 100644 (file)
--- a/src/coloredstderr.c
+++ b/src/coloredstderr.c
@@ -60,31 +60,8 @@ static int force_write_to_non_tty;
 
 
 
-/* Should the "action" handler be invoked for this file descriptor? */
-static int check_handle_fd(int fd) {
-    /* Load state from environment. Only necessary once per process. */
-    if (!initialized) {
-        init_from_environment();
-    }
-
-    /* tracked_fds_find() is most likely faster than calling isatty(),
-     * therefore check if we are tracking this file descriptor first. */
-    if (!tracked_fds_find(fd)) {
-        return 0;
-    }
-
-    /* Never touch anything not going to a terminal - unless we are explicitly
-     * asked to do so. */
-    if (force_write_to_non_tty) {
-        return 1;
-    }
-
-    int saved_errno = errno;
-    int result = isatty(fd);
-    errno = saved_errno;
+/* See hookmacros.h for the decision if a function call is colored. */
 
-    return result;
-}
 
 static void dup_fd(int oldfd, int newfd) {
 #ifdef DEBUG