Fixed some compiler warnings.

diff --git a/source/python/py_conv.c b/source/python/py_conv.c
index 04b41948240009b95c1c0b5e971a4003d077b50b..966a8925287be7f28fe056811487e88bae5c5789 100644 (file)
--- a/source/python/py_conv.c
+++ b/source/python/py_conv.c
@@ -42,12 +42,12 @@ PyObject *from_struct(void *s, struct pyconv *conv)
                switch (conv[i].type) {
                case PY_UNISTR: {
                        UNISTR *u = (UNISTR *)((char *)s + conv[i].offset);
-                       fstring s = "";
+                       fstring str = "";
 
                        if (u->buffer)
                                fstr_pull(s, u);
 
-                       item = PyString_FromString(s);
+                       item = PyString_FromString(str);
                        PyDict_SetItemString(obj, conv[i].name, item);
 
                        break;
@@ -122,13 +122,13 @@ BOOL to_struct(void *s, PyObject *dict, struct pyconv *conv)
                switch (conv[i].type) {
                case PY_UNISTR: {
                        UNISTR *u = (UNISTR *)((char *)s + conv[i].offset);
-                       char *s = "";
+                       char *str = "";
 
                        if (!PyString_Check(obj))
                                goto done;
 
-                       s = PyString_AsString(obj);
-                       init_unistr(u, s);
+                       str = PyString_AsString(obj);
+                       init_unistr(u, str);
                        
                        break;
                }

diff --git a/source/python/py_conv.h b/source/python/py_conv.h
index 24f5a66287b8ea825823f3b9ce4ae500c6a272f9..b384f70fc2db9c808f0617a2849ca0a4a983cdf7 100644 (file)
--- a/source/python/py_conv.h
+++ b/source/python/py_conv.h
@@ -31,6 +31,7 @@ struct pyconv {
 
 PyObject *from_struct(void *s, struct pyconv *conv);
 BOOL to_struct(void *s, PyObject *dict, struct pyconv *conv);
+PyObject *from_unistr_list(uint16 *dependentfiles);
 
 /* Another version of offsetof (-: */