fix: make make build work

mcepl · mcepl · commit d80cb15caa90 · 2026-03-03T01:13:09.000+01:00
diff --git a/src/dmidecodemodule.c b/src/dmidecodemodule.c
@@ -656,7 +656,7 @@ static PyObject *dmidecode_get_slot(PyObject * self, PyObject * args)
 
 static PyObject *dmidecode_get_section(PyObject *self, PyObject *args)
 {
-        char *section = NULL;
+        const char *section = NULL;
         if (PyUnicode_Check(args)) {
                 section = PyUnicode_AsUTF8(args);
         } else if (PyBytes_Check(args)) {
@@ -834,7 +834,7 @@ static PyObject *dmidecode_get_dev(PyObject * self, PyObject * null)
 
 static PyObject *dmidecode_set_dev(PyObject * self, PyObject * arg)
 {
-        char *f = NULL;
+        const char *f = NULL;
         if(PyUnicode_Check(arg)) {
                 f = PyUnicode_AsUTF8(arg);
         } else if(PyBytes_Check(arg)) {
@@ -881,7 +881,7 @@ static PyObject *dmidecode_set_dev(PyObject * self, PyObject * arg)
 
 static PyObject *dmidecode_set_pythonxmlmap(PyObject * self, PyObject * arg)
 {
-        char *fname = NULL;
+        const char *fname = NULL;
 
         if (PyUnicode_Check(arg)) {
                 fname = PyUnicode_AsUTF8(arg);
@@ -1044,7 +1044,7 @@ initdmidecodemod(void)
         options *opt;
 
         xmlInitParser();
-        xmlXPathInit();
+        /* xmlXPathInit() is deprecated (no longer needed with libxml2 init) */
 
         opt = (options *) malloc(sizeof(options)+2);
         if (opt == NULL)
diff --git a/src/dmidump.c b/src/dmidump.c
@@ -152,7 +152,8 @@ static int legacy_decode(u8 *buf, const char *devmem, u32 flags,  const char *du
                 devmem, flags, dumpfile);
 
         memcpy(crafted, buf, 16);
-        overwrite_smbios3_address(crafted);
+        /* Legacy entry point is a DMI entry point, not SMBIOS3 */
+        overwrite_dmi_address(crafted);
         write_dump(0, 0x0F, crafted, dumpfile, 1);
 
         return 1;
diff --git a/src/dmixml.c b/src/dmixml.c
@@ -77,18 +77,15 @@ static void dmixml_sanitize_xml_string(xmlChar *s)
  * @return xmlChar*     Pointer to the buffer of the string
  */
 xmlChar *dmixml_buildstr(size_t len, const char *fmt, va_list ap) {
-        xmlChar *ret = NULL, *xmlfmt = NULL;
+        xmlChar *ret = NULL;
         xmlChar *ptr = NULL;
 
         ret = (xmlChar *) malloc(len+2);
         assert( ret != NULL );
         memset(ret, 0, len+2);
 
-        xmlfmt = xmlCharStrdup(fmt);
-        assert( xmlfmt != NULL );
-
-        xmlStrVPrintf(ret, len, xmlfmt, ap);
-        free(xmlfmt);
+        /* xmlStrVPrintf expects a const char * format string */
+        xmlStrVPrintf(ret, len, (const char *)fmt, ap);
 
         dmixml_sanitize_xml_string(ret);
 
