From: Martin Schwenke <martin@meltin.net>
Date: Tue, 25 Jun 2019 00:03:44 +0000 (+1000)
Subject: ctdb-build: Tweak hacking of rpcgen output
X-Git-Tag: samba-4.11.0rc1~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0b33c5549ffb1a06270af5e2b4a199496add90d;p=thirdparty%2Fsamba.git

ctdb-build: Tweak hacking of rpcgen output

csbuild doesn't like the hack where variable buf is initialised to
itself to avoid an unused variable warning.  buf is unused so remove
it instead.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/wscript b/ctdb/wscript
index 614e042bd70..51a09fdc63d 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -634,7 +634,7 @@ def build(bld):
                         target='utils/smnotify/smnotify.h',
                         rule='rpcgen -h ${SRC} > ${TGT}')
 
-    xdr_buf_hack = 'sed -e "s@^\([ \t]*register int32_t \*buf\);@\\1 = buf;@"'
+    xdr_buf_hack = 'grep -Fv "register int32_t *buf;"'
 
     bld.SAMBA_GENERATOR('ctdb-smnotify-x',
                         source='utils/smnotify/smnotify.x',