From 3165260830a98ab7516381ceb4bd472e892ac466 Mon Sep 17 00:00:00 2001 From: kibook Date: Thu, 2 Aug 2018 15:49:52 -0400 Subject: [PATCH] Fix -W option of s1kd-instance -W should be usable on it's own, without having to also specify the -y option. --- tools/s1kd-instance/s1kd-instance.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/s1kd-instance/s1kd-instance.c b/tools/s1kd-instance/s1kd-instance.c index 18e244a1..e871e4ce 100644 --- a/tools/s1kd-instance/s1kd-instance.c +++ b/tools/s1kd-instance/s1kd-instance.c @@ -15,7 +15,7 @@ #include "xsl.h" #define PROG_NAME "s1kd-instance" -#define VERSION "1.8.2" +#define VERSION "1.8.3" /* Prefix before errors printed to console */ #define ERR_PREFIX PROG_NAME ": ERROR: " @@ -2056,7 +2056,7 @@ void flatten_alts(xmlDocPtr doc) /* Removes invalid empty sections in a PM after all references have * been filtered out. */ -void remove_emptry_pmentries(xmlDocPtr doc) +void remove_empty_pmentries(xmlDocPtr doc) { transform_doc(doc, xsl_remove_empty_pmentries_xsl, xsl_remove_empty_pmentries_xsl_len, NULL); } @@ -2535,7 +2535,7 @@ int main(int argc, char **argv) case 'U': sec_classes = strdup(optarg); break; case 'u': strncpy(secu, optarg, 2); break; case 'v': verbose = true; break; - case 'W': combine_applic = false; break; + case 'W': new_applic = true; combine_applic = false; break; case 'w': wholedm = true; break; case 'x': dump_cir_xsl(optarg); exit(0); case 'X': strncpy(comment_path, optarg, 255); break; @@ -2749,7 +2749,7 @@ int main(int argc, char **argv) } if (ispm) { - remove_emptry_pmentries(doc); + remove_empty_pmentries(doc); } if (flat_alts) {