the indentation part, skipping the alignment hunks as discussed
off-list.
On August 1, 2023 4:46 pm, Philipp Hufnagl wrote:
> Signed-off-by: Philipp Hufnagl <p.hufn...@proxmox.com>
> ---
> src/PVE/Tools.pm | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
> index 159ec82..28e70f0 100644
> --- a/src/PVE/Tools.pm
> +++ b/src/PVE/Tools.pm
> @@ -92,23 +92,23 @@ our $EMAIL_USER_RE = qr/[\w\+\-\~]+(\.[\w\+\-\~]+)*/;
> our $EMAIL_RE = qr/$EMAIL_USER_RE@[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*/;
>
> use constant {CLONE_NEWNS => 0x00020000,
> - CLONE_NEWUTS => 0x04000000,
> - CLONE_NEWIPC => 0x08000000,
> - CLONE_NEWUSER => 0x10000000,
> - CLONE_NEWPID => 0x20000000,
> - CLONE_NEWNET => 0x40000000};
> + CLONE_NEWUTS => 0x04000000,
> + CLONE_NEWIPC => 0x08000000,
> + CLONE_NEWUSER => 0x10000000,
> + CLONE_NEWPID => 0x20000000,
> + CLONE_NEWNET => 0x40000000};
>
> use constant {O_PATH => 0x00200000,
> - O_CLOEXEC => 0x00080000,
> - O_TMPFILE => 0x00400000 | O_DIRECTORY};
> + O_CLOEXEC => 0x00080000,
> + O_TMPFILE => 0x00400000 | O_DIRECTORY};
>
> use constant {AT_EMPTY_PATH => 0x1000,
> - AT_FDCWD => -100};
> + AT_FDCWD => -100};
>
> # from <linux/fs.h>
> use constant {RENAME_NOREPLACE => (1 << 0),
> - RENAME_EXCHANGE => (1 << 1),
> - RENAME_WHITEOUT => (1 << 2)};
> + RENAME_EXCHANGE => (1 << 1),
> + RENAME_WHITEOUT => (1 << 2)};
>
> sub run_with_timeout {
> my ($timeout, $code, @param) = @_;
> @@ -579,7 +579,7 @@ sub run_command {
> }
> }
>
> - alarm(0);
> + alarm(0);
> };
>
> my $err = $@;
> @@ -1354,7 +1354,7 @@ sub dump_journal {
> my $parser = sub {
> my $line = shift;
>
> - return if $count++ < $start;
> + return if $count++ < $start;
> return if $limit <= 0;
> push @$lines, { n => int($count), t => $line};
> $limit--;
> @@ -1441,7 +1441,7 @@ sub unpack_sockaddr_in46 {
> my ($sin) = @_;
> my $family = Socket::sockaddr_family($sin);
> my ($port, $host) = ($family == AF_INET6 ?
> Socket::unpack_sockaddr_in6($sin)
> - :
> Socket::unpack_sockaddr_in($sin));
> + : Socket::unpack_sockaddr_in($sin));
> return ($family, $port, $host);
> }
>
> @@ -1485,8 +1485,8 @@ sub get_fqdn {
> sub parse_host_and_port {
> my ($address) = @_;
> if ($address =~ /^($IPV4RE|[[:alnum:]\-.]+)(?::(\d+))?$/ ||
> # ipv4 or host with optional ':port'
> - $address =~ /^\[($IPV6RE|$IPV4RE|[[:alnum:]\-.]+)\](?::(\d+))?$/ ||
> # anything in brackets with optional ':port'
> - $address =~ /^($IPV6RE)(?:\.(\d+))?$/)
> # ipv6 with optional port separated by dot
> + $address =~ /^\[($IPV6RE|$IPV4RE|[[:alnum:]\-.]+)\](?::(\d+))?$/ || #
> anything in brackets with optional ':port'
> + $address =~ /^($IPV6RE)(?:\.(\d+))?$/) #
> ipv6 with optional port separated by dot
> {
> return ($1, $2, 1); # end with 1 to support simple if(parse...) tests
> }
> --
> 2.39.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
