xml.c: pass non-const xmlNode to xmlHasProp()

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index 20c9abd83e3012fc3b726de13350cce62519a350..18721b1467db45a3b2278dc82d9aa8302058c390 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013, 2015 Eric Biggers
+ * Copyright (C) 2012-2016 Eric Biggers
  *
  * This file is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
@@ -343,14 +343,14 @@ alloc_wim_xml_info(void)
 }
 
 static bool
-parse_index(xmlChar **pp, uint32_t *index_ret)
+parse_index(xmlChar **pp, u32 *index_ret)
 {
        xmlChar *p = *pp;
-       uint32_t index = 0;
+       u32 index = 0;
 
        *p++ = '\0'; /* overwrite '[' */
        while (*p >= '0' && *p <= '9') {
-               uint32_t n = (index * 10) + (*p++ - '0');
+               u32 n = (index * 10) + (*p++ - '0');
                if (n < index)
                        return false;
                index = n;
@@ -393,7 +393,7 @@ do_xml_path_walk(xmlNode *node, const xmlChar *path, bool create,
        while (c != '\0') {
                const xmlChar *name;
                xmlNode *child;
-               uint32_t index = 1;
+               u32 index = 1;
 
                /* We have another path component.  */
 
@@ -863,6 +863,7 @@ xml_delete_image(struct wim_xml_info *info, int image)
 #define PROCESSOR_ARCHITECTURE_MSIL            8
 #define PROCESSOR_ARCHITECTURE_AMD64           9
 #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64   10
+#define PROCESSOR_ARCHITECTURE_ARM64           12
 
 static const tchar *
 describe_arch(u64 arch)
@@ -873,6 +874,7 @@ describe_arch(u64 arch)
                [PROCESSOR_ARCHITECTURE_ARM]   = T("ARM"),
                [PROCESSOR_ARCHITECTURE_IA64]  = T("ia64"),
                [PROCESSOR_ARCHITECTURE_AMD64] = T("x86_64"),
+               [PROCESSOR_ARCHITECTURE_ARM64] = T("ARM64"),
        };
 
        if (arch < ARRAY_LEN(descriptions) && descriptions[arch] != NULL)
@@ -1025,7 +1027,7 @@ xml_print_image_info(struct wim_xml_info *info, int image)
  *----------------------------------------------------------------------------*/
 
 static int
-image_node_get_index(const xmlNode *node)
+image_node_get_index(xmlNode *node)
 {
        u64 v = node_get_number((const xmlNode *)xmlHasProp(node, "INDEX"), 10);
        return min(v, INT_MAX);