From a99ea198b24745c49cdb42645c3497ac3b0e6a2f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 17 Jul 2012 12:33:45 +0100 Subject: perl: Use $g instead of $h in documentation. $g is the "standard" name for libguestfs handles. --- perl/examples/guestfs-perl.pod | 12 ++++++------ perl/t/020-create.t | 4 ++-- perl/t/030-config.t | 32 ++++++++++++++++---------------- perl/t/050-lvcreate.t | 22 +++++++++++----------- perl/t/060-readdir.t | 24 ++++++++++++------------ perl/t/070-optargs.t | 10 +++++----- perl/t/400-events.t | 18 +++++++++--------- 7 files changed, 61 insertions(+), 61 deletions(-) (limited to 'perl') diff --git a/perl/examples/guestfs-perl.pod b/perl/examples/guestfs-perl.pod index c38377c8..9686a2f1 100644 --- a/perl/examples/guestfs-perl.pod +++ b/perl/examples/guestfs-perl.pod @@ -8,12 +8,12 @@ guestfs-perl - How to use libguestfs from Perl use Sys::Guestfs; - my $h = Sys::Guestfs->new (); - $h->add_drive ('guest.img', format => 'raw'); - $h->launch (); - $h->mount_options ('', '/dev/sda1', '/'); - $h->touch ('/hello'); - $h->sync (); + my $g = Sys::Guestfs->new (); + $g->add_drive ('guest.img', format => 'raw'); + $g->launch (); + $g->mount_options ('', '/dev/sda1', '/'); + $g->touch ('/hello'); + $g->sync (); =head1 DESCRIPTION diff --git a/perl/t/020-create.t b/perl/t/020-create.t index 16a03754..1f658b44 100644 --- a/perl/t/020-create.t +++ b/perl/t/020-create.t @@ -23,7 +23,7 @@ use Sys::Guestfs; # Put it in a block so the handle gets destroyed as well. { - my $h = Sys::Guestfs->new (); - ok ($h); + my $g = Sys::Guestfs->new (); + ok ($g); } ok (1); diff --git a/perl/t/030-config.t b/perl/t/030-config.t index 5f8e04aa..0057503c 100644 --- a/perl/t/030-config.t +++ b/perl/t/030-config.t @@ -21,27 +21,27 @@ use Test::More tests => 7; use Sys::Guestfs; -my $h = Sys::Guestfs->new (); -ok ($h); +my $g = Sys::Guestfs->new (); +ok ($g); -$h->set_verbose (1); -ok ($h->get_verbose () == 1, "verbose not true"); -$h->set_verbose (0); -ok ($h->get_verbose () == 0, "verbose not false"); -$h->set_autosync (1); -ok ($h->get_autosync () == 1, "autosync not true"); -$h->set_autosync (0); -ok ($h->get_autosync () == 0, "autosync not false"); +$g->set_verbose (1); +ok ($g->get_verbose () == 1, "verbose not true"); +$g->set_verbose (0); +ok ($g->get_verbose () == 0, "verbose not false"); +$g->set_autosync (1); +ok ($g->get_autosync () == 1, "autosync not true"); +$g->set_autosync (0); +ok ($g->get_autosync () == 0, "autosync not false"); # This probably doesn't work at the moment because # the binding for set_path does not ensure the string # remains around for the lifetime of the handle. -#$h->set_path ("."); -#ok ($h->get_path () eq ".", "path not dot"); -#$h->set_path (undef); -#ok ($h->get_path () ne "", "path is empty"); +#$g->set_path ("."); +#ok ($g->get_path () eq ".", "path not dot"); +#$g->set_path (undef); +#ok ($g->get_path () ne "", "path is empty"); -$h->add_drive ("/dev/null"); +$g->add_drive ("/dev/null"); ok (1, "add drive"); -$h->add_cdrom ("/dev/zero"); +$g->add_cdrom ("/dev/zero"); ok (1, "add cdrom"); diff --git a/perl/t/050-lvcreate.t b/perl/t/050-lvcreate.t index 0079221d..042d60ac 100644 --- a/perl/t/050-lvcreate.t +++ b/perl/t/050-lvcreate.t @@ -21,38 +21,38 @@ use Test::More tests => 11; use Sys::Guestfs; -my $h = Sys::Guestfs->new (); -ok ($h); +my $g = Sys::Guestfs->new (); +ok ($g); open FILE, ">test.img"; truncate FILE, 500*1024*1024; close FILE; ok (1); -$h->add_drive ("test.img"); +$g->add_drive ("test.img"); ok (1); -$h->launch (); +$g->launch (); ok (1); -$h->pvcreate ("/dev/sda"); +$g->pvcreate ("/dev/sda"); ok (1); -$h->vgcreate ("VG", ["/dev/sda"]); +$g->vgcreate ("VG", ["/dev/sda"]); ok (1); -$h->lvcreate ("LV1", "VG", 200); +$g->lvcreate ("LV1", "VG", 200); ok (1); -$h->lvcreate ("LV2", "VG", 200); +$g->lvcreate ("LV2", "VG", 200); ok (1); -my @lvs = $h->lvs (); +my @lvs = $g->lvs (); if (@lvs != 2 || $lvs[0] ne "/dev/VG/LV1" || $lvs[1] ne "/dev/VG/LV2") { die "h->lvs() returned incorrect result" } ok (1); -$h->sync (); +$g->sync (); ok (1); -undef $h; +undef $g; ok (1); unlink ("test.img"); diff --git a/perl/t/060-readdir.t b/perl/t/060-readdir.t index e8fe151e..74d6ac4d 100644 --- a/perl/t/060-readdir.t +++ b/perl/t/060-readdir.t @@ -21,41 +21,41 @@ use Test::More tests => 12; use Sys::Guestfs; -my $h = Sys::Guestfs->new (); -ok ($h); +my $g = Sys::Guestfs->new (); +ok ($g); open FILE, ">test.img"; truncate FILE, 10*1024*1024; close FILE; ok (1); -$h->add_drive ("test.img"); +$g->add_drive ("test.img"); ok (1); -$h->launch (); +$g->launch (); ok (1); -$h->part_disk ("/dev/sda", "mbr"); +$g->part_disk ("/dev/sda", "mbr"); ok (1); -$h->mkfs ("ext2", "/dev/sda1"); +$g->mkfs ("ext2", "/dev/sda1"); ok (1); -$h->mount_options ("", "/dev/sda1", "/"); +$g->mount_options ("", "/dev/sda1", "/"); ok (1); -$h->mkdir ("/p"); +$g->mkdir ("/p"); ok (1); -$h->touch ("/q"); +$g->touch ("/q"); ok (1); -my @dirs = $h->readdir ("/"); +my @dirs = $g->readdir ("/"); @dirs = sort { $a->{name} cmp $b->{name} } @dirs; foreach (@dirs) { print "$_->{name} $_->{ino} $_->{ftyp}\n"; } ok (1); -$h->sync (); +$g->sync (); ok (1); -undef $h; +undef $g; ok (1); unlink ("test.img"); diff --git a/perl/t/070-optargs.t b/perl/t/070-optargs.t index 885f0cc4..460fb192 100644 --- a/perl/t/070-optargs.t +++ b/perl/t/070-optargs.t @@ -21,14 +21,14 @@ use Test::More tests => 4; use Sys::Guestfs; -my $h = Sys::Guestfs->new (); -ok ($h); +my $g = Sys::Guestfs->new (); +ok ($g); -$h->add_drive ("/dev/null"); +$g->add_drive ("/dev/null"); ok (1); -$h->add_drive ("/dev/null", readonly => 1); +$g->add_drive ("/dev/null", readonly => 1); ok (1); -$h->add_drive ("/dev/null", format => "raw", readonly => 0); +$g->add_drive ("/dev/null", format => "raw", readonly => 0); ok (1); diff --git a/perl/t/400-events.t b/perl/t/400-events.t index dd31966d..40831a55 100644 --- a/perl/t/400-events.t +++ b/perl/t/400-events.t @@ -21,8 +21,8 @@ use Test::More tests => 7; use Sys::Guestfs; -my $h = Sys::Guestfs->new (); -ok ($h); +my $g = Sys::Guestfs->new (); +ok ($g); sub log_callback { my $ev = shift; @@ -49,24 +49,24 @@ sub close_callback { my $events = $Sys::Guestfs::EVENT_APPLIANCE | $Sys::Guestfs::EVENT_LIBRARY | $Sys::Guestfs::EVENT_TRACE; my $eh; -$eh = $h->set_event_callback (\&log_callback, $events); +$eh = $g->set_event_callback (\&log_callback, $events); ok ($eh >= 0); # Check that the close event is invoked. -$h->set_event_callback (\&close_callback, $Sys::Guestfs::EVENT_CLOSE); +$g->set_event_callback (\&close_callback, $Sys::Guestfs::EVENT_CLOSE); ok ($eh >= 0); # Now make sure we see some messages. -$h->set_trace (1); -$h->set_verbose (1); +$g->set_trace (1); +$g->set_verbose (1); ok (1); # Do some stuff. -$h->add_drive_ro ("/dev/null"); -$h->set_autosync (1); +$g->add_drive_ro ("/dev/null"); +$g->set_autosync (1); ok (1); # Close the handle. The close callback should be invoked. ok ($close_invoked == 0); -undef $h; +undef $g; ok ($close_invoked == 1); -- cgit