ViewVC Help

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

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

Comparing ray/src/cv/mgflib/parser.c (file contents):
Revision 1.20 by greg, Wed Nov 8 09:40:22 1995 UTC vs.
Revision 1.21 by greg, Wed Nov 29 19:14:49 1995 UTC

#	Line 348 | Line 348 | mg_load(fn)                    /* load an MGF file */
348		char    *fn;
349		{
350		MG_FCTXT        cntxt;
351	<	register int    rval;
351	>	int     rval;
352	>	register int    nbr;
353
354		if ((rval = mg_open(&cntxt, fn)) != MG_OK) {
355		fprintf(stderr, "%s: %s\n", fn, mg_err[rval]);
356		return(rval);
357		}
358	<	while ((rval = mg_read()) > 0) {        /* parse each line */
359	<	if (rval >= MG_MAXLINE-1 && cntxt.inpline[rval-1] != '\n') {
358	>	while ((nbr = mg_read()) > 0) { /* parse each line */
359	>	if (nbr >= MG_MAXLINE-1 && cntxt.inpline[nbr-1] != '\n') {
360		fprintf(stderr, "%s: %d: %s\n", cntxt.fname,
361		cntxt.lineno, mg_err[rval=MG_ELINE]);
362		break;
#	Line 427 | Line 428 | char   **av;
428		for (i = 1; i < ac-1; i++)
429		xfarg[i] = av[i+1];
430		xfarg[ac-1] = NULL;
431	<	if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK)
431	>	if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK) {
432	>	mg_close();
433		return(rv);
434	+	}
435		}
436		do {
437		while ((rv = mg_read()) > 0) {
#	Line 447 | Line 450 | char   **av;
450		}
451		}
452		if (ac > 2)
453	<	if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK)
453	>	if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK) {
454	>	mg_close();
455		return(rv);
456	+	}
457		} while (xf_context != xf_orig);
458		mg_close();
459		return(MG_OK);

Diff Legend

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