"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tclxml/tclxml.c" between
ds9.8.2.tar.gz and ds9.8.2.1.tar.gz

About: SAOImage DS9 is an astronomical imaging and data visualization application that supports FITS images and binary tables, multiple frame buffers, region manipulation, and many scale algorithms and colormaps.

tclxml.c  (ds9.8.2):tclxml.c  (ds9.8.2.1)
skipping to change at line 1568 skipping to change at line 1568
*---------------------------------------------------------------------------- *----------------------------------------------------------------------------
*/ */
static int static int
TclXMLInstanceConfigure (interp, xmlinfo, objc, objv) TclXMLInstanceConfigure (interp, xmlinfo, objc, objv)
Tcl_Interp *interp; Tcl_Interp *interp;
TclXML_Info *xmlinfo; TclXML_Info *xmlinfo;
int objc; int objc;
Tcl_Obj *CONST objv[]; Tcl_Obj *CONST objv[];
{ {
int index, bool, doParse = 0, result; int index, boolv, doParse = 0, result;
TclXML_ParserClassInfo *classinfo = (TclXML_ParserClassInfo *) xmlinfo->parser Class; TclXML_ParserClassInfo *classinfo = (TclXML_ParserClassInfo *) xmlinfo->parser Class;
while (objc > 1) { while (objc > 1) {
/* /*
* Firstly, pass the option to the parser's own * Firstly, pass the option to the parser's own
* configuration management routine. * configuration management routine.
* It may pass back an error or break code to * It may pass back an error or break code to
* stop us from further processing the options. * stop us from further processing the options.
*/ */
skipping to change at line 1627 skipping to change at line 1627
Tcl_ResetResult (interp); Tcl_ResetResult (interp);
if (Tcl_GetIndexFromObj(interp, objv[0], instanceConfigureSwitches, if (Tcl_GetIndexFromObj(interp, objv[0], instanceConfigureSwitches,
"switch", 0, &index) != TCL_OK) { "switch", 0, &index) != TCL_OK) {
return TCL_ERROR; return TCL_ERROR;
} }
switch ((enum instanceConfigureSwitches) index) { switch ((enum instanceConfigureSwitches) index) {
case TCLXML_FINAL: /* -final */ case TCLXML_FINAL: /* -final */
if (Tcl_GetBooleanFromObj(interp, objv[1], &bool) != TCL_OK) { if (Tcl_GetBooleanFromObj(interp, objv[1], &boolv) != TCL_OK) {
return TCL_ERROR; return TCL_ERROR;
} }
if (bool && !xmlinfo->final) { if (boolv && !xmlinfo->final) {
doParse = 1; doParse = 1;
} else if (!bool && xmlinfo->final) { } else if (!boolv && xmlinfo->final) {
/* /*
* Reset the parser for new input * Reset the parser for new input
*/ */
TclXMLResetParser(interp, xmlinfo); TclXMLResetParser(interp, xmlinfo);
doParse = 0; doParse = 0;
} }
xmlinfo->final = bool; xmlinfo->final = boolv;
break; break;
case TCLXML_ENCODING: /* -encoding */ case TCLXML_ENCODING: /* -encoding */
if (xmlinfo->encoding) { if (xmlinfo->encoding) {
Tcl_DecrRefCount(xmlinfo->encoding); Tcl_DecrRefCount(xmlinfo->encoding);
} }
xmlinfo->encoding = objv[1]; xmlinfo->encoding = objv[1];
Tcl_IncrRefCount(xmlinfo->encoding); Tcl_IncrRefCount(xmlinfo->encoding);
break; break;
case TCLXML_VALIDATE: /* -validate */ case TCLXML_VALIDATE: /* -validate */
if (Tcl_GetBooleanFromObj(interp, objv[1], &bool) != TCL_OK) { if (Tcl_GetBooleanFromObj(interp, objv[1], &boolv) != TCL_OK) {
return TCL_ERROR; return TCL_ERROR;
} }
/* /*
* If the parser is in the middle of parsing a document, * If the parser is in the middle of parsing a document,
* this will be ignored. Perhaps an error should be returned? * this will be ignored. Perhaps an error should be returned?
*/ */
xmlinfo->validate = bool; xmlinfo->validate = boolv;
break; break;
case TCLXML_BASEURL: /* -baseurl, -baseuri */ case TCLXML_BASEURL: /* -baseurl, -baseuri */
case TCLXML_BASEURI: case TCLXML_BASEURI:
if (xmlinfo->base != NULL) { if (xmlinfo->base != NULL) {
Tcl_DecrRefCount(xmlinfo->base); Tcl_DecrRefCount(xmlinfo->base);
} }
xmlinfo->base = objv[1]; xmlinfo->base = objv[1];
Tcl_IncrRefCount(xmlinfo->base); Tcl_IncrRefCount(xmlinfo->base);
break; break;
case TCLXML_DEFAULTEXPANDINTERNALENTITIES: /* -defaultexpandinternalent ities */ case TCLXML_DEFAULTEXPANDINTERNALENTITIES: /* -defaultexpandinternalent ities */
/* ericm@scriptics */ /* ericm@scriptics */
if (Tcl_GetBooleanFromObj(interp, objv[1], &bool) != TCL_OK) { if (Tcl_GetBooleanFromObj(interp, objv[1], &boolv) != TCL_OK) {
return TCL_ERROR; return TCL_ERROR;
} }
xmlinfo->expandinternalentities = bool; xmlinfo->expandinternalentities = boolv;
break; break;
case TCLXML_PARAMENTITYPARSING: case TCLXML_PARAMENTITYPARSING:
/* ericm@scriptics */ /* ericm@scriptics */
case TCLXML_NOWHITESPACE: case TCLXML_NOWHITESPACE:
case TCLXML_REPORTEMPTY: case TCLXML_REPORTEMPTY:
/* /*
* All of these get passed through to the instance's * All of these get passed through to the instance's
* configure procedure. * configure procedure.
*/ */
 End of changes. 9 change blocks. 
9 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)