tree-wide: automated migration to charptr_cast

The lint did it :3

Change-Id: I2d9f276b01ebbf14101de4257ea13e44ff6fe0a0
This commit is contained in:
jade 2024-08-04 22:03:35 -07:00
parent c1291fd102
commit a85c4ce535
7 changed files with 20 additions and 13 deletions

View file

@ -1,3 +1,4 @@
#include "charptr-cast.hh"
#include "machines.hh" #include "machines.hh"
#include "worker.hh" #include "worker.hh"
#include "substitution-goal.hh" #include "substitution-goal.hh"
@ -529,7 +530,7 @@ void Worker::waitForInput()
} else { } else {
printMsg(lvlVomit, "%1%: read %2% bytes", printMsg(lvlVomit, "%1%: read %2% bytes",
goal->getName(), rd); goal->getName(), rd);
std::string_view data(reinterpret_cast<char *>(buffer.data()), rd); std::string_view data(charptr_cast<char *>(buffer.data()), rd);
j->lastOutput = after; j->lastOutput = after;
handleWorkResult(goal, goal->handleChildOutput(k, data)); handleWorkResult(goal, goal->handleChildOutput(k, data));
} }

View file

@ -1,3 +1,4 @@
#include "charptr-cast.hh"
#include "crypto.hh" #include "crypto.hh"
#include "file-system.hh" #include "file-system.hh"
#include "globals.hh" #include "globals.hh"
@ -44,15 +45,15 @@ std::string SecretKey::signDetached(std::string_view data) const
{ {
unsigned char sig[crypto_sign_BYTES]; unsigned char sig[crypto_sign_BYTES];
unsigned long long sigLen; unsigned long long sigLen;
crypto_sign_detached(sig, &sigLen, reinterpret_cast<const unsigned char *>(data.data()), data.size(), crypto_sign_detached(sig, &sigLen, charptr_cast<const unsigned char *>(data.data()), data.size(),
reinterpret_cast<const unsigned char *>(key.data())); charptr_cast<const unsigned char *>(key.data()));
return name + ":" + base64Encode(std::string(reinterpret_cast<char *>(sig), sigLen)); return name + ":" + base64Encode(std::string(reinterpret_cast<char *>(sig), sigLen));
} }
PublicKey SecretKey::toPublicKey() const PublicKey SecretKey::toPublicKey() const
{ {
unsigned char pk[crypto_sign_PUBLICKEYBYTES]; unsigned char pk[crypto_sign_PUBLICKEYBYTES];
crypto_sign_ed25519_sk_to_pk(pk, reinterpret_cast<const unsigned char *>(key.data())); crypto_sign_ed25519_sk_to_pk(pk, charptr_cast<const unsigned char *>(key.data()));
return PublicKey(name, std::string(reinterpret_cast<char *>(pk), crypto_sign_PUBLICKEYBYTES)); return PublicKey(name, std::string(reinterpret_cast<char *>(pk), crypto_sign_PUBLICKEYBYTES));
} }
@ -85,9 +86,9 @@ bool verifyDetached(const std::string & data, const std::string & sig,
if (sig2.size() != crypto_sign_BYTES) if (sig2.size() != crypto_sign_BYTES)
throw Error("signature is not valid"); throw Error("signature is not valid");
return crypto_sign_verify_detached(reinterpret_cast<unsigned char *>(sig2.data()), return crypto_sign_verify_detached(charptr_cast<unsigned char *>(sig2.data()),
reinterpret_cast<const unsigned char *>(data.data()), data.size(), charptr_cast<const unsigned char *>(data.data()), data.size(),
reinterpret_cast<const unsigned char *>(key->second.key.data())) == 0; charptr_cast<const unsigned char *>(key->second.key.data())) == 0;
} }
PublicKeys getDefaultPublicKeys() PublicKeys getDefaultPublicKeys()

View file

