diff options
| author | jade <lix@jade.fyi> | 2024-08-08 22:43:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-08-08 22:43:10 +0000 |
| commit | 757041c3e74787c755b3de826078968119f706d6 (patch) | |
| tree | 9f3ea456c45130fb3a0910f9a9be9f60a74577cc /src/libcmd | |
| parent | e03cd8b3a6f70c60f359fd683c2b25f8eba4da0d (diff) | |
| parent | 4ed8461cacced97717bf9a7525e12ba69fe168c0 (diff) | |
Merge changes I526cceed,Ia4e2f1fa,I22e66972,I9fbd55a9,Ifca22e44 into main
* changes:
sqlite: add a Use::fromStrNullable
util: implement charptr_cast
tree-wide: fix a pile of lints
refactor: make HashType and Base enum classes for type safety
build: integrate clang-tidy into CI
Diffstat (limited to 'src/libcmd')
| -rw-r--r-- | src/libcmd/cmd-profiles.cc | 2 | ||||
| -rw-r--r-- | src/libcmd/repl-interacter.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcmd/cmd-profiles.cc b/src/libcmd/cmd-profiles.cc index 8a04100f6..cfce4789e 100644 --- a/src/libcmd/cmd-profiles.cc +++ b/src/libcmd/cmd-profiles.cc @@ -246,7 +246,7 @@ StorePath ProfileManifest::build(ref<Store> store) StringSink sink; sink << dumpPath(tempDir); - auto narHash = hashString(htSHA256, sink.s); + auto narHash = hashString(HashType::SHA256, sink.s); ValidPathInfo info{ *store, diff --git a/src/libcmd/repl-interacter.cc b/src/libcmd/repl-interacter.cc index 0cf4e34b8..6979e3db4 100644 --- a/src/libcmd/repl-interacter.cc +++ b/src/libcmd/repl-interacter.cc @@ -96,7 +96,7 @@ static int listPossibleCallback(char * s, char *** avp) return p; }; - vp = check((char **) malloc(possible.size() * sizeof(char *))); + vp = check(static_cast<char **>(malloc(possible.size() * sizeof(char *)))); for (auto & p : possible) vp[ac++] = check(strdup(p.c_str())); |