configure.ac: Add --enable-warnings.

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

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index 72a881fb866ab12e0e92188c58456e4e2979c1a7..d0c5494e27d27308b35096d418c032f3c1e2f143 100644 (file)
--- a/src/coloredstderr.c
+++ b/src/coloredstderr.c
@@ -20,6 +20,8 @@
 
 #include <config.h>
 
+#include "compiler.h"
+
 /* Must be loaded before the following headers. */
 #include "ldpreload.h"
 
@@ -51,8 +53,7 @@ static int force_write_to_non_tty;
 
 
 #include "constants.h"
-#include "compiler.h"
-#ifdef DEBUG
+#ifdef WARNING
 # include "debug.h"
 #endif
 
@@ -64,6 +65,19 @@ static int force_write_to_non_tty;
 /* See hookmacros.h for the decision if a function call is colored. */
 
 
+/* Prevent inlining into hook functions because it may increase the number of
+ * spilled registers unnecessarily. As it's not called very often accept the
+ * additional call. */
+static int isatty_noinline(int fd) noinline;
+static int isatty_noinline(int fd) {
+    int saved_errno = errno;
+    int result = isatty(fd);
+    errno = saved_errno;
+
+    return result;
+}
+
+
 static void dup_fd(int oldfd, int newfd) {
 #ifdef DEBUG
     debug("%3d -> %3d\t\t\t[%d]\n", oldfd, newfd, getpid());
@@ -108,7 +122,7 @@ static size_t post_string_size;
 
 /* Load alternative pre/post strings from the environment if available, fall
  * back to default values. */
-inline static void init_pre_post_string(void) {
+static void init_pre_post_string(void) {
     pre_string = getenv(ENV_NAME_PRE_STRING);
     if (!pre_string) {
         pre_string = DEFAULT_PRE_STRING;
@@ -122,6 +136,13 @@ inline static void init_pre_post_string(void) {
     post_string_size = strlen(post_string);
 }
 
+/* Don't inline any of the pre/post functions. Keep the hook function as small
+ * as possible for speed reasons. */
+static void handle_fd_pre(int fd) noinline;
+static void handle_fd_post(int fd) noinline;
+static void handle_file_pre(FILE *stream) noinline;
+static void handle_file_post(FILE *stream) noinline;
+
 static void handle_fd_pre(int fd) {
     int saved_errno = errno;