all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: [pve-devel] applied:  [PATCH common v4 2/2] fix whitespaces
Date: Fri, 04 Aug 2023 13:48:11 +0200	[thread overview]
Message-ID: <1691149672.bvh128boy6.astroid@yuna.none> (raw)
In-Reply-To: <20230801144604.760331-5-p.hufnagl@proxmox.com>

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.hufnagl@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
> 
> 
> 




  reply	other threads:[~2023-08-04 11:48 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-01 14:45 [pve-devel] [PATCH storage/manager/common v4 0/6] fix #4849: allow download of compressed ISOs Philipp Hufnagl
2023-08-01 14:45 ` [pve-devel] [PATCH storage v4 1/2] fix #4849: download-url: allow download and decompression " Philipp Hufnagl
2023-08-04 11:51   ` Fabian Grünbichler
2023-08-01 14:46 ` [pve-devel] [PATCH storage v4 2/2] fix whitespaces Philipp Hufnagl
2023-08-04 11:49   ` [pve-devel] applied: " Fabian Grünbichler
2023-08-01 14:46 ` [pve-devel] [PATCH common v4 1/2] fix #4849: download file from url: add opt parameter for a decompression command Philipp Hufnagl
2023-08-04 11:47   ` [pve-devel] applied: " Fabian Grünbichler
2023-08-01 14:46 ` [pve-devel] [PATCH common v4 2/2] fix whitespaces Philipp Hufnagl
2023-08-04 11:48   ` Fabian Grünbichler [this message]
2023-08-01 14:46 ` [pve-devel] [PATCH manager v4 1/2] fix #4849: download to storage: automatically dectect and configure compression Philipp Hufnagl
2023-08-04 11:53   ` Fabian Grünbichler
2023-08-01 14:46 ` [pve-devel] [PATCH manager v4 2/2] fix whitespaces Philipp Hufnagl
2023-08-04 11:49   ` [pve-devel] applied: " Fabian Grünbichler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1691149672.bvh128boy6.astroid@yuna.none \
    --to=f.gruenbichler@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal