From b7b7ff55cc04b1d3d5a60c4909527b6f2816cd2f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 22 Nov 2002 06:18:03 +0000
Subject: Fixed some compiler warnings. (This used to be commit
 9e871cc256a70bc64e59630bd31c890cc231368e)

---
 source3/python/py_conv.c | 10 +++++-----
 source3/python/py_conv.h |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'source3/python')

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 (-: */
 
-- 
cgit