dthelp: compiler warning and coverity warning fixes

This commit is contained in:
Peter Howkins
2018-03-29 00:21:44 +01:00
parent 50a96959f0
commit e12e009eb5
14 changed files with 68 additions and 34 deletions

View File

@@ -24,6 +24,8 @@
/* Copyright (c) 1986, 1987, 1988, 1989 Hewlett-Packard Co. */
/* Miscellaneous Procedures for HP Tag/TeX translator */
#include <stdint.h>
#include "userinc.h"
#include "globdec.h"
@@ -306,7 +308,7 @@ while (TRUE)
node[n] = current->next;
if (! id[n])
{
if ((int) current->data >= 0)
if ((intptr_t) current->data >= 0)
m_err1("No glossary definition for %s", id);
current = current->next;
while (! current)
@@ -1612,6 +1614,8 @@ else
}
_DtLcxCloseDb(&myDb);
free(charset);
free(lang);
}
@@ -2192,13 +2196,13 @@ if (vgloss(gloss) == GLOSS)
*(termp-1) = M_EOS;
}
idn = (int) m_lookfortrie(base ? base : dterm, &gtree);
idn = (intptr_t) m_lookfortrie(base ? base : dterm, &gtree);
if (idn < 0)
idn = -idn;
if (!idn)
{
idn = NextId();
m_ntrtrie(base ? base : dterm, &gtree, (void *) idn);
m_ntrtrie(base ? base : dterm, &gtree, (void *) (intptr_t) idn);
}
}

View File

@@ -155,7 +155,10 @@ strcpy(helpext, ".xrh");
tex = fopen(helpbase, "w");
fprintf(tex, "\\gobble\001%s\002%%\n", m_signon);
fputs("% Generated Cross-Reference Macros (for a particular document)\n", tex);
if (! xtree.data) return;
if (! xtree.data) {
fclose(tex);
return;
}
n = 0;
current = xtree.data;