From 6e13d1a421c028bf9a469f23a2e9eb7ba150d188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sun, 13 May 2012 17:01:40 +0200
Subject: [PATCH] files: Fixed some broken macros.
Also fixes a gcc warning.
---
src/modules/files/file.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index c74393c045..6f7efce7bf 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -673,8 +673,8 @@ static struct pike_string *do_read(int fd,
bytes_read=0;
*err=0;
- if(r <= DIRECT_BUFSIZE
- || all && (r<<1) > r && (((r-1)|r)+1)!=(r<<1)) /* r<<1 != power of two */
+ if(r <= DIRECT_BUFSIZE ||
+ (all && (r<<1) > r && (((r-1)|r)+1)!=(r<<1))) /* r<<1 != power of two */
{
struct pike_string *str;
@@ -1729,17 +1729,17 @@ static void set_fd_event_cb (struct my_file *f, struct svalue *cb, int event, in
#define CBFUNCS2(CB, EVENT) \
static void PIKE_CONCAT(file_set_,CB) (INT32 args) \
- { \
+ { \
if(!args) \
SIMPLE_TOO_FEW_ARGS_ERROR("Stdio.File->set_" #CB, 2); \
- set_fd_event_cb (THIS, Pike_sp-args, EVENT, Pike_sp[-1].u.integer); \
+ set_fd_event_cb (THIS, Pike_sp-args, EVENT, Pike_sp[-1].u.integer); \
} \
\
static void PIKE_CONCAT(file_query_,CB) (INT32 args) \
{ \
pop_n_elems(args); \
push_svalue(& THIS->event_cbs[EVENT]); \
- } \
+ }
CBFUNCS(read_callback, PIKE_FD_READ)
CBFUNCS(write_callback, PIKE_FD_WRITE)
--
GitLab