iconv and xml APIs use char **, not const char **. Fix it

diff --git a/rcodump.c b/rcodump.c
index 0cff57e167946412f35afccabf6f120a55b7c404..3433e6831d08cffedaad460f1f614ec559f34ad3 100644 (file)
--- a/rcodump.c
+++ b/rcodump.c
@@ -465,7 +465,7 @@ void dump_text_resources(char* labels, rRCOEntry* parent, Bool writeHeader, char
                                } */\r
                                uint nullsStripped = 0;\r
                                while(dataLen) {\r
-                                       iconv(ic, (const char**)(&bufIn), (size_t*)(&dataLen), &bufOut, (size_t*)(&outBufLen));\r
+                                       iconv(ic, (&bufIn), (size_t*)(&dataLen), &bufOut, (size_t*)(&outBufLen));\r
                                        if(buf == bufOut) {\r
                                                warning("iconv failed when converting resource '%s'.", get_label_from_offset(labels, idx->labelOffset));\r
                                                break;\r

diff --git a/xmlread.c b/xmlread.c
index dfb1e815f8ee9585ce66a295f3a0ac5201ab228d..9750f6fe0ded68b0f7672d6bf0806ebc76f1fafa 100644 (file)
--- a/xmlread.c
+++ b/xmlread.c
@@ -584,8 +584,8 @@ void parse_entry(xmlNodePtr node, rRCOEntry* entry, rRCOFile* rco, rcoxml_read_f
                                                                                                        fileread(fp, fBuf, fSize);\r
                                                                                                        iconv_t ic = iconv_open(destFmt, srcFmt);\r
                                                                                                        // get rid of BOM made by iconv\r
-                                                                                                       iconv(ic, (const char**)(&fBuf), (size_t*)(&fSize), (char**)&bom, (size_t*)(&bomLen));\r
-                                                                                                       iconv(ic, (const char**)(&fBuf), (size_t*)(&fSize), (char**)&bufferPos, (size_t*)(&te->indexes[i].length));\r
+                                                                                                       iconv(ic, (char**)(&fBuf), (size_t*)(&fSize), (char**)&bom, (size_t*)(&bomLen));\r
+                                                                                                       iconv(ic, (char**)(&fBuf), (size_t*)(&fSize), (char**)&bufferPos, (size_t*)(&te->indexes[i].length));\r
                                                                                                        iconv_close(ic);\r
                                                                                                } else\r
                                                                                                        fileread(fp, bufferPos, te->indexes[i].length);\r
@@ -1474,9 +1474,9 @@ Bool parse_text_xml(char* fn, rRCOFile* rco, rRCOEntry* entry) {
                                                                char bom[4];\r
                                                                char *bomPtr = bom;\r
                                                                uint bomLen = (fmt == RCO_TEXT_FMT_UTF32 ? 4 : (fmt == RCO_TEXT_FMT_UTF8 ? 3 : 2));\r
-                                                               iconv(ic, (const char**)(&n), (size_t*)(&contentLen), (char**)&bomPtr, (size_t*)(&bomLen));\r
+                                                               iconv(ic, (char**)(&n), (size_t*)(&contentLen), (char**)&bomPtr, (size_t*)(&bomLen));\r
                                                        }\r
-                                                       iconv(ic, (const char**)(&n), (size_t*)(&contentLen), &tbPtr, (size_t*)(&outBufLen));\r
+                                                       iconv(ic, (char**)(&n), (size_t*)(&contentLen), &tbPtr, (size_t*)(&outBufLen));\r
                                                        if(outBufLen && outBufLen == charWidth) { // *should* always be true\r
                                                                memset(tbPtr, 0, ALIGN_TO_4(te->indexes[i].length) - (te->indexes[i].length-outBufLen));\r
                                                        } else\r