Update XZ Utils to 5.0.3 (in deps)

src/xz/options.c

 ///////////////////////////////////////////////////////////////////////////////
 //
 /// \file       options.c
 /// \brief      Parser for filter-specific options
 //
 //  Author:     Lasse Collin
 //
 //  This file has been put into the public domain.
 //  You can do whatever you want with this file.
 //
@@ skipping 132 matching lines @@
 // Delta //
 ///////////
 
 enum {
         OPT_DIST,
 };
 
 
 static void
 set_delta(void *options, uint32_t key, uint64_t value,
-                const char *valuestr lzma_attribute((unused)))
+                const char *valuestr lzma_attribute((__unused__)))
 {
         lzma_options_delta *opt = options;
         switch (key) {
         case OPT_DIST:
                 opt->dist = value;
                 break;
         }
 }
 
 
@@ skipping 23 matching lines @@
 // BCJ //
 /////////
 
 enum {
         OPT_START_OFFSET,
 };
 
 
 static void
 set_bcj(void *options, uint32_t key, uint64_t value,
-                const char *valuestr lzma_attribute((unused)))
+                const char *valuestr lzma_attribute((__unused__)))
 {
         lzma_options_bcj *opt = options;
         switch (key) {
         case OPT_START_OFFSET:
                 opt->start_offset = value;
                 break;
         }
 }
 
 
@@ skipping 26 matching lines @@
         OPT_LC,
         OPT_LP,
         OPT_PB,
         OPT_MODE,
         OPT_NICE,
         OPT_MF,
         OPT_DEPTH,
 };
 
 
-static void lzma_attribute((noreturn))
+static void lzma_attribute((__noreturn__))
 error_lzma_preset(const char *valuestr)
 {
         message_fatal(_("Unsupported LZMA1/LZMA2 preset: %s"), valuestr);
 }
 
 
 static void
 set_lzma(void *options, uint32_t key, uint64_t value, const char *valuestr)
 {
         lzma_options_lzma *opt = options;
@@ skipping 84 matching lines @@
                 { "lp",     NULL,   LZMA_LCLP_MIN, LZMA_LCLP_MAX },
                 { "pb",     NULL,   LZMA_PB_MIN, LZMA_PB_MAX },
                 { "mode",   modes,  0, 0 },
                 { "nice",   NULL,   2, 273 },
                 { "mf",     mfs,    0, 0 },
                 { "depth",  NULL,   0, UINT32_MAX },
                 { NULL,     NULL,   0, 0 }
         };
 
         lzma_options_lzma *options = xmalloc(sizeof(lzma_options_lzma));
-        *options = (lzma_options_lzma){
-                .dict_size = LZMA_DICT_SIZE_DEFAULT,
-                .preset_dict =  NULL,
-                .preset_dict_size = 0,
-                .lc = LZMA_LC_DEFAULT,
-                .lp = LZMA_LP_DEFAULT,
-                .pb = LZMA_PB_DEFAULT,
-                .mode = LZMA_MODE_NORMAL,
-                .nice_len = 64,
-                .mf = LZMA_MF_BT4,
-                .depth = 0,
-        };
+        if (lzma_lzma_preset(options, LZMA_PRESET_DEFAULT))
+                message_bug();
 
         parse_options(str, opts, &set_lzma, options);
 
         if (options->lc + options->lp > LZMA_LCLP_MAX)
-                message_fatal(_("The sum of lc and lp must be at "
-                                "maximum of 4"));
+                message_fatal(_("The sum of lc and lp must not exceed 4"));
 
         const uint32_t nice_len_min = options->mf & 0x0F;
         if (options->nice_len < nice_len_min)
                 message_fatal(_("The selected match finder requires at "
                                 "least nice=%" PRIu32), nice_len_min);
 
         return options;
 }