debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docbook/instant: fix a few more issues

Browse Source
This commit is contained in:
Jon Trulson
2018-09-19 11:28:48 -06:00
parent 776e031b60
commit 7712950fb7
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cde/programs/dtdocbook/doc2sdl/docbook.tcl
View File

@@ -1624,10 +1624,12 @@ proc EndPart {} {
# check that all the glossed terms have been defined # check that all the glossed terms have been defined
foreach name [array names currentGlossArray] { foreach name [array names currentGlossArray] {
if {[lindex $currentGlossArray($name) 1] != "defined"} { if {[info exists currentGlossArray($name)]} {
set glossString [lindex $currentGlossArray($name) 2] if {[lindex $currentGlossArray($name) 1] != "defined"} {
UserError "No glossary definition for \"$glossString\"" no set glossString [lindex $currentGlossArray($name) 2]
} UserError "No glossary definition for \"$glossString\"" no
}
}
} }
# delete this glossary array # delete this glossary array

5
cde/programs/dtdocbook/instant/main.c
View File

@@ -376,7 +376,7 @@ static int DefaultOutputString(ClientData clientData,
pArgv = argv[1]; pArgv = argv[1];
stringLength = (2 * strlen(pArgv)) + 3; stringLength = (2 * strlen(pArgv)) + 3;
string = malloc(stringLength); string = Tcl_Alloc(stringLength);
memset(string, 0, stringLength); memset(string, 0, stringLength);
pString = string; pString = string;
@@ -403,8 +403,7 @@ static int DefaultOutputString(ClientData clientData,
/* put the string to the output */ /* put the string to the output */
retCode = Tcl_VarEval(interpreter, "puts -nonewline ", string, 0); retCode = Tcl_VarEval(interpreter, "puts -nonewline ", string, 0);
Tcl_Free(string);
free(string);
/* and ripple up any error code we got from the "puts" */ /* and ripple up any error code we got from the "puts" */
return retCode; return retCode;