--- ray/src/cv/mgflib/context.c	1994/06/22 15:33:44	1.2
+++ ray/src/cv/mgflib/context.c	1994/06/24 09:32:49	1.4
@@ -29,9 +29,9 @@ C_COLOR		*c_ccolor = &c_uncolor;
 C_MATERIAL	*c_cmaterial = &c_unmaterial;
 C_VERTEX	*c_cvertex = &c_unvertex;
 
-static LUTAB	clr_tab;		/* color lookup table */
-static LUTAB	mat_tab;		/* material lookup table */
-static LUTAB	vtx_tab;		/* vertex lookup table */
+static LUTAB	clr_tab = LU_SINIT(free,free);	/* color lookup table */
+static LUTAB	mat_tab = LU_SINIT(free,free);	/* material lookup table */
+static LUTAB	vtx_tab = LU_SINIT(free,free);	/* vertex lookup table */
 
 
 int
@@ -43,6 +43,8 @@ register char	**av;
 
 	switch (mg_entity(av[0])) {
 	case MG_E_COLOR:	/* get/set color context */
+		if (ac > 4)
+			return(MG_EARGC);
 		if (ac == 1) {		/* set unnamed color context */
 			c_uncolor = c_dfcolor;
 			c_ccolor = &c_uncolor;
@@ -107,6 +109,8 @@ register char	**av;
 
 	switch (mg_entity(av[0])) {
 	case MG_E_MATERIAL:	/* get/set material context */
+		if (ac > 4)
+			return(MG_EARGC);
 		if (ac == 1) {		/* set unnamed material context */
 			c_unmaterial = c_dfmaterial;
 			c_cmaterial = &c_unmaterial;
@@ -221,6 +225,8 @@ register char	**av;
 
 	switch (mg_entity(av[0])) {
 	case MG_E_VERTEX:	/* get/set vertex context */
+		if (ac > 4)
+			return(MG_EARGC);
 		if (ac == 1) {		/* set unnamed vertex context */
 			c_unvertex = c_dfvertex;
 			c_cvertex = &c_unvertex;
@@ -284,27 +290,18 @@ register char	**av;
 }
 
 
-static void
-freectx(lp)			/* free a context table entry */
-register LUENT	*lp;
-{
-	free((MEM_PTR)lp->key);
-	free((MEM_PTR)lp->data);
-}
-
-
 void
 c_clearall()			/* empty context tables */
 {
 	c_uncolor = c_dfcolor;
 	c_ccolor = &c_uncolor;
-	lu_done(&clr_tab, freectx);
+	lu_done(&clr_tab);
 	c_unmaterial = c_dfmaterial;
 	c_cmaterial = &c_unmaterial;
-	lu_done(&mat_tab, freectx);
+	lu_done(&mat_tab);
 	c_unvertex = c_dfvertex;
 	c_cvertex = &c_unvertex;
-	lu_done(&vtx_tab, freectx);
+	lu_done(&vtx_tab);
 }