ANSI-fication of the SGI modules (note that svmodule.c and sgimodule.c

have already been checked in)

UNTESTED!

Modules/almodule.c

@@ -253,10 +253,7 @@ python2params(int resource1, int resource2, PyObject *list, ALpv **pvsp, ALparam
 
 
 static PyObject *
-SetConfig(self, args, func)
-	alcobject *self;
-	PyObject *args;
-	int (*func)(ALconfig, int);
+SetConfig(alcobject *self, PyObject *args, int (*func)(ALconfig, int))
 {
 	int par;
 
@@ -271,10 +268,7 @@ SetConfig(self, args, func)
 }
 
 static PyObject *
-GetConfig(self, args, func)
-	alcobject *self;
-	PyObject *args;
-	int (*func)(ALconfig);
+GetConfig(alcobject *self, PyObject *args, int (*func)(ALconfig))
 {	
 	int par;
 
@@ -292,9 +286,7 @@ static char alc_SetWidth__doc__[] =
 ;
 
 static PyObject *
-alc_SetWidth(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_SetWidth(alcobject *self, PyObject *args)
 {
 	return SetConfig(self, args, alSetWidth);
 }
@@ -305,9 +297,7 @@ static char alc_GetWidth__doc__[] =
 ;
 
 static PyObject *
-alc_GetWidth(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_GetWidth(alcobject *self, PyObject *args)
 {
 	return GetConfig(self, args, alGetWidth);
 }
@@ -318,9 +308,7 @@ static char alc_SetSampFmt__doc__[] =
 ;
 
 static PyObject *
-alc_SetSampFmt(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_SetSampFmt(alcobject *self, PyObject *args)
 {
 	return SetConfig(self, args, alSetSampFmt);
 }
@@ -331,9 +319,7 @@ static char alc_GetSampFmt__doc__[] =
 ;
 
 static PyObject *
-alc_GetSampFmt(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_GetSampFmt(alcobject *self, PyObject *args)
 {
 	return GetConfig(self, args, alGetSampFmt);
 }
@@ -344,9 +330,7 @@ static char alc_SetChannels__doc__[] =
 ;
 
 static PyObject *
-alc_SetChannels(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_SetChannels(alcobject *self, PyObject *args)
 {
 	return SetConfig(self, args, alSetChannels);
 }
@@ -357,9 +341,7 @@ static char alc_GetChannels__doc__[] =
 ;
 
 static PyObject *
-alc_GetChannels(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_GetChannels(alcobject *self, PyObject *args)
 {
 	return GetConfig(self, args, alGetChannels);
 }
@@ -370,9 +352,7 @@ static char alc_SetFloatMax__doc__[] =
 ;
 
 static PyObject *
-alc_SetFloatMax(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_SetFloatMax(alcobject *self, PyObject *args)
 {
 	double maximum_value;
 
@@ -390,9 +370,7 @@ static char alc_GetFloatMax__doc__[] =
 ;
 
 static PyObject *
-alc_GetFloatMax(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_GetFloatMax(alcobject *self, PyObject *args)
 {
 	double maximum_value;
 
@@ -409,9 +387,7 @@ static char alc_SetDevice__doc__[] =
 ;
 
 static PyObject *
-alc_SetDevice(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_SetDevice(alcobject *self, PyObject *args)
 {
 	return SetConfig(self, args, alSetDevice);
 }
@@ -422,9 +398,7 @@ static char alc_GetDevice__doc__[] =
 ;
 
 static PyObject *
-alc_GetDevice(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_GetDevice(alcobject *self, PyObject *args)
 {
 	return GetConfig(self, args, alGetDevice);
 }
@@ -435,9 +409,7 @@ static char alc_SetQueueSize__doc__[] =
 ;
 
 static PyObject *
-alc_SetQueueSize(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_SetQueueSize(alcobject *self, PyObject *args)
 {
 	return SetConfig(self, args, alSetQueueSize);
 }
@@ -448,9 +420,7 @@ static char alc_GetQueueSize__doc__[] =
 ;
 
 static PyObject *
-alc_GetQueueSize(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_GetQueueSize(alcobject *self, PyObject *args)
 {
 	return GetConfig(self, args, alGetQueueSize);
 }
@@ -458,10 +428,7 @@ alc_GetQueueSize(self, args)
 #endif /* AL_NO_ELEM */
 
 static PyObject *
-setconfig(self, args, func)
-	alcobject *self;
-	PyObject *args;
-	int (*func)(ALconfig, long);
+setconfig(alcobject *self, PyObject *args, int (*func)(ALconfig, long))
 {
 	long par;
 
@@ -476,10 +443,7 @@ setconfig(self, args, func)
 }
 
 static PyObject *
-getconfig(self, args, func)
-	alcobject *self;
-	PyObject *args;
-	long (*func)(ALconfig);
+getconfig(alcobject *self, PyObject *args, long (*func)(ALconfig))
 {	
 	long par;
 
@@ -493,49 +457,37 @@ getconfig(self, args, func)
 }
 
 static PyObject *
-alc_setqueuesize (self, args)
-	alcobject *self;
-	PyObject *args;
+alc_setqueuesize (alcobject *self, PyObject *args)
 {
 	return setconfig(self, args, ALsetqueuesize);
 }
 
 static PyObject *
-alc_getqueuesize (self, args)
-	alcobject *self;
-	PyObject *args;
+alc_getqueuesize (alcobject *self, PyObject *args)
 {
 	return getconfig(self, args, ALgetqueuesize);
 }
 
 static PyObject *
-alc_setwidth (self, args)
-	alcobject *self;
-	PyObject *args;
+alc_setwidth (alcobject *self, PyObject *args)
 {
 	return setconfig(self, args, ALsetwidth);
 }
 
 static PyObject *
-alc_getwidth (self, args)
-	alcobject *self;
-	PyObject *args;
+alc_getwidth (alcobject *self, PyObject *args)
 {
 	return getconfig(self, args, ALgetwidth);	
 }
 
 static PyObject *
-alc_getchannels (self, args)
-	alcobject *self;
-	PyObject *args;
+alc_getchannels (alcobject *self, PyObject *args)
 {
 	return getconfig(self, args, ALgetchannels);	
 }
 
 static PyObject *
-alc_setchannels (self, args)
-	alcobject *self;
-	PyObject *args;
+alc_setchannels (alcobject *self, PyObject *args)
 {
 	return setconfig(self, args, ALsetchannels);
 }
@@ -543,25 +495,19 @@ alc_setchannels (self, args)
 #ifdef AL_405
 
 static PyObject *
-alc_getsampfmt (self, args)
-	alcobject *self;
-	PyObject *args;
+alc_getsampfmt (alcobject *self, PyObject *args)
 {
 	return getconfig(self, args, ALgetsampfmt);	
 }
 
 static PyObject *
-alc_setsampfmt (self, args)
-	alcobject *self;
-	PyObject *args;
+alc_setsampfmt (alcobject *self, PyObject *args)
 {
 	return setconfig(self, args, ALsetsampfmt);
 }
 
 static PyObject *
-alc_getfloatmax(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_getfloatmax(alcobject *self, PyObject *args)
 {
 	double arg;
 
@@ -573,9 +519,7 @@ alc_getfloatmax(self, args)
 }
 
 static PyObject *
-alc_setfloatmax(self, args)
-	alcobject *self;
-	PyObject *args;
+alc_setfloatmax(alcobject *self, PyObject *args)
 {
 	double arg;
 
@@ -637,8 +581,7 @@ newalcobject(ALconfig config)
 
 
 static void
-alc_dealloc(self)
-	alcobject *self;
+alc_dealloc(alcobject *self)
 {
 	/* XXXX Add your own cleanup code here */
 #ifdef AL_NO_ELEM		/* IRIX 6 */
@@ -650,9 +593,7 @@ alc_dealloc(self)
 }
 
 static PyObject *
-alc_getattr(self, name)
-	alcobject *self;
-	char *name;
+alc_getattr(alcobject *self, char *name)
 {
 	/* XXXX Add your own getattr code here */
 	return Py_FindMethod(alc_methods, (PyObject *)self, name);
@@ -697,9 +638,7 @@ static char alp_SetConfig__doc__[] =
 ;
 
 static PyObject *
-alp_SetConfig(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_SetConfig(alpobject *self, PyObject *args)
 {
 	alcobject *config;
 	if (!PyArg_ParseTuple(args, "O!:SetConfig", &Alctype, &config))
@@ -716,9 +655,7 @@ static char alp_GetConfig__doc__[] =
 ;
 
 static PyObject *
-alp_GetConfig(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_GetConfig(alpobject *self, PyObject *args)
 {
 	ALconfig config;
 	if (!PyArg_ParseTuple(args, ":GetConfig"))
@@ -734,9 +671,7 @@ static char alp_GetResource__doc__[] =
 ;
 
 static PyObject *
-alp_GetResource(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_GetResource(alpobject *self, PyObject *args)
 {
 	int resource;
 
@@ -753,9 +688,7 @@ static char alp_GetFD__doc__[] =
 ;
 
 static PyObject *
-alp_GetFD(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_GetFD(alpobject *self, PyObject *args)
 {
 	int fd;
 
@@ -774,9 +707,7 @@ static char alp_GetFilled__doc__[] =
 ;
 
 static PyObject *
-alp_GetFilled(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_GetFilled(alpobject *self, PyObject *args)
 {
 	int filled;
 
@@ -793,9 +724,7 @@ static char alp_GetFillable__doc__[] =
 ;
 
 static PyObject *
-alp_GetFillable(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_GetFillable(alpobject *self, PyObject *args)
 {
 	int fillable;
 
@@ -812,9 +741,7 @@ static char alp_ReadFrames__doc__[] =
 ;
 
 static PyObject *
-alp_ReadFrames(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_ReadFrames(alpobject *self, PyObject *args)
 {
 	void *samples;
 	int framecount;
@@ -883,9 +810,7 @@ static char alp_DiscardFrames__doc__[] =
 ;
 
 static PyObject *
-alp_DiscardFrames(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_DiscardFrames(alpobject *self, PyObject *args)
 {
 	int framecount;
 
@@ -908,9 +833,7 @@ static char alp_ZeroFrames__doc__[] =
 ;
 
 static PyObject *
-alp_ZeroFrames(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_ZeroFrames(alpobject *self, PyObject *args)
 {
 	int framecount;
 
@@ -936,9 +859,7 @@ static char alp_SetFillPoint__doc__[] =
 ;
 
 static PyObject *
-alp_SetFillPoint(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_SetFillPoint(alpobject *self, PyObject *args)
 {
 	int fillpoint;
 
@@ -958,9 +879,7 @@ static char alp_GetFillPoint__doc__[] =
 ;
 
 static PyObject *
-alp_GetFillPoint(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_GetFillPoint(alpobject *self, PyObject *args)
 {
 	int fillpoint;
 
@@ -979,9 +898,7 @@ static char alp_GetFrameNumber__doc__[] =
 ;
 
 static PyObject *
-alp_GetFrameNumber(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_GetFrameNumber(alpobject *self, PyObject *args)
 {
 	stamp_t fnum;
 
@@ -1000,9 +917,7 @@ static char alp_GetFrameTime__doc__[] =
 ;
 
 static PyObject *
-alp_GetFrameTime(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_GetFrameTime(alpobject *self, PyObject *args)
 {
 	stamp_t fnum, time;
 	PyObject *ret, *v0, *v1;
@@ -1030,9 +945,7 @@ static char alp_WriteFrames__doc__[] =
 ;
 
 static PyObject *
-alp_WriteFrames(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_WriteFrames(alpobject *self, PyObject *args)
 {
 	char *samples;
 	int length;
@@ -1098,9 +1011,7 @@ static char alp_ClosePort__doc__[] =
 ;
 
 static PyObject *
-alp_ClosePort(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_ClosePort(alpobject *self, PyObject *args)
 {
 	if (!PyArg_ParseTuple(args, ":ClosePort"))
 		return NULL;
@@ -1115,9 +1026,7 @@ alp_ClosePort(self, args)
 
 #ifdef OLD_INTERFACE
 static PyObject *
-alp_closeport(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_closeport(alpobject *self, PyObject *args)
 {
 	if (!PyArg_ParseTuple(args, ":ClosePort"))
 		return NULL;
@@ -1129,9 +1038,7 @@ alp_closeport(self, args)
 }
 
 static PyObject *
-alp_getfd(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_getfd(alpobject *self, PyObject *args)
 {
 	int fd;
 
@@ -1143,9 +1050,7 @@ alp_getfd(self, args)
 }
 
 static PyObject *
-alp_getfilled(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_getfilled(alpobject *self, PyObject *args)
 {
 	long count;
 
@@ -1157,9 +1062,7 @@ alp_getfilled(self, args)
 }
 
 static PyObject *
-alp_getfillable(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_getfillable(alpobject *self, PyObject *args)
 {
 	long count;
 
@@ -1171,9 +1074,7 @@ alp_getfillable(self, args)
 }
 
 static PyObject *
-alp_readsamps(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_readsamps(alpobject *self, PyObject *args)
 {
 	long count;
 	PyObject *v;
@@ -1218,9 +1119,7 @@ alp_readsamps(self, args)
 }
 
 static PyObject *
-alp_writesamps(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_writesamps(alpobject *self, PyObject *args)
 {
 	char *buf;
 	int size, width;
@@ -1254,9 +1153,7 @@ alp_writesamps(self, args)
 }
 
 static PyObject *
-alp_getfillpoint(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_getfillpoint(alpobject *self, PyObject *args)
 {
 	long count;
 
@@ -1268,9 +1165,7 @@ alp_getfillpoint(self, args)
 }
 
 static PyObject *
-alp_setfillpoint(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_setfillpoint(alpobject *self, PyObject *args)
 {
 	long count;
 
@@ -1283,9 +1178,7 @@ alp_setfillpoint(self, args)
 }
 
 static PyObject *
-alp_setconfig(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_setconfig(alpobject *self, PyObject *args)
 {
 	alcobject *config;
 
@@ -1298,9 +1191,7 @@ alp_setconfig(self, args)
 }
 
 static PyObject *
-alp_getconfig(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_getconfig(alpobject *self, PyObject *args)
 {
 	ALconfig config;
 
@@ -1314,9 +1205,7 @@ alp_getconfig(self, args)
 
 #ifdef AL_405
 static PyObject *
-alp_getstatus(self, args)
-	alpobject *self;
-	PyObject *args;
+alp_getstatus(alpobject *self, PyObject *args)
 {
 	PyObject *list, *v;
 	long *PVbuffer;
@@ -1410,8 +1299,7 @@ newalpobject(ALport port)
 
 
 static void
-alp_dealloc(self)
-	alpobject *self;
+alp_dealloc(alpobject *self)
 {
 	/* XXXX Add your own cleanup code here */
 	if (self->port) {
@@ -1425,9 +1313,7 @@ alp_dealloc(self)
 }
 
 static PyObject *
-alp_getattr(self, name)
-	alpobject *self;
-	char *name;
+alp_getattr(alpobject *self, char *name)
 {
 	/* XXXX Add your own getattr code here */
 	if (self->port == NULL) {
@@ -1477,9 +1363,7 @@ static char al_NewConfig__doc__[] =
 ;
 
 static PyObject *
-al_NewConfig(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_NewConfig(PyObject *self, PyObject *args)
 {
 	ALconfig config;
 
@@ -1495,9 +1379,7 @@ static char al_OpenPort__doc__[] =
 ;
 
 static PyObject *
-al_OpenPort(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_OpenPort(PyObject *self, PyObject *args)
 {
 	ALport port;
 	char *name, *dir;
@@ -1515,9 +1397,7 @@ static char al_Connect__doc__[] =
 ;
 
 static PyObject *
-al_Connect(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_Connect(PyObject *self, PyObject *args)
 {
 	int source, dest, nprops = 0, id, i;
 	ALpv *props = NULL;
@@ -1557,9 +1437,7 @@ static char al_Disconnect__doc__[] =
 ;
 
 static PyObject *
-al_Disconnect(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_Disconnect(PyObject *self, PyObject *args)
 {
 	int res;
 
@@ -1576,9 +1454,7 @@ static char al_GetParams__doc__[] =
 ;
 
 static PyObject *
-al_GetParams(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_GetParams(PyObject *self, PyObject *args)
 {
 	int resource;
 	PyObject *pvslist, *item = NULL, *v = NULL;
@@ -1722,9 +1598,7 @@ static char al_SetParams__doc__[] =
 ;
 
 static PyObject *
-al_SetParams(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_SetParams(PyObject *self, PyObject *args)
 {
 	int resource;
 	PyObject *pvslist, *item;
@@ -1770,9 +1644,7 @@ static char al_QueryValues__doc__[] =
 ;
 
 static PyObject *
-al_QueryValues(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_QueryValues(PyObject *self, PyObject *args)
 {
 	int resource, param;
 	ALvalue *return_set = NULL;
@@ -1852,9 +1724,7 @@ static char al_GetParamInfo__doc__[] =
 ;
 
 static PyObject *
-al_GetParamInfo(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_GetParamInfo(PyObject *self, PyObject *args)
 {
 	int res, param;
 	ALparamInfo pinfo;
@@ -1937,9 +1807,7 @@ static char al_GetResourceByName__doc__[] =
 ;
 
 static PyObject *
-al_GetResourceByName(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_GetResourceByName(PyObject *self, PyObject *args)
 {
 	int res, start_res, type;
 	char *name;
@@ -1956,9 +1824,7 @@ static char al_IsSubtype__doc__[] =
 ;
 
 static PyObject *
-al_IsSubtype(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_IsSubtype(PyObject *self, PyObject *args)
 {
 	int type, subtype;
 
@@ -1972,9 +1838,7 @@ static char al_SetErrorHandler__doc__[] =
 ;
 
 static PyObject *
-al_SetErrorHandler(self, args)
-	PyObject *self;	/* Not used */
-	PyObject *args;
+al_SetErrorHandler(PyObject *self, PyObject *args)
 {
 
 	if (!PyArg_ParseTuple(args, ":SetErrorHandler"))
@@ -1988,8 +1852,7 @@ al_SetErrorHandler(self, args)
 #ifdef OLD_INTERFACE
 
 static PyObject *
-al_openport(self, args)
-	PyObject *self, *args;
+al_openport(PyObject *self, PyObject *args)
 {
 	char *name, *dir;
 	ALport port;
@@ -2003,8 +1866,7 @@ al_openport(self, args)
 }
 
 static PyObject *
-al_newconfig(self, args)
-	PyObject *self, *args;
+al_newconfig(PyObject *self, PyObject *args)
 {
 	ALconfig config;
 
@@ -2016,8 +1878,7 @@ al_newconfig(self, args)
 }
 
 static PyObject *
-al_queryparams(self, args)
-	PyObject *self, *args;
+al_queryparams(PyObject *self, PyObject *args)
 {
 	long device;
 	long length;
@@ -2042,10 +1903,7 @@ al_queryparams(self, args)
 }
 
 static PyObject *
-doParams(args, func, modified)
-	PyObject *args;
-	int (*func)(long, long *, long);
-	int modified;
+doParams(PyObject *args, int (*func)(long, long *, long), int modified)
 {
 	long device;
 	PyObject *list, *v;
@@ -2086,22 +1944,19 @@ doParams(args, func, modified)
 }
 
 static PyObject *
-al_getparams(self, args)
-	PyObject *self, *args;
+al_getparams(PyObject *self, PyObject *args)
 {
 	return doParams(args, ALgetparams, 1);
 }
 
 static PyObject *
-al_setparams(self, args)
-	PyObject *self, *args;
+al_setparams(PyObject *self, PyObject *args)
 {
 	return doParams(args, ALsetparams, 0);
 }
 
 static PyObject *
-al_getname(self, args)
-	PyObject *self, *args;
+al_getname(PyObject *self, PyObject *args)
 {
 	long device, descriptor;
 	char *name;
@@ -2114,8 +1969,7 @@ al_getname(self, args)
 }
 
 static PyObject *
-al_getdefault(self, args)
-	PyObject *self, *args;
+al_getdefault(PyObject *self, PyObject *args)
 {
 	long device, descriptor, value;
 
@@ -2127,8 +1981,7 @@ al_getdefault(self, args)
 }
 
 static PyObject *
-al_getminmax(self, args)
-	PyObject *self, *args;
+al_getminmax(PyObject *self, PyObject *args)
 {
 	long device, descriptor, min, max;