pidl/tests: fix ndr_push_init_ctx() usage

The code in libndr got rid of the second argument quite some time ago
(2010): f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d

However, pidl tests did include a code that passed two arguments.
Recently GCC started to fail to compile such code.

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Aug 30 04:48:00 CEST 2018 on sn-devel-144

diff --git a/pidl/tests/ndr_align.pl b/pidl/tests/ndr_align.pl
index cc089eaa1f7aabf1f48266dd31e6613b68d352f4..1f4a0da9bbb6211ea46bd64a88546fad86454ec6 100755 (executable)
--- a/pidl/tests/ndr_align.pl
+++ b/pidl/tests/ndr_align.pl
@@ -16,7 +16,7 @@ test_samba4_ndr('align-uint8-uint16',
        } bla;
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct bla r;
        uint8_t expected[] = { 0x0D, 0x00, 0xef, 0xbe };
        DATA_BLOB expected_blob = { expected, 4 };
@@ -41,7 +41,7 @@ test_samba4_ndr('align-uint8-uint32',
        } bla;
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct bla r;
        uint8_t expected[] = { 0x0D, 0x00, 0x00, 0x00, 0xef, 0xbe, 0xef, 0xbe };
        DATA_BLOB expected_blob = { expected, 8 };
@@ -67,7 +67,7 @@ test_samba4_ndr('align-uint8-hyper',
        } bla;
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct bla r;
        uint8_t expected[] = { 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
                               0xef, 0xbe, 0xef, 0xbe, 0xef, 0xbe, 0xef, 0xbe };
@@ -93,7 +93,7 @@ test_samba4_ndr('noalignflag-uint8-uint16',
        } bla;
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct bla r;
        uint8_t expected[] = { 0x0D, 0xef, 0xbe };
        DATA_BLOB expected_blob = { expected, 3 };
@@ -121,7 +121,7 @@ test_samba4_ndr('align-blob-align2',
        } blie;
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct blie r;
        uint8_t data[] = { 0x01, 0x02 };
        uint8_t expected[] = { 0x0D, 0x00, 0x0E };

