[Python-checkins] CVS: python/dist/src/Mac/Modules/qd _Qdmodule.c,1.2,1.3

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules/qd
In directory usw-pr-cvs1:/tmp/cvs-serv11133/python/Mac/Modules/qd

Modified Files:
	_Qdmodule.c 
Log Message:
Shut up many more gcc warnings.

Index: _Qdmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/qd/_Qdmodule.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** _Qdmodule.c	2001/09/04 22:17:56	1.2
--- _Qdmodule.c	2001/09/05 10:29:02	1.3
***************
*** 6,11 ****
--- 6,15 ----
  
  
+ #ifdef _WIN32
+ #include "pywintoolbox.h"
+ #else
  #include "macglue.h"
  #include "pymactoolbox.h"
+ #endif
  
  /* Macro to test whether a weak-loaded CFM function exists */
***************
*** 443,447 ****
  		return NULL;
  	cp = _self->ob_itself->baseAddr+from;
! 	return PyString_FromStringAndSize(cp, length);
  
  }
--- 447,452 ----
  		return NULL;
  	cp = _self->ob_itself->baseAddr+from;
! 	_res = PyString_FromStringAndSize(cp, length);
! 	return _res;
  
  }
***************
*** 459,463 ****
  	memcpy(cp, icp, length);
  	Py_INCREF(Py_None);
! 	return Py_None;
  
  }
--- 464,469 ----
  	memcpy(cp, icp, length);
  	Py_INCREF(Py_None);
! 	_res = Py_None;
! 	return _res;
  
  }
***************
*** 913,917 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&pnState__out__, (int)sizeof(PenState));
-  pnState__error__: ;
  	return _res;
  }
--- 919,922 ----
***************
*** 3471,3475 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&thePat__out__, (int)sizeof(Pattern));
-  thePat__error__: ;
  	return _res;
  }
--- 3476,3479 ----
***************
*** 4117,4121 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&arrow__out__, (int)sizeof(Cursor));
-  arrow__error__: ;
  	return _res;
  }
--- 4121,4124 ----
***************
*** 4130,4134 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&dkGray__out__, (int)sizeof(Pattern));
-  dkGray__error__: ;
  	return _res;
  }
--- 4133,4136 ----
***************
*** 4143,4147 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&ltGray__out__, (int)sizeof(Pattern));
-  ltGray__error__: ;
  	return _res;
  }
--- 4145,4148 ----
***************
*** 4156,4160 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&gray__out__, (int)sizeof(Pattern));
-  gray__error__: ;
  	return _res;
  }
--- 4157,4160 ----
***************
*** 4169,4173 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&black__out__, (int)sizeof(Pattern));
-  black__error__: ;
  	return _res;
  }
--- 4169,4172 ----
***************
*** 4182,4186 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&white__out__, (int)sizeof(Pattern));
-  white__error__: ;
  	return _res;
  }
--- 4181,4184 ----
***************
*** 4449,4453 ****
  	PyObject *_res = NULL;
  	char *textBuf__in__;
- 	int textBuf__len__;
  	int textBuf__in_len__;
  	short firstByte;
--- 4447,4450 ----
***************
*** 4458,4461 ****
--- 4455,4460 ----
  	                      &byteCount))
  		return NULL;
+ 	/* Fool compiler warnings */
+ 	textBuf__in_len__ = textBuf__in_len__;
  	MacDrawText(textBuf__in__,
  	            firstByte,
***************
*** 4463,4467 ****
  	Py_INCREF(Py_None);
  	_res = Py_None;
-  textBuf__error__: ;
  	return _res;
  }
--- 4462,4465 ----
***************
*** 4500,4504 ****
  	short _rv;
  	char *textBuf__in__;
- 	int textBuf__len__;
  	int textBuf__in_len__;
  	short firstByte;
--- 4498,4501 ----
***************
*** 4509,4512 ****
--- 4506,4511 ----
  	                      &byteCount))
  		return NULL;
+ 	/* Fool compiler warnings */
+ 	textBuf__in_len__ = textBuf__in_len__;
  	_rv = TextWidth(textBuf__in__,
  	                firstByte,
***************
*** 4514,4518 ****
  	_res = Py_BuildValue("h",
  	                     _rv);
-  textBuf__error__: ;
  	return _res;
  }
--- 4513,4516 ----
***************
*** 4978,4982 ****
  	PyObject *_res = NULL;
  	char *textBuf__in__;
- 	int textBuf__len__;
  	int textBuf__in_len__;
  	short firstByte;
--- 4976,4979 ----
***************
*** 4987,4990 ****
--- 4984,4989 ----
  	                      &byteCount))
  		return NULL;
+ 	/* Fool compiler warnings */
+ 	textBuf__in_len__ = textBuf__in_len__;
  	DrawText(textBuf__in__,
  	         firstByte,
***************
*** 4992,4996 ****
  	Py_INCREF(Py_None);
  	_res = Py_None;
-  textBuf__error__: ;
  	return _res;
  }
--- 4991,4994 ----