Index: getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.97
diff -c -r2.97 getargs.c
*** getargs.c	29 Mar 2003 10:04:55 -0000	2.97
--- getargs.c	17 Apr 2003 17:00:18 -0000
***************
*** 448,466 ****
  		long ival;
  		if (float_argument_error(arg))
  			return NULL;
! 		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
- 			return converterr("integer<b>", arg, msgbuf, bufsize);
- 		else if (ival < SCHAR_MIN) {
- 			PyErr_SetString(PyExc_OverflowError,
- 			"byte-sized integer bitfield is less than minimum");
- 			return converterr("integer<B>", arg, msgbuf, bufsize);
- 		}
- 		else if (ival > (int)UCHAR_MAX) {
- 			PyErr_SetString(PyExc_OverflowError,
- 			"byte-sized integer bitfield is greater than maximum");
  			return converterr("integer<B>", arg, msgbuf, bufsize);
- 		}
  		else
  			*p = (unsigned char) ival;
  		break;
--- 448,456 ----
  		long ival;
  		if (float_argument_error(arg))
  			return NULL;
! 		ival = PyInt_AsUnsignedLongMask(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<B>", arg, msgbuf, bufsize);
  		else
  			*p = (unsigned char) ival;
  		break;
***************
*** 474,485 ****
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<h>", arg, msgbuf, bufsize);
! 		else if (ival < SHRT_MIN) {
  			PyErr_SetString(PyExc_OverflowError,
  			"signed short integer is less than minimum");
  			return converterr("integer<h>", arg, msgbuf, bufsize);
  		}
! 		else if (ival > SHRT_MAX) {
  			PyErr_SetString(PyExc_OverflowError,
  			"signed short integer is greater than maximum");
  			return converterr("integer<h>", arg, msgbuf, bufsize);
--- 464,475 ----
  		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<h>", arg, msgbuf, bufsize);
! 		else if (ival < 0) {
  			PyErr_SetString(PyExc_OverflowError,
  			"signed short integer is less than minimum");
  			return converterr("integer<h>", arg, msgbuf, bufsize);
  		}
! 		else if (ival > USHRT_MAX) {
  			PyErr_SetString(PyExc_OverflowError,
  			"signed short integer is greater than maximum");
  			return converterr("integer<h>", arg, msgbuf, bufsize);
***************
*** 495,513 ****
  		long ival;
  		if (float_argument_error(arg))
  			return NULL;
! 		ival = PyInt_AsLong(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<H>", arg, msgbuf, bufsize);
- 		else if (ival < SHRT_MIN) {
- 			PyErr_SetString(PyExc_OverflowError,
- 			"short integer bitfield is less than minimum");
- 			return converterr("integer<H>", arg, msgbuf, bufsize);
- 		}
- 		else if (ival > USHRT_MAX) {
- 			PyErr_SetString(PyExc_OverflowError,
- 			"short integer bitfield is greater than maximum");
- 			return converterr("integer<H>", arg, msgbuf, bufsize);
- 		}
  		else
  			*p = (unsigned short) ival;
  		break;
--- 485,493 ----
  		long ival;
  		if (float_argument_error(arg))
  			return NULL;
! 		ival = PyInt_AsUnsignedLongMask(arg);
  		if (ival == -1 && PyErr_Occurred())
  			return converterr("integer<H>", arg, msgbuf, bufsize);
  		else
  			*p = (unsigned short) ival;
  		break;
***************
*** 536,541 ****
--- 516,535 ----
  		break;
  	}
  
+ 	case 'I': { /* int sized bitfield, both signed and
+ 		       unsigned allowed */ 
+ 		unsigned int *p = va_arg(*p_va, unsigned int *);
+ 		unsigned int ival;
+ 		if (float_argument_error(arg))
+ 			return NULL;
+ 		ival = PyInt_AsUnsignedLongMask(arg);
+ 		if (ival == -1 && PyErr_Occurred())
+ 			return converterr("integer<I>", arg, msgbuf, bufsize);
+ 		else
+ 			*p = ival;
+ 		break;
+ 	}
+ 	
  	case 'l': {/* long int */
  		long *p = va_arg(*p_va, long *);
  		long ival;
***************
*** 548,553 ****
--- 542,560 ----
  			*p = ival;
  		break;
  	}
+ 
+ 	case 'k': { /* long sized bitfield */
+ 		unsigned long *p = va_arg(*p_va, unsigned long *);
+ 		unsigned long ival;
+ 		if (PyInt_Check(arg))
+ 			ival = PyInt_AsUnsignedLongMask(arg);
+ 		else if (PyLong_Check(arg))
+ 			ival = PyLong_AsUnsignedLongMask(arg);
+ 		else
+ 			return converterr("integer<k>", arg, msgbuf, bufsize);
+ 		*p = ival;
+ 		break;
+ 	}
  	
  #ifdef HAVE_LONG_LONG
  	case 'L': {/* PY_LONG_LONG */
***************
*** 558,563 ****
--- 565,585 ----
  		} else {
  			*p = ival;
  		}
+ 		break;
+ 	}
+ 
+ 	case 'K': { /* long long sized bitfield */
+ 		unsigned PY_LONG_LONG *p = va_arg(*p_va, unsigned PY_LONG_LONG *);
+ 		unsigned PY_LONG_LONG ival;
+ 		if (float_argument_error(arg))
+ 			return NULL;
+ 		if (PyInt_Check(arg))
+ 			ival = PyInt_AsUnsignedLongMask(arg);
+ 		else if (PyLong_Check(arg))
+ 			ival = PyLong_AsUnsignedLongLongMask(arg);
+ 		else
+ 			return converterr("integer<K>", arg, msgbuf, bufsize);
+ 		*p = ival;
  		break;
  	}
  #endif