On 11/17/21 18:58, Richard W.M. Jones wrote: > Instead of having a separate char *args[] local variable, we can use a > compound literal array (C99 feature). This change is just > refactoring. > --- > tests/README.tests | 7 ++++--- > tests/test-connect.c | 8 ++++---- > tests/test-curl-cookie-script.c | 21 ++++++++++----------- > tests/test-curl-header-script.c | 21 ++++++++++----------- > tests/test-delay.c | 13 ++++++------- > tests/test-layers.c | 27 ++++++++++++++------------- > tests/test-newstyle.c | 10 +++++----- > tests/test-null.c | 8 +++++--- > tests/test-oldstyle.c | 10 +++++----- > tests/test-pause.c | 11 ++++++----- > tests/test-random.c | 9 +++++---- > tests/test-split.c | 12 ++++++------ > 12 files changed, 80 insertions(+), 77 deletions(-)
This is the kind of refactoring that I can no longer meticulously review, so if you were malicious, you could drive a truck through it... But if you were malicious, this refactoring wouldn't be our biggest problem! :) Acked-by: Laszlo Ersek <[email protected]> Thanks, Laszlo > > diff --git a/tests/README.tests b/tests/README.tests > index 595c3c19..a55e6958 100644 > --- a/tests/README.tests > +++ b/tests/README.tests > @@ -65,9 +65,10 @@ To test a plugin using libnbd > > Open a libnbd handle, and configure it using: > > - char *args[] = { "nbdkit", "-s", "--exit-with-parent", > - "plugin", <plugin args ...>, NULL }; > - nbd_connect_command (nbd, args); > + nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", > + "plugin", <plugin args ...>, NULL }); > > Perform tests via libnbd functions. > > diff --git a/tests/test-connect.c b/tests/test-connect.c > index f6b494ac..13143f46 100644 > --- a/tests/test-connect.c > +++ b/tests/test-connect.c > @@ -53,10 +53,10 @@ main (int argc, char *argv[]) > exit (EXIT_FAILURE); > } > > - char *args[] = { > - "nbdkit", "-s", "--exit-with-parent", "example1", NULL > - }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", > + "example1", NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-curl-cookie-script.c b/tests/test-curl-cookie-script.c > index 481207b5..45e3d136 100644 > --- a/tests/test-curl-cookie-script.c > +++ b/tests/test-curl-cookie-script.c > @@ -104,17 +104,16 @@ main (int argc, char *argv[]) > perror ("asprintf"); > exit (EXIT_FAILURE); > } > - char *args[] = { > - "nbdkit", "-s", "--exit-with-parent", "-v", > - "curl", > - "-D", "curl.verbose=1", > - "http://localhost/disk";, > - "cookie-script=" SCRIPT, > - "cookie-script-renew=1", > - usp_param, /* unix-socket-path=... */ > - NULL > - }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", "-v", > + "curl", > + "-D", "curl.verbose=1", > + "http://localhost/disk";, > + "cookie-script=" SCRIPT, > + "cookie-script-renew=1", > + usp_param, /* unix-socket-path=... */ > + NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-curl-header-script.c b/tests/test-curl-header-script.c > index a151af05..afe16591 100644 > --- a/tests/test-curl-header-script.c > +++ b/tests/test-curl-header-script.c > @@ -126,17 +126,16 @@ main (int argc, char *argv[]) > perror ("asprintf"); > exit (EXIT_FAILURE); > } > - char *args[] = { > - "nbdkit", "-s", "--exit-with-parent", "-v", > - "curl", > - "-D", "curl.verbose=1", > - "http://localhost/disk";, > - "header-script=" SCRIPT, > - "header-script-renew=1", > - usp_param, /* unix-socket-path=... */ > - NULL > - }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", "-v", > + "curl", > + "-D", "curl.verbose=1", > + "http://localhost/disk";, > + "header-script=" SCRIPT, > + "header-script-renew=1", > + usp_param, /* unix-socket-path=... */ > + NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-delay.c b/tests/test-delay.c > index 736de529..b0e6f8de 100644 > --- a/tests/test-delay.c > +++ b/tests/test-delay.c > @@ -56,13 +56,12 @@ main (int argc, char *argv[]) > exit (EXIT_FAILURE); > } > > - char *args[] = { > - "nbdkit", "-s", "--exit-with-parent", > - "--filter", "delay", > - "memory", "1M", > - "wdelay=10", NULL > - }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", > + "--filter", "delay", > + "memory", "1M", > + "wdelay=10", NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-layers.c b/tests/test-layers.c > index 13c82289..0083b733 100644 > --- a/tests/test-layers.c > +++ b/tests/test-layers.c > @@ -157,19 +157,20 @@ main (int argc, char *argv[]) > } > > /* Start nbdkit. */ > - char *args[] = { > - "nbdkit", "--exit-with-parent", "-fvns", > - /* Because of asynchronous shutdown with threads, finalize > - * isn't reliably called unless we disable parallel. > - */ > - "-t", "1", > - "--filter", ".libs/test-layers-filter3." SOEXT, > - "--filter", ".libs/test-layers-filter2." SOEXT, > - "--filter", ".libs/test-layers-filter1." SOEXT, > - ".libs/test-layers-plugin." SOEXT, > - "foo=bar", > - NULL}; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "--exit-with-parent", "-fvns", > + /* Because of asynchronous shutdown with > + * threads, finalize isn't reliably > + * called unless we disable parallel. > + */ > + "-t", "1", > + "--filter", ".libs/test-layers-filter3." SOEXT, > + "--filter", ".libs/test-layers-filter2." SOEXT, > + "--filter", ".libs/test-layers-filter1." SOEXT, > + ".libs/test-layers-plugin." SOEXT, > + "foo=bar", > + NULL }) == -1) { > dprintf (orig_stderr, "nbd_connect_command: %s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-newstyle.c b/tests/test-newstyle.c > index d96c7e44..1f5d1ca3 100644 > --- a/tests/test-newstyle.c > +++ b/tests/test-newstyle.c > @@ -49,11 +49,11 @@ main (int argc, char *argv[]) > exit (EXIT_FAILURE); > } > > - char *args[] = { > - "nbdkit", "-s", "--exit-with-parent", > - "--newstyle", "file", "file-data", NULL > - }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", > + "--newstyle", "file", "file-data", > + NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-null.c b/tests/test-null.c > index 2205934f..d220999a 100644 > --- a/tests/test-null.c > +++ b/tests/test-null.c > @@ -52,9 +52,11 @@ main (int argc, char *argv[]) > exit (EXIT_FAILURE); > } > > - char *args[] = > - { "nbdkit", "-s", "--exit-with-parent", "null", "100M", NULL }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", > + "null", "100M", > + NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-oldstyle.c b/tests/test-oldstyle.c > index 5147768a..0afe868f 100644 > --- a/tests/test-oldstyle.c > +++ b/tests/test-oldstyle.c > @@ -49,11 +49,11 @@ main (int argc, char *argv[]) > exit (EXIT_FAILURE); > } > > - char *args[] = { > - "nbdkit", "-s", "--exit-with-parent", > - "--oldstyle", "file", "file-data", NULL > - }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", > + "--oldstyle", "file", "file-data", > + NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-pause.c b/tests/test-pause.c > index 3c8ee520..e5a970d6 100644 > --- a/tests/test-pause.c > +++ b/tests/test-pause.c > @@ -78,11 +78,12 @@ main (int argc, char *argv[]) > exit (EXIT_FAILURE); > } > > - char *args[] = { > - "nbdkit", "-s", "--exit-with-parent", "--filter", "pause", > - "example1", "pause-control=" SOCKET, NULL > - }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", > + "--filter", "pause", > + "example1", "pause-control=" SOCKET, > + NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-random.c b/tests/test-random.c > index 4316d2b3..b7716efa 100644 > --- a/tests/test-random.c > +++ b/tests/test-random.c > @@ -72,10 +72,11 @@ main (int argc, char *argv[]) > } > > snprintf (sizearg, sizeof sizearg, "%d", SIZE); > - char *args[] = { > - "nbdkit", "-s", "--exit-with-parent", "random", sizearg, NULL > - }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", > + "random", sizearg, > + NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > diff --git a/tests/test-split.c b/tests/test-split.c > index be53590d..657e5b5a 100644 > --- a/tests/test-split.c > +++ b/tests/test-split.c > @@ -51,12 +51,12 @@ main (int argc, char *argv[]) > exit (EXIT_FAILURE); > } > > - char *args[] = { > - "nbdkit", "-s", "--exit-with-parent", > - "split", "split1", "split2", "file=split3" /* leave file= to test */, > - NULL > - }; > - if (nbd_connect_command (nbd, args) == -1) { > + if (nbd_connect_command (nbd, > + (char *[]) { > + "nbdkit", "-s", "--exit-with-parent", > + "split", "split1", "split2", > + "file=split3" /* leave file= to test */, > + NULL }) == -1) { > fprintf (stderr, "%s\n", nbd_get_error ()); > exit (EXIT_FAILURE); > } > _______________________________________________ Libguestfs mailing list [email protected] https://listman.redhat.com/mailman/listinfo/libguestfs
