From: Ian Jackson Date: Tue, 29 Oct 2019 15:00:35 +0000 (+0000) Subject: tools/libxl: gentypes.py: Prefer init_val to init_fn X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1169 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3afbd233c98e055310d50793f173b47454f0ad04;p=xen.git tools/libxl: gentypes.py: Prefer init_val to init_fn When both are provided, init_val is likely to be more direct. No functional change with existing types: C output is identical. Signed-off-by: Ian Jackson Release-acked-by: Juergen Gross Acked-by: Anthony PERARD --- diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py index 6417c9dd8c..1769121468 100644 --- a/tools/libxl/gentypes.py +++ b/tools/libxl/gentypes.py @@ -311,10 +311,10 @@ def libxl_C_type_copy_deprecated(field, v, indent = " ", vparent = None): field.type.pass_arg(v, vparent is None)) s+= " " - if field.type.init_fn is not None: - s+= "%s(%s);\n" % (field.type.init_fn, field_ptr) - elif field.type.init_val is not None: + if field.type.init_val is not None: s+= "%s = %s;\n" % (field_val, field.type.init_val) + elif field.type.init_fn is not None: + s+= "%s(%s);\n" % (field.type.init_fn, field_ptr) else: s+= "memset(%s, 0, sizeof(*%s));\n" % (field_ptr, field_ptr)