From 5bd10cf74df979e611d69db0d5563b9d0854f884 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 15 Aug 2007 16:38:46 +0100 Subject: =?UTF-8?q?Workaround=20for=20recent=20glibc=20&=20-D=5FFORTIFY=5F?= =?UTF-8?q?SOURCE=3D2=20(defines=20open()=20as=20a=20macro).=20According?= =?UTF-8?q?=20to=20bug=201773769,=20this=20breaks=20foo->open().=20The=20f?= =?UTF-8?q?ix=20(as=20used=20in=20Ville=20Skytt=C3=A4's=20patch,=20which?= =?UTF-8?q?=20doesn't=20cover=20all=20cases)=20is=20to=20replace=20this=20?= =?UTF-8?q?with=20(foo->open)().?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch was generated using sed -i -re 's/(([[:alnum:]_]+(->|\.))+open) ?\(/(\1) (/' `grep '[>.]open \?(' include -rIl` One change (in a comment) is not committed. --- src/input/vcd/libcdio/_cdio_stream.c | 2 +- src/input/vcd/libvcd/stream.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/input') diff --git a/src/input/vcd/libcdio/_cdio_stream.c b/src/input/vcd/libcdio/_cdio_stream.c index fc1f7fce7..d3b9e0ade 100644 --- a/src/input/vcd/libcdio/_cdio_stream.c +++ b/src/input/vcd/libcdio/_cdio_stream.c @@ -57,7 +57,7 @@ _cdio_stream_open_if_necessary(CdioDataSource *obj) cdio_assert (obj != NULL); if (!obj->is_open) { - if (obj->op.open(obj->user_data)) { + if ((obj->op.open) (obj->user_data)) { cdio_warn ("could not open input stream..."); return false; } else { diff --git a/src/input/vcd/libvcd/stream.c b/src/input/vcd/libvcd/stream.c index 2840a05d6..ccc7cf046 100644 --- a/src/input/vcd/libvcd/stream.c +++ b/src/input/vcd/libvcd/stream.c @@ -59,7 +59,7 @@ _vcd_data_sink_open_if_necessary(VcdDataSink *obj) vcd_assert (obj != NULL); if (!obj->is_open) { - if (obj->op.open(obj->user_data)) + if ((obj->op.open) (obj->user_data)) vcd_error("could not opening output stream..."); else { obj->is_open = 1; @@ -173,7 +173,7 @@ _vcd_data_source_open_if_necessary(VcdDataSource *obj) vcd_assert (obj != NULL); if (!obj->is_open) { - if (obj->op.open(obj->user_data)) + if ((obj->op.open) (obj->user_data)) vcd_error ("could not opening input stream..."); else { #ifdef STREAM_DEBUG -- cgit v1.2.3