X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fcoloredstderr.c;h=eae164dd93d168856440fbfbf09209cdd94eb60b;hb=7c2d726cd4c2716e9c211b5a5ab5d7713e1dfc5e;hp=727c580895b7814d18bba43ec832e905ba7ff6b4;hpb=86352712fdc5fa08777eca1458f4ef6bbe579e7b;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index 727c580..eae164d 100644
--- 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
 
@@ -67,7 +68,7 @@ static int force_write_to_non_tty;
 /* 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) noinline;
 static int isatty_noinline(int fd) {
     int saved_errno = errno;
     int result = isatty(fd);
@@ -121,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;
@@ -135,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;
 
@@ -235,9 +243,9 @@ HOOK_VOID1(void, perror, STDERR_FILENO,
 
 /* error(3) */
 #ifdef HAVE_ERROR_H
-static void  error_vararg(int status, int errnum,
-                   char const *filename, unsigned int linenum,
-                   char const *format, va_list ap) {
+static void error_vararg(int status, int errnum,
+                         char const *filename, unsigned int linenum,
+                         char const *format, va_list ap) {
     static char const *last_filename;
     static unsigned int last_linenum;