forward porting part 1

This commit is contained in:
Richard Holland
2022-01-11 13:33:23 +00:00
parent 3697f7b69c
commit ec22906e78
6 changed files with 26 additions and 27 deletions

View File

@@ -1210,8 +1210,7 @@ SetHook::destroyNamespace(
dirKeylet.key,
sleDirNode,
uDirEntry,
dirEntry,
ctx.j)) {
dirEntry)) {
JLOG(ctx.j.fatal())
<< "HookSet[" << HS_ACC() << "]: DeleteState "
<< "account directory missing " << account;
@@ -1252,8 +1251,7 @@ SetHook::destroyNamespace(
}
} while (cdirNext(
view, dirKeylet.key, sleDirNode, uDirEntry, dirEntry, ctx.j));
} while (cdirNext(view, dirKeylet.key, sleDirNode, uDirEntry, dirEntry));
return tesSUCCESS;
}
@@ -1290,13 +1288,10 @@ SetHook::destroyNamespace(
if (!newDirSLE)\
{\
newDirSLE = std::make_shared<SLE>(*newDirKeylet);\
auto const page = dirAdd(\
view(),\
auto const page = view().dirInsert(\
ownerDirKeylet,\
newDirKeylet->key,\
false,\
describeOwnerDir(account_),\
ctx.j);\
describeOwnerDir(account_));\
JLOG(ctx.j.trace()) << "Create state dir for account " << toBase58(account_)\
<< ": " << (page ? "success" : "failure");\
if (!page)\