1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00

Merge pull request #12857 from NixOS/mergify/bp/2.28-maintenance/pr-12765

Add various clang tidy fixes (backport #12765)
This commit is contained in:
mergify[bot] 2025-04-01 15:31:30 +00:00 committed by GitHub
commit b38fee24d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 5 additions and 3 deletions

View file

@ -1025,6 +1025,7 @@ void processConnection(
{
#ifndef _WIN32 // TODO need graceful async exit support on Windows?
auto monitor = !recursive ? std::make_unique<MonitorFdHup>(from.fd) : nullptr;
(void) monitor; // suppress warning
#endif
/* Exchange the greeting. */

View file

@ -249,7 +249,7 @@ LocalStore::LocalStore(
else if (curSchema == 0) { /* new store */
curSchema = nixSchemaVersion;
openDB(*state, true);
writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
writeFile(schemaPath, fmt("%1%", curSchema), 0666, true);
}
else if (curSchema < nixSchemaVersion) {

View file

@ -33,7 +33,7 @@ std::optional<Mode> decodeMode(RawMode m) {
static std::string getStringUntil(Source & source, char byte)
{
std::string s;
char n[1];
char n[1] = { 0 };
source(std::string_view { n, 1 });
while (*n != byte) {
s += *n;