summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-11-29 01:10:10 +0000
committerTim Potter <tpot@samba.org>2002-11-29 01:10:10 +0000
commit602635d484323b89b15234a3c29d6dfce4261b97 (patch)
tree26122afbe9f8f90728e9d60de6cab24be7777e1c
parent5767dbbdcde61dd2e49f4138ce096827c8ac948a (diff)
downloadsamba-602635d484323b89b15234a3c29d6dfce4261b97.tar.gz
samba-602635d484323b89b15234a3c29d6dfce4261b97.tar.bz2
samba-602635d484323b89b15234a3c29d6dfce4261b97.zip
Merge of compiler warning fixes from HEAD.
(This used to be commit 80e61a7546b2ac070f8dda56b9810a352ac669e4)
-rw-r--r--source3/python/py_conv.c10
-rw-r--r--source3/python/py_conv.h1
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/python/py_conv.c b/source3/python/py_conv.c
index 04b4194824..966a892528 100644
--- a/source3/python/py_conv.c
+++ b/source3/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/source3/python/py_conv.h b/source3/python/py_conv.h
index 24f5a66287..b384f70fc2 100644
--- a/source3/python/py_conv.h
+++ b/source3/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 (-: */