Skip to content

Commit ec72810

Browse files
committed
fixup! nvm: add NVM checked ops policy helper
1 parent 8eafa25 commit ec72810

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

src/wh_nvm.c

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -57,40 +57,40 @@ static int wh_Nvm_CheckPolicy(whNvmContext* context, whNvmOp op, whNvmId id,
5757
}
5858

5959
switch (op) {
60-
case WH_NVM_OP_ADD:
61-
if (ret == WH_ERROR_OK) {
62-
if (meta.flags & WH_NVM_FLAGS_NONMODIFIABLE) {
63-
return WH_ERROR_ACCESS;
60+
case WH_NVM_OP_ADD:
61+
if (ret == WH_ERROR_OK) {
62+
if (meta.flags & WH_NVM_FLAGS_NONMODIFIABLE) {
63+
return WH_ERROR_ACCESS;
64+
}
6465
}
65-
}
66-
else if (ret != WH_ERROR_NOTFOUND) {
67-
return ret;
68-
}
69-
break;
66+
else if (ret != WH_ERROR_NOTFOUND) {
67+
return ret;
68+
}
69+
break;
70+
71+
case WH_NVM_OP_DESTROY:
72+
if (ret == WH_ERROR_OK) {
73+
if (meta.flags & (WH_NVM_FLAGS_NONMODIFIABLE |
74+
WH_NVM_FLAGS_NONDESTROYABLE)) {
75+
return WH_ERROR_ACCESS;
76+
}
77+
}
78+
else if (ret != WH_ERROR_NOTFOUND) {
79+
return ret;
80+
}
81+
break;
7082

71-
case WH_NVM_OP_DESTROY:
72-
if (ret == WH_ERROR_OK) {
73-
if (meta.flags & (WH_NVM_FLAGS_NONMODIFIABLE |
74-
WH_NVM_FLAGS_NONDESTROYABLE)) {
83+
case WH_NVM_OP_READ:
84+
if (ret != WH_ERROR_OK) {
85+
return ret;
86+
}
87+
if (meta.flags & WH_NVM_FLAGS_NONEXPORTABLE) {
7588
return WH_ERROR_ACCESS;
7689
}
77-
}
78-
else if (ret != WH_ERROR_NOTFOUND) {
79-
return ret;
80-
}
81-
break;
82-
83-
case WH_NVM_OP_READ:
84-
if (ret != WH_ERROR_OK) {
85-
return ret;
86-
}
87-
if (meta.flags & WH_NVM_FLAGS_NONEXPORTABLE) {
88-
return WH_ERROR_ACCESS;
89-
}
90-
break;
90+
break;
9191

92-
default:
93-
return WH_ERROR_BADARGS;
92+
default:
93+
return WH_ERROR_BADARGS;
9494
}
9595

9696
return WH_ERROR_OK;

0 commit comments

Comments
 (0)