[libvirt PATCH 06/42] systemd: Rename socket_in_def -> socket_in_default

Andrea Bolognani posted 42 patches 2 years, 4 months ago
There is a newer version of this series
[libvirt PATCH 06/42] systemd: Rename socket_in_def -> socket_in_default
Posted by Andrea Bolognani 2 years, 4 months ago
The meaning of the _def suffix might not be immediately obvious,
especially since it's also used to refer to the output of the
meson-gen-def.py script elsewhere in the same file.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 28e4d0cc4e..7b6ce6d32f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -826,12 +826,12 @@ if conf.has('WITH_LIBVIRTD')
 
       foreach socket : unit.get('sockets', [ 'main', 'ro', 'admin' ])
         if socket == 'main'
-          socket_in_def = 'remote' / 'libvirtd.socket.in'
-          socket_in = unit.get('socket_in', socket_in_def)
+          socket_in_default = 'remote' / 'libvirtd.socket.in'
+          socket_in = unit.get('socket_in', socket_in_default)
           socket_out = '@0@.socket'.format(unit['service'])
         else
-          socket_in_def = 'remote' / 'libvirtd-@0@.socket.in'.format(socket)
-          socket_in = unit.get('socket_@0@_in'.format(socket), socket_in_def)
+          socket_in_default = 'remote' / 'libvirtd-@0@.socket.in'.format(socket)
+          socket_in = unit.get('socket_@0@_in'.format(socket), socket_in_default)
           socket_out = '@0@-@1@.socket'.format(unit['service'], socket)
         endif
         configure_file(
-- 
2.41.0
Re: [libvirt PATCH 06/42] systemd: Rename socket_in_def -> socket_in_default
Posted by Daniel P. Berrangé 2 years, 4 months ago
On Mon, Sep 25, 2023 at 08:58:04PM +0200, Andrea Bolognani wrote:
> The meaning of the _def suffix might not be immediately obvious,
> especially since it's also used to refer to the output of the
> meson-gen-def.py script elsewhere in the same file.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  src/meson.build | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|