sheppy/colorredstderr-mirror
1
0
Fork 0
mirror of https://github.com/FAUSheppy/colorredstderr-mirror synced 2025-12-10 00:48:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

handle_*_pre(),handle_*_post(): Remove unused action parameter.

Browse Source
This commit is contained in:
Simon Ruderich
2013-06-10 04:53:30 +02:00
parent 30876b212c
commit fe3f7d4c63
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/coloredstderr.c
View File

@@ -140,9 +140,7 @@ inline static void init_pre_post_string(void) {
post_string_size = strlen(post_string);
}
static void handle_fd_pre(int fd, int action) {
(void)action;
static void handle_fd_pre(int fd) {
if (!pre_string || !post_string) {
init_pre_post_string();
}
@@ -150,16 +148,12 @@ static void handle_fd_pre(int fd, int action) {
DLSYM_FUNCTION(real_write, "write");
real_write(fd, pre_string, pre_string_size);
}
static void handle_fd_post(int fd, int action) {
(void)action;
static void handle_fd_post(int fd) {
/* write() already loaded above in handle_fd_pre(). */
real_write(fd, post_string, post_string_size);
}
static void handle_file_pre(FILE *stream, int action) {
(void)action;
static void handle_file_pre(FILE *stream) {
if (!pre_string || !post_string) {
init_pre_post_string();
}
@@ -167,9 +161,7 @@ static void handle_file_pre(FILE *stream, int action) {
DLSYM_FUNCTION(real_fwrite, "fwrite");
real_fwrite(pre_string, pre_string_size, 1, stream);
}
static void handle_file_post(FILE *stream, int action) {
(void)action;
static void handle_file_post(FILE *stream) {
/* fwrite() already loaded above in handle_file_pre(). */
real_fwrite(post_string, post_string_size, 1, stream);
}

8
src/hookmacros.h
View File

@@ -35,7 +35,7 @@
_HOOK_PRE(type, name) \
handle = check_handle_fd(fd); \
if (handle) { \
handle_fd_pre(fd, handle); \
handle_fd_pre(fd); \
} \
errno = saved_errno;
#define _HOOK_PRE_FILE(type, name, file) \
@@ -43,7 +43,7 @@
_HOOK_PRE(type, name) \
handle = check_handle_fd(fileno(file)); \
if (handle) { \
handle_file_pre(file, handle); \
handle_file_pre(file); \
} \
errno = saved_errno;
/* Save and restore the errno to make sure we return the errno of the original
@@ -51,7 +51,7 @@
#define _HOOK_POST_FD_(fd) \
if (handle) { \
saved_errno = errno; \
handle_fd_post(fd, handle); \
handle_fd_post(fd); \
errno = saved_errno; \
}
#define _HOOK_POST_FD(fd) \
@@ -60,7 +60,7 @@
#define _HOOK_POST_FILE(file) \
if (handle) { \
saved_errno = errno; \
handle_file_post(file, handle); \
handle_file_post(file); \
errno = saved_errno; \
} \
return result;