Update r2 and fix for r_bin_file_hash() changes (#1143)

This commit is contained in:
Florian Märkl 2019-01-24 23:29:56 +01:00 committed by xarkes
parent 43363f25e6
commit 758173e55b
3 changed files with 12 additions and 2 deletions

@ -1 +1 @@
Subproject commit 2032399ca89bda5539af120ee201f77b4564c1ba
Subproject commit b022c9533482a8f1c9ae825ced5c1a3e251837d9

View File

@ -374,7 +374,9 @@ bool CutterCore::loadFile(QString path, ut64 baddr, ut64 mapaddr, int perms, int
r_core_cmd0 (core_, "omfg+w");
}
r_core_hash_load(core_, path.toUtf8().constData());
ut64 hashLimit = getConfigut64("cfg.hashlimit");
r_bin_file_hash(core_->bin, hashLimit, path.toUtf8().constData());
fflush(stdout);
return true;
}
@ -640,6 +642,12 @@ int CutterCore::getConfigi(const char *k)
return static_cast<int>(r_config_get_i(core_->config, k));
}
ut64 CutterCore::getConfigut64(const char *k)
{
CORE_LOCK();
return r_config_get_i(core_->config, k);
}
bool CutterCore::getConfigb(const char *k)
{
CORE_LOCK();

View File

@ -492,6 +492,8 @@ public:
void setConfig(const QString &k, const QVariant &v) { setConfig(k.toUtf8().constData(), v); }
int getConfigi(const char *k);
int getConfigi(const QString &k) { return getConfigi(k.toUtf8().constData()); }
ut64 getConfigut64(const char *k);
ut64 getConfigut64(const QString &k) { return getConfigut64(k.toUtf8().constData()); }
bool getConfigb(const char *k);
bool getConfigb(const QString &k) { return getConfigb(k.toUtf8().constData()); }
QString getConfig(const char *k);