Attachment #358530 for bug #482512




	0,			/* CTLTYPE_NODE */
	sizeof(int),		/* CTLTYPE_INT */
	0,			/* CTLTYPE_STRING */
	sizeof(quad_t),		/* CTLTYPE_S64 */
	0,			/* CTLTYPE_OPAQUE */
	sizeof(unsigned int),	/* CTLTYPE_UINT */
	sizeof(long),		/* CTLTYPE_LONG */

	case CTLTYPE_UINT:
	case CTLTYPE_LONG:
	case CTLTYPE_ULONG:
	case CTLTYPE_S64:
		if (!PyInt_Check(newobj) && !PyLong_Check(newobj)) {
			PyErr_SetString(PyExc_TypeError,
				"argument 2 must be integer for this node");

		case CTLTYPE_ULONG:
			val.m_ulong = PyLong_AsUnsignedLong(newobj);
			break;
		case CTLTYPE_S64:
			val.m_quad = (quad_t)PyLong_AsLongLong(newobj);
			break;
		}

	case CTLTYPE_STRING:
		ret = PyString_FromStringAndSize(oldp, oldlen - 1);
		break;
	case CTLTYPE_S64:
		assert(oldlen == sizeof(quad_t));
		ret = PyLong_FromLongLong((long long)*(quad_t *)oldp);
		break;

Return to bug 482512

Lines 121-127 Link Here

(-)src/sysctl.c.orig (-4 / +4 lines)
121	0, /* CTLTYPE_NODE */	121	0, /* CTLTYPE_NODE */
122	sizeof(int), /* CTLTYPE_INT */	122	sizeof(int), /* CTLTYPE_INT */
123	0, /* CTLTYPE_STRING */	123	0, /* CTLTYPE_STRING */
124	sizeof(quad_t), /* CTLTYPE_QUAD */	124	sizeof(quad_t), /* CTLTYPE_S64 */
125	0, /* CTLTYPE_OPAQUE */	125	0, /* CTLTYPE_OPAQUE */
126	sizeof(unsigned int), /* CTLTYPE_UINT */	126	sizeof(unsigned int), /* CTLTYPE_UINT */
127	sizeof(long), /* CTLTYPE_LONG */	127	sizeof(long), /* CTLTYPE_LONG */
Lines 329-335 Link Here
329	case CTLTYPE_UINT:	329	case CTLTYPE_UINT:
330	case CTLTYPE_LONG:	330	case CTLTYPE_LONG:
331	case CTLTYPE_ULONG:	331	case CTLTYPE_ULONG:
332	case CTLTYPE_QUAD:	332	case CTLTYPE_S64:
333	if (!PyInt_Check(newobj) && !PyLong_Check(newobj)) {	333	if (!PyInt_Check(newobj) && !PyLong_Check(newobj)) {
334	PyErr_SetString(PyExc_TypeError,	334	PyErr_SetString(PyExc_TypeError,
335	"argument 2 must be integer for this node");	335	"argument 2 must be integer for this node");
Lines 350-356 Link Here
350	case CTLTYPE_ULONG:	350	case CTLTYPE_ULONG:
351	val.m_ulong = PyLong_AsUnsignedLong(newobj);	351	val.m_ulong = PyLong_AsUnsignedLong(newobj);
352	break;	352	break;
353	case CTLTYPE_QUAD:	353	case CTLTYPE_S64:
354	val.m_quad = (quad_t)PyLong_AsLongLong(newobj);	354	val.m_quad = (quad_t)PyLong_AsLongLong(newobj);
355	break;	355	break;
356	}	356	}
Lines 439-445 Link Here
439	case CTLTYPE_STRING:	439	case CTLTYPE_STRING:
440	ret = PyString_FromStringAndSize(oldp, oldlen - 1);	440	ret = PyString_FromStringAndSize(oldp, oldlen - 1);
441	break;	441	break;
442	case CTLTYPE_QUAD:	442	case CTLTYPE_S64:
443	assert(oldlen == sizeof(quad_t));	443	assert(oldlen == sizeof(quad_t));
444	ret = PyLong_FromLongLong((long long)(quad_t )oldp);	444	ret = PyLong_FromLongLong((long long)(quad_t )oldp);
445	break;	445	break;