[Python-checkins] r42564 - in python/trunk/Mac/Modules: Nav.c cf/pycfbridge.c

[neal.norwitz]

Author: neal.norwitz
Date: Fri Feb 24 16:39:29 2006
New Revision: 42564

Modified:
   python/trunk/Mac/Modules/Nav.c
   python/trunk/Mac/Modules/cf/pycfbridge.c
Log:
Fix a couple of warnings on Mac OS X.

Modified: python/trunk/Mac/Modules/Nav.c
==============================================================================
--- python/trunk/Mac/Modules/Nav.c	(original)
+++ python/trunk/Mac/Modules/Nav.c	Fri Feb 24 16:39:29 2006
@@ -131,7 +131,7 @@
 		OSType *fileTypeP,
 		OSType *fileCreatorP)
 {
-	int pos = 0;
+	Py_ssize_t pos = 0;
 	PyObject *key, *value;
 	char *keystr;
 	AEDesc *defaultLocation_storage;

Modified: python/trunk/Mac/Modules/cf/pycfbridge.c
==============================================================================
--- python/trunk/Mac/Modules/cf/pycfbridge.c	(original)
+++ python/trunk/Mac/Modules/cf/pycfbridge.c	Fri Feb 24 16:39:29 2006
@@ -283,7 +283,7 @@
 	
 	if (PyString_Check(src)) {
 		if (!PyArg_Parse(src, "es", "ascii", &chars))
-			return NULL; /* This error is more descriptive than the general one below */
+			return 0; /* This error is more descriptive than the general one below */
 		*dst = CFStringCreateWithCString((CFAllocatorRef)NULL, chars, kCFStringEncodingASCII);
 		return 1;
 	}