diff --git a/pidl/tests/ndr_fullptr.pl b/pidl/tests/ndr_fullptr.pl
index cc6fca7ab39bcd46a0752fe0dbef57cb9cbe4639..4ba11b740c6e7fdb4729a4b870fc3d98bf9e3101 100755 (executable)
--- a/pidl/tests/ndr_fullptr.pl
+++ b/pidl/tests/ndr_fullptr.pl
@@ -17,7 +17,7 @@ test_samba4_ndr("fullptr-push-dup",
        [public] uint16 echo_TestFull([in,ptr] uint32 *x, [in,ptr] uint32 *y);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        uint32_t v = 13;
        struct echo_TestFull r;
        r.in.x = &v; 

diff --git a/pidl/tests/ndr_refptr.pl b/pidl/tests/ndr_refptr.pl
index d5dd83957a41c3fd560627c400d1e523c867057c..f972611ed81cd36948aef2b66c86f203020009ee 100755 (executable)
--- a/pidl/tests/ndr_refptr.pl
+++ b/pidl/tests/ndr_refptr.pl
@@ -18,7 +18,7 @@ test_samba4_ndr("noptr-push",
        [public] uint16 echo_TestRef([in] xstruct foo);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        uint16_t v = 13;
        struct echo_TestRef r;
        r.in.foo.x = v; 
@@ -48,7 +48,7 @@ test_samba4_ndr("ptr-embedded-push",
 ',
 '
        uint16_t v = 13;
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        r.in.foo.x = &v; 
 
@@ -74,7 +74,7 @@ test_samba4_ndr("ptr-embedded-push-null",
        [public] uint16 echo_TestRef([in] xstruct foo);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        r.in.foo.x = NULL; 
 
@@ -99,7 +99,7 @@ test_samba4_ndr("refptr-embedded-push",
 ',
 '
        uint16_t v = 13;
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        r.in.foo.x = &v; 
 
@@ -126,7 +126,7 @@ test_samba4_ndr("refptr-embedded-push-null",
        [public] uint16 echo_TestRef([in] xstruct foo);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        r.in.foo.x = NULL; 
 
@@ -144,7 +144,7 @@ test_samba4_ndr("ptr-top-push",
        [public] uint16 echo_TestRef([in] xstruct *foo);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        struct xstruct s;
        s.x = 13;
@@ -169,7 +169,7 @@ test_samba4_ndr("ptr-top-push-null",
        [public] uint16 echo_TestRef([in] xstruct *foo);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        r.in.foo = NULL;
 
@@ -189,7 +189,7 @@ test_samba4_ndr("refptr-top-push",
        [public] uint16 echo_TestRef([in,ref] xstruct *foo);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        struct xstruct s;
        s.x = 13;
@@ -214,7 +214,7 @@ test_samba4_ndr("refptr-top-push-null",
        [public] uint16 echo_TestRef([in,ref] xstruct *foo);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        r.in.foo = NULL;
 
@@ -233,7 +233,7 @@ test_samba4_ndr("uniqueptr-top-push",
        [public] uint16 echo_TestRef([in,unique] xstruct *foo);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        struct xstruct s;
        s.x = 13;
@@ -261,7 +261,7 @@ test_samba4_ndr("uniqueptr-top-push-null",
        [public] uint16 echo_TestRef([in,unique] xstruct *foo);
 ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        r.in.foo = NULL;
 
@@ -381,7 +381,7 @@ test_samba4_ndr("ptr-top-push-double",
 '
        [public] void echo_TestRef([in] uint16 **foo);
 ',
-'      struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+'      struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        uint16_t v = 13;
        uint16_t *pv = &v;
@@ -408,7 +408,7 @@ test_samba4_ndr("ptr-top-push-double-sndnull",
 '
        [public] void echo_TestRef([in] uint16 **foo);
 ',
-'      struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+'      struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        uint16_t *pv = NULL;
        r.in.foo = &pv;
@@ -429,7 +429,7 @@ test_samba4_ndr("ptr-top-push-double-fstnull",
 '
        [public] void echo_TestRef([in] uint16 **foo);
 ',
-'      struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+'      struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        r.in.foo = NULL;
 
@@ -445,7 +445,7 @@ test_samba4_ndr("refptr-top-push-double",
 '
        [public] void echo_TestRef([in,ref] uint16 **foo);
 ',
-'      struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+'      struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        uint16_t v = 13;
        uint16_t *pv = &v;
@@ -473,7 +473,7 @@ test_samba4_ndr("refptr-top-push-double-sndnull",
 '
        [public] void echo_TestRef([in,ref] uint16 **foo);
 ',
-'      struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+'      struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        uint16_t *pv = NULL;
        r.in.foo = &pv;
@@ -494,7 +494,7 @@ test_samba4_ndr("refptr-top-push-double-fstnull",
 '
        [public] void echo_TestRef([in,ref] uint16 **foo);
 ',
-'      struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+'      struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        r.in.foo = NULL;
 
@@ -511,7 +511,7 @@ test_samba4_ndr("ignore-ptr",
 '
        [public] void echo_TestRef([in,ignore] uint16 *foo, [in] uint16 *bar);
 ',
-'      struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+'      struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct echo_TestRef r;
        uint16_t v = 10;
        r.in.foo = &v; 

diff --git a/pidl/tests/ndr_tagtype.pl b/pidl/tests/ndr_tagtype.pl
index 3f9b717bfef34753eee4b995eafa2c4f78a97a67..4d6bcb53afcc3ac28192b1e4f2b3deb26d76a083 100755 (executable)
--- a/pidl/tests/ndr_tagtype.pl
+++ b/pidl/tests/ndr_tagtype.pl
@@ -10,7 +10,7 @@ use Util qw(test_samba4_ndr);
 
 test_samba4_ndr('struct-notypedef', '[public] struct bla { uint8 x; }; ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct bla r;
        uint8_t expected[] = { 0x0D };
        DATA_BLOB expected_blob = { expected, 1 };
@@ -29,7 +29,7 @@ test_samba4_ndr('struct-notypedef', '[public] struct bla { uint8 x; }; ',
 test_samba4_ndr('struct-notypedef-used', '[public] struct bla { uint8 x; };
        [public] void myfn([in] struct bla r); ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct myfn fn;
        uint8_t expected[] = { 0x0D };
        DATA_BLOB expected_blob = { expected, 1 };
@@ -49,7 +49,7 @@ test_samba4_ndr('struct-notypedef-used', '[public] struct bla { uint8 x; };
 test_samba4_ndr('struct-notypedef-embedded', 'struct bla { uint8 x; };
        [public] struct myst { struct bla r; }; ',
 '
-       struct ndr_push *ndr = ndr_push_init_ctx(NULL, NULL);
+       struct ndr_push *ndr = ndr_push_init_ctx(NULL);
        struct myst st;
        uint8_t expected[] = { 0x0D };
        DATA_BLOB expected_blob = { expected, 1 };