From f55c7feee7f5e8ed503a976919932c171f5b77e4 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Wed, 13 Mar 2019 22:19:15 +0100 Subject: [PATCH] Constify some functions --- lib/pki_base.cpp | 7 ++++--- lib/pki_base.h | 7 ++++--- lib/pki_key.cpp | 4 ++-- lib/pki_key.h | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/pki_base.cpp b/lib/pki_base.cpp index 03564cfc..dee38883 100644 --- a/lib/pki_base.cpp +++ b/lib/pki_base.cpp @@ -97,14 +97,15 @@ const char *pki_base::getClassName() const return typeid(*this).name(); } -void pki_base::fopen_error(const QString fname) +void pki_base::fopen_error(const QString &fname) const { my_error(tr("Error opening file: '%1': %2"). arg(fname). arg(strerror(errno))); } -void pki_base::fwrite_ba(FILE *fp, QByteArray ba, QString fname) +void pki_base::fwrite_ba(FILE *fp, const QByteArray &ba, + const QString &fname) const { if (fwrite(ba.constData(), 1, ba.size(), fp) != (size_t)ba.size()) { my_error(tr("Error writing to file: '%1': %2"). @@ -113,7 +114,7 @@ void pki_base::fwrite_ba(FILE *fp, QByteArray ba, QString fname) } } -void pki_base::my_error(const QString error) const +void pki_base::my_error(const QString &error) const { if (!error.isEmpty()) { qCritical() << "Error:" << error; diff --git a/lib/pki_base.h b/lib/pki_base.h index c4057461..7b2cdda1 100644 --- a/lib/pki_base.h +++ b/lib/pki_base.h @@ -59,8 +59,8 @@ class pki_base : public QObject enum pki_type pkiType; /* model data */ pki_base *parent; - void my_error(const QString myerr) const; - void fopen_error(const QString fname); + void my_error(const QString &error) const; + void fopen_error(const QString &fname) const; public: enum msg_type { @@ -139,7 +139,8 @@ class pki_base : public QObject virtual BIO *pem(BIO *, int format=0); virtual void fromPEM_BIO(BIO *, QString); virtual void fromPEMbyteArray(QByteArray &, QString); - void fwrite_ba(FILE *fp, QByteArray ba, QString fname); + void fwrite_ba(FILE *fp, const QByteArray &ba, + const QString &fname) const; virtual void fload(const QString); virtual void writeDefault(const QString); diff --git a/lib/pki_key.cpp b/lib/pki_key.cpp index 290deb20..61ab340a 100644 --- a/lib/pki_key.cpp +++ b/lib/pki_key.cpp @@ -732,7 +732,7 @@ QByteArray pki_key::SSH2publicQByteArray(bool raw) const return txt + "\n"; } -void pki_key::writeSSH2public(QString fname) +void pki_key::writeSSH2public(const QString &fname) const { QFile f(fname); @@ -781,7 +781,7 @@ bool pki_key::verify_priv(EVP_PKEY *) const return true; } -QString pki_key::fingerprint(const QString format) +QString pki_key::fingerprint(const QString &format) const { const EVP_MD *md; QByteArray data; diff --git a/lib/pki_key.h b/lib/pki_key.h index 5bd2d443..9db0574a 100644 --- a/lib/pki_key.h +++ b/lib/pki_key.h @@ -97,8 +97,8 @@ class pki_key: public pki_base void d2i_old(QByteArray &ba, int type); QByteArray i2d() const; EVP_PKEY *load_ssh2_key(FILE *fp); - void writeSSH2public(QString fname); - QString fingerprint(const QString format); + void writeSSH2public(const QString &fname) const; + QString fingerprint(const QString &format) const; bool SSH2_compatible() const; void resetUcount() {