Skip to content

Commit 567537d

Browse files
committed
Remove Vestigial + cxx 20 fix
1 parent 170d446 commit 567537d

File tree

6 files changed

+14
-19
lines changed

6 files changed

+14
-19
lines changed

view/kernelcache/HeadlessPlugin.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#ifdef __cplusplus
66
extern "C" {
77
#endif
8-
// extern void RegisterSharedCacheWorkflow();
98
#ifdef __cplusplus
109
}
1110
#endif

view/kernelcache/core/KernelCacheController.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ DECLARE_KC_API_OBJECT(BNKernelCacheController, KernelCacheController);
1212
void RegisterKernelCacheControllerDestructor();
1313

1414
namespace BinaryNinja::KC {
15-
static const char* METADATA_KEY = "kernel_cache";
16-
static const char* OLD_METADATA_KEY_COUNT = "KERNELCACHE-ModifiedState-Count";
17-
static const char* OLD_METADATA_KEY_PREFIX = "KERNELCACHE-ModifiedState-";
18-
1915
// Represents the view state for a given `DSCache`
2016
class KernelCacheController : public KCRefCountObject
2117
{
@@ -50,4 +46,4 @@ namespace BinaryNinja::KC {
5046

5147
bool IsImageLoaded(const CacheImage& image);
5248
};
53-
} // namespace BinaryNinja::DSC
49+
} // namespace BinaryNinja::KC

view/kernelcache/core/KernelCacheView.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Created by kat on 5/23/23.
33
//
44

5-
#ifndef SHAREDCACHE_DSCVIEW_H
6-
#define SHAREDCACHE_DSCVIEW_H
5+
#ifndef KERNELCACHE_KERNELCACHEVIEW_H
6+
#define KERNELCACHE_KERNELCACHEVIEW_H
77

88
#include <binaryninjaapi.h>
99

@@ -60,4 +60,4 @@ class KernelCacheViewType : public BinaryNinja::BinaryViewType
6060
};
6161

6262

63-
#endif // SHAREDCACHE_DSCVIEW_H
63+
#endif // KERNELCACHE_KERNELCACHEVIEW_H

view/kernelcache/core/MachO.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ std::vector<CacheSymbol> KernelCacheMachOHeader::ReadSymbolTable(Ref<BinaryView>
459459
nlist_64 nlist = {};
460460
if (bv->GetAddressSize() == 4)
461461
{
462-
// 32-bit DSC
462+
// 32-bit KC
463463
struct nlist nlist32 = {};
464464
reader.Seek(symbolInfo.address + (entryIndex * sizeof(nlist32)));
465465
reader.Read(&nlist, sizeof(nlist32));
@@ -471,7 +471,7 @@ std::vector<CacheSymbol> KernelCacheMachOHeader::ReadSymbolTable(Ref<BinaryView>
471471
}
472472
else
473473
{
474-
// 64-bit DSC
474+
// 64-bit KC
475475
reader.Seek(symbolInfo.address + (entryIndex * sizeof(nlist)));
476476
reader.Read(&nlist, sizeof(nlist));
477477
}

view/kernelcache/core/refcountobject.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ namespace BinaryNinja::KC {
5858
#endif
5959

6060
public:
61-
KCRef<T>() : m_obj(NULL) {}
61+
KCRef() : m_obj(NULL) {}
6262

63-
KCRef<T>(T* obj) : m_obj(obj)
63+
KCRef(T* obj) : m_obj(obj)
6464
{
6565
if (m_obj)
6666
{
@@ -71,7 +71,7 @@ namespace BinaryNinja::KC {
7171
}
7272
}
7373

74-
KCRef<T>(const KCRef<T>& obj) : m_obj(obj.m_obj)
74+
KCRef(const KCRef& obj) : m_obj(obj.m_obj)
7575
{
7676
if (m_obj)
7777
{
@@ -82,7 +82,7 @@ namespace BinaryNinja::KC {
8282
}
8383
}
8484

85-
~KCRef<T>()
85+
~KCRef()
8686
{
8787
if (m_obj)
8888
{
@@ -94,7 +94,7 @@ namespace BinaryNinja::KC {
9494
}
9595

9696
// move constructor
97-
KCRef<T>(KCRef<T>&& other) : m_obj(other.m_obj)
97+
KCRef(KCRef&& other) : m_obj(other.m_obj)
9898
{
9999
other.m_obj = 0;
100100
#ifdef BN_REF_COUNT_DEBUG

view/kernelcache/ui/symboltable.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <QStandardItemModel>
88
#include "filter.h"
99

10-
#ifndef BINARYNINJA_DSCSYMBOLTABLE_H
11-
#define BINARYNINJA_DSCSYMBOLTABLE_H
10+
#ifndef BINARYNINJA_KCSYMBOLTABLE_H
11+
#define BINARYNINJA_KCSYMBOLTABLE_H
1212

1313
class SymbolTableView;
1414

@@ -99,4 +99,4 @@ Q_OBJECT
9999
};
100100

101101

102-
#endif // BINARYNINJA_DSCSYMBOLTABLE_H
102+
#endif // BINARYNINJA_KCSYMBOLTABLE_H

0 commit comments

Comments
 (0)