Updating latest changes from Main.

Author: p4paul

MANIFEST.in

@@ -5,5 +5,3 @@ include Version
 include p4test.py
 include job_trigger.py
 include tools/*.py
-
-global-exclude *.pyc

P4API.cpp

@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: //depot/main/p4-python/P4API.cpp#62 $
+ * $Id: //depot/main/p4-python/P4API.cpp#63 $
  *
  * Build instructions:
  *  Use Distutils - see accompanying setup.py
@@ -237,7 +237,7 @@ static PyObject * P4Adapter_run(P4Adapter * self, PyObject * args)
     // the other hack is that the API expects (char * const *), but this cannot be stored
     // a std::vector<>, because it cannot exchange pointers
 
-    return self->clientAPI->Run(GetPythonString(cmd), argv.size(), 
+    return self->clientAPI->Run(GetPythonString(cmd), (int)argv.size(), 
         (argv.size() > 0) ? (char * const *) &argv[0] : NULL );
 }
 

P4Result.cpp

@@ -24,7 +24,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$Id: //depot/main/p4-python/P4Result.cpp#19 $
+$Id: //depot/main/p4-python/P4Result.cpp#21 $
 *******************************************************************************/
 
 #include <Python.h>
@@ -66,20 +66,25 @@ P4Result::~P4Result()
 {
     // reduce references to Python objects to avoid memory leaks
 
-    if (output) 
+    if (output) {
         Py_DECREF(output);
-    
-    if (warnings) 
+    }
+
+    if (warnings) {
         Py_DECREF(warnings);
-    
-    if (errors)
+    }
+
+    if (errors) {
         Py_DECREF(errors);
+    }
 
-    if (messages)
+    if (messages) {
         Py_DECREF(messages);
+    }
 
-    if (track)
-	Py_DECREF(track);
+    if (track) {
+        Py_DECREF(track);
+    }
 }
 
 PyObject * P4Result::GetOutput()
@@ -92,24 +97,29 @@ PyObject * P4Result::GetOutput()
 void
 P4Result::Reset()
 {
-    if (output)
+    if (output) {
         Py_DECREF(output);
+    }
     output = PyList_New(0);
 
-    if (warnings) 
+    if (warnings) {
         Py_DECREF(warnings);
+    }
     warnings = PyList_New(0);
 
-    if (errors)
+    if (errors) {
         Py_DECREF(errors);
+    }
     errors = PyList_New(0);
 
-    if (messages)
+    if (messages) {
         Py_DECREF(messages);
+    }
     messages = PyList_New(0);
 
-    if (track)
-	Py_DECREF(track);
+    if (track) {
+        Py_DECREF(track);
+    }
     track = PyList_New(0);
 
     if (output == NULL
@@ -154,8 +164,9 @@ int P4Result::AddTrack( PyObject * t )
 
 void P4Result::ClearTrack()
 {
-    if (track)
-	Py_DECREF(track);
+    if (track) {
+        Py_DECREF(track);
+    }
     track = PyList_New(0);
 }
 
@@ -221,13 +232,13 @@ P4Result::AddError( Error *e )
 int
 P4Result::ErrorCount()
 {
-    return PyList_Size( errors );
+    return (int)PyList_Size( errors );
 }
 
 int
 P4Result::WarningCount()
 {
-    return PyList_Size( warnings );
+    return (int)PyList_Size( warnings );
 }
 
 void
@@ -246,7 +257,7 @@ P4Result::FmtWarnings( StrBuf &buf )
 int
 P4Result::Length( PyObject * list )
 {
-    return PyList_Size( list );
+    return (int)PyList_Size( list );
 }
 
 void

PythonClientAPI.cpp

@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-$Id: //depot/main/p4-python/PythonClientAPI.cpp#77 $
+$Id: //depot/main/p4-python/PythonClientAPI.cpp#78 $
 *******************************************************************************/
 
 #include <Python.h>
@@ -619,7 +619,7 @@ PyObject * PythonClientAPI::Convert(const char * charset, PyObject * content)
 	const char * contentAsUTF8 = PyBytes_AS_STRING(bytes);
 
 	int retlen = 0;
-	const char * converted = cvt->FastCvt(contentAsUTF8, strlen(contentAsUTF8), &retlen);
+	const char * converted = cvt->FastCvt(contentAsUTF8, (int)strlen(contentAsUTF8), &retlen);
 	Py_DECREF( bytes ); // we do not need this object anymore
 
 	if (converted == NULL) {

SpecMgr.cpp

@@ -23,7 +23,7 @@
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- $Id: //depot/main/p4-python/SpecMgr.cpp#49 $
+ $Id: //depot/main/p4-python/SpecMgr.cpp#51 $
  *******************************************************************************/
 
 /*******************************************************************************
@@ -570,10 +570,10 @@ void SpecMgr::SplitKey( const StrPtr *key, StrBuf &base, StrBuf &index ) {
     base = *key;
     index = "";
     for( size_t i = key->Length(); i; i-- ) {
-	char prev = (*key)[i - 1];
+	char prev = (*key)[(p4size_t)i - 1];
 	if( !isdigit(prev) && prev != ',' ) {
-	    base.Set(key->Text(), i);
-	    index.Set(key->Text() + i);
+	    base.Set(key->Text(), (p4size_t)i);
+	    index.Set(key->Text() + (p4size_t)i);
 	    break;
 	}
     }
@@ -659,7 +659,7 @@ void SpecMgr::InsertItem( PyObject * dict, const StrPtr *var, const StrPtr *val
 
     for( const char *c = 0; (c = index.Contains(comma)); ) {
 	StrBuf level;
-	level.Set(index.Text(), c - index.Text());
+	level.Set(index.Text(), (int)(c - index.Text()));
 	index.Set(c + 1);
 
 	// Found another level so we need to get/create a nested array
@@ -703,7 +703,7 @@ void SpecMgr::InsertItem( PyObject * dict, const StrPtr *var, const StrPtr *val
     }
 
     buf = "... ";
-    buf << PyList_Size(list) << "] = " << val->Text();
+    buf << (int)PyList_Size(list) << "] = " << val->Text();
 
     debug->debug ( P4PYDBG_DATA, buf.Text() );