@ -1,3 +1,4 @@
#include "charptr-cast.hh"
#include "sqlite.hh" #include "sqlite.hh"
#include "globals.hh" #include "globals.hh"
#include "logging.hh" #include "logging.hh"
@ -201,7 +202,7 @@ bool SQLiteStmt::Use::next()
std::optional<std::string> SQLiteStmt::Use::getStrNullable(int col) std::optional<std::string> SQLiteStmt::Use::getStrNullable(int col)
{ {
auto s = reinterpret_cast<const char *>(sqlite3_column_text(stmt, col)); auto s = charptr_cast<const char *>(sqlite3_column_text(stmt, col));
return s != nullptr ? std::make_optional<std::string>((s)) : std::nullopt; return s != nullptr ? std::make_optional<std::string>((s)) : std::nullopt;
} }

View file

@ -134,6 +134,7 @@ template<typename To, typename From>
requires charptr_cast_detail::IsCharCastable<From, To> requires charptr_cast_detail::IsCharCastable<From, To>
inline To charptr_cast(From p) inline To charptr_cast(From p)
{ {
// NOLINTNEXTLINE(lix-charptrcast): stop the linter ever getting too clever and causing funny recursion
return reinterpret_cast<To>(p); return reinterpret_cast<To>(p);
} }

View file

@ -1,3 +1,4 @@
#include "charptr-cast.hh"
#include "compression.hh" #include "compression.hh"
#include "tarfile.hh" #include "tarfile.hh"
#include "signals.hh" #include "signals.hh"
@ -160,7 +161,7 @@ struct BrotliDecompressionSource : Source
size_t read(char * data, size_t len) override size_t read(char * data, size_t len) override
{ {
uint8_t * out = reinterpret_cast<uint8_t *>(data); uint8_t * out = charptr_cast<uint8_t *>(data);
const auto * begin = out; const auto * begin = out;
while (len && !BrotliDecoderIsFinished(state.get())) { while (len && !BrotliDecoderIsFinished(state.get())) {
@ -172,7 +173,7 @@ struct BrotliDecompressionSource : Source
} catch (EndOfFile &) { } catch (EndOfFile &) {
break; break;
} }
next_in = reinterpret_cast<const uint8_t *>(buf.get()); next_in = charptr_cast<const uint8_t *>(buf.get());
} }
if (!BrotliDecoderDecompressStream( if (!BrotliDecoderDecompressStream(
@ -238,7 +239,7 @@ struct BrotliCompressionSink : ChunkedCompressionSink
void writeInternal(std::string_view data) override void writeInternal(std::string_view data) override
{ {
auto next_in = reinterpret_cast<const uint8_t *>(data.data()); auto next_in = charptr_cast<const uint8_t *>(data.data());
size_t avail_in = data.size(); size_t avail_in = data.size();
uint8_t * next_out = outbuf; uint8_t * next_out = outbuf;
size_t avail_out = sizeof(outbuf); size_t avail_out = sizeof(outbuf);

View file

@ -1,3 +1,4 @@
#include "charptr-cast.hh"
#include "file-system.hh" #include "file-system.hh"
#include "finally.hh" #include "finally.hh"
#include "logging.hh" #include "logging.hh"
@ -115,7 +116,7 @@ Generator<Bytes> drainFDSource(int fd, bool block)
throw SysError("reading from file"); throw SysError("reading from file");
} }
else if (rd == 0) break; else if (rd == 0) break;
else co_yield std::span{reinterpret_cast<char *>(buf.data()), (size_t) rd}; else co_yield std::span{charptr_cast<char *>(buf.data()), (size_t) rd};
} }
} }

View file

@ -1,6 +1,7 @@
#include <archive.h> #include <archive.h>
#include <archive_entry.h> #include <archive_entry.h>
#include "charptr-cast.hh"
#include "file-system.hh" #include "file-system.hh"
#include "logging.hh" #include "logging.hh"
#include "serialise.hh" #include "serialise.hh"
@ -19,7 +20,7 @@ static ssize_t callback_read(struct archive * archive, void * _self, const void
*buffer = self->buffer.data(); *buffer = self->buffer.data();
try { try {
return self->source->read(reinterpret_cast<char *>(self->buffer.data()), self->buffer.size()); return self->source->read(charptr_cast<char *>(self->buffer.data()), self->buffer.size());
} catch (EndOfFile &) { } catch (EndOfFile &) {
return 0; return 0;
} catch (std::exception & err) { } catch (std::exception & err) {