ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/cv/mgflib/object.c

Comparing ray/src/cv/mgflib/object.c (file contents):
Revision 1.6 by greg, Fri Feb 28 20:11:29 2003 UTC vs.
Revision 1.7 by greg, Fri Jan 14 05:46:12 2011 UTC

#	Line 27 | Line 27 | char   **av;
27		if (ac == 1) {                          /* just pop top object */
28		if (obj_nnames < 1)
29		return(MG_ECNTXT);
30	<	free((MEM_PTR)obj_name[--obj_nnames]);
30	>	free(obj_name[--obj_nnames]);
31		obj_name[obj_nnames] = NULL;
32		return(MG_OK);
33		}
#	Line 40 | Line 40 | char   **av;
40		obj_name = (char **)malloc(
41		(obj_maxname=ALLOC_INC)*sizeof(char *));
42		else
43	<	obj_name = (char **)realloc((MEM_PTR)obj_name,
43	>	obj_name = (char **)realloc(obj_name,
44		(obj_maxname+=ALLOC_INC)*sizeof(char *));
45		if (obj_name == NULL)
46		return(MG_EMEM);
#	Line 59 | Line 59 | void
59		obj_clear()                     /* clear object stack */
60		{
61		while (obj_nnames)
62	<	free((MEM_PTR)obj_name[--obj_nnames]);
62	>	free(obj_name[--obj_nnames]);
63		if (obj_maxname) {
64	<	free((MEM_PTR)obj_name);
64	>	free(obj_name);
65		obj_maxname = 0;
66		}
67		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)