Merge branch 'master' into magic-8.2
This commit is contained in:
commit
d63ce36cbd
|
|
@ -296,6 +296,7 @@ DBTreeFindUse(name, use, scx)
|
||||||
if ((def->cd_flags & CDAVAILABLE) == 0)
|
if ((def->cd_flags & CDAVAILABLE) == 0)
|
||||||
(void) DBCellRead(def, (char *) NULL, TRUE, NULL);
|
(void) DBCellRead(def, (char *) NULL, TRUE, NULL);
|
||||||
|
|
||||||
|
cp = name;
|
||||||
he = HashLookOnly(&def->cd_idHash, name);
|
he = HashLookOnly(&def->cd_idHash, name);
|
||||||
if (he == NULL || HashGetValue(he) == NULL)
|
if (he == NULL || HashGetValue(he) == NULL)
|
||||||
{
|
{
|
||||||
|
|
@ -306,7 +307,7 @@ DBTreeFindUse(name, use, scx)
|
||||||
* array components that are expected, not array components
|
* array components that are expected, not array components
|
||||||
* embedded in the name.
|
* embedded in the name.
|
||||||
*/
|
*/
|
||||||
for (cp = name; *cp && *cp != '[' && *cp != '/'; cp++)
|
for (; *cp && *cp != '[' && *cp != '/'; cp++)
|
||||||
/* Nothing */;
|
/* Nothing */;
|
||||||
csave = *cp;
|
csave = *cp;
|
||||||
*cp = '\0';
|
*cp = '\0';
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue