Remove those pesky warnings

Author: hiimjasmine00

scripts/ghidra/FindCreatesScript.java

@@ -7,18 +7,18 @@
 import ghidra.program.model.listing.FunctionIterator;
 import ghidra.program.model.listing.FunctionManager;
 import ghidra.program.model.address.Address;
-import ghidra.program.model.address.AddressFactory;
+//import ghidra.program.model.address.AddressFactory;
 import ghidra.program.model.symbol.Reference;
 import ghidra.program.model.symbol.SourceType;
 import ghidra.program.model.listing.Instruction;
 import ghidra.program.model.listing.InstructionIterator;
-import ghidra.program.model.symbol.Symbol;
-import ghidra.program.model.symbol.SymbolIterator;
-import ghidra.program.model.symbol.ExternalLocation;
-import ghidra.program.database.function.FunctionDB;
-import ghidra.program.model.data.DataType;
-import ghidra.program.model.data.DataTypeManager;
-import ghidra.program.model.data.Structure;
+//import ghidra.program.model.symbol.Symbol;
+//import ghidra.program.model.symbol.SymbolIterator;
+//import ghidra.program.model.symbol.ExternalLocation;
+//import ghidra.program.database.function.FunctionDB;
+//import ghidra.program.model.data.DataType;
+//import ghidra.program.model.data.DataTypeManager;
+//import ghidra.program.model.data.Structure;
 
 public class FindCreatesScript extends GhidraScript {
     FunctionManager functionManager = null;
@@ -135,7 +135,7 @@ public boolean isFuncInit2(Function func) {
 
                 Address calledFunctionAddress = operandReferences[0].getToAddress();
 
-                Symbol symbol = getSymbolAt(calledFunctionAddress);
+                //Symbol symbol = getSymbolAt(calledFunctionAddress);
 
                 /*if (symbol != null && symbol.isExternal()) {
                     
@@ -220,7 +220,7 @@ public void findInits() throws Exception {
                 if(size > 500) continue; //likely a ccdict create
 
                 InstructionIterator instructionIterator = currentProgram.getListing().getInstructions(func.getBody(), true);
-                Function beforeLastFunction = null;
+                //Function beforeLastFunction = null;
                 Function lastFunction = null;
                 Instruction lastInstruction = null;
 
@@ -256,7 +256,7 @@ public void findInits() throws Exception {
                         Function calledFunction = functionManager.getFunctionAt(calledFunctionAddress);
                         if (calledFunction != null) {
                             //println("Called Function: " + calledFunction.getName());
-                            beforeLastFunction = lastFunction;
+                            //beforeLastFunction = lastFunction;
                             lastFunction = calledFunction;
                         } else {
                             lastFunction = null;

scripts/ghidra/FindVtablesScript.java

@@ -3,9 +3,8 @@
 // @category GeodeSDK
 
 import java.util.HashMap;
+import java.util.List;
 
-import ghidra.program.model.symbol.Namespace;
-import ghidra.program.model.listing.GhidraClass;
 import ghidra.app.util.NamespaceUtils;
 import ghidra.app.script.GhidraScript;
 import ghidra.app.util.demangler.DemanglerUtil;
@@ -16,7 +15,6 @@
 import ghidra.program.model.mem.MemoryAccessException;
 import ghidra.util.exception.InvalidInputException;
 import ghidra.program.model.symbol.Symbol;
-import ghidra.program.model.symbol.SourceType;
 
 public class FindVtablesScript extends GhidraScript {
     HashMap<Long, String> typeinfoNames = new HashMap<Long, String>();
@@ -104,7 +102,6 @@ private void populateTypeinfos() {
             try {
                 // get the pointer value
                 long offset = getLong(addr);
-                Address tiNamePtr = toAddr(offset);
                 if (!typeinfoNames.containsKey(offset)) continue;
 
                 typeinfos.put(addr.getOffset() - 8, typeinfoNames.get(offset));
@@ -124,7 +121,6 @@ private void populateVtables() {
             try {
                 // get the pointer value
                 long offset = getLong(addr);
-                Address tiPtr = toAddr(offset);
                 if (!typeinfos.containsKey(offset)) continue;
 
                 Address firstFunc = toAddr(getLong(addr.add(8)));
@@ -149,9 +145,9 @@ private void createLabels() {
         // create the vtables
         for (Long offset : vtables.keySet()) {
             String name = vtables.get(offset);
-            DemangledObject demangled = DemanglerUtil.demangle("_ZTV" + name);
+            List<DemangledObject> demangled = DemanglerUtil.demangle(currentProgram, "_ZTV" + name, null);
             try {
-                demangled.applyTo(currentProgram, toAddr(offset), new DemanglerOptions(), monitor);
+                demangled.get(0).applyTo(currentProgram, toAddr(offset), new DemanglerOptions(), monitor);
             }
             catch (Exception e) {
                 continue;
@@ -161,9 +157,9 @@ private void createLabels() {
         // create the typeinfos
         for (Long offset : typeinfos.keySet()) {
             String name = typeinfos.get(offset);
-            DemangledObject demangled = DemanglerUtil.demangle("_ZTI" + name);
+            List<DemangledObject> demangled = DemanglerUtil.demangle(currentProgram, "_ZTI" + name, null);
             try {
-                demangled.applyTo(currentProgram, toAddr(offset), new DemanglerOptions(), monitor);
+                demangled.get(0).applyTo(currentProgram, toAddr(offset), new DemanglerOptions(), monitor);
             }
             catch (Exception e) {
                 continue;
@@ -173,9 +169,9 @@ private void createLabels() {
         // create the typeinfo names
         for (Long offset : typeinfoNames.keySet()) {
             String name = typeinfoNames.get(offset);
-            DemangledObject demangled = DemanglerUtil.demangle("_ZTS" + name);
+            List<DemangledObject> demangled = DemanglerUtil.demangle(currentProgram, "_ZTS" + name, null);
             try {
-                demangled.applyTo(currentProgram, toAddr(offset), new DemanglerOptions(), monitor);
+                demangled.get(0).applyTo(currentProgram, toAddr(offset), new DemanglerOptions(), monitor);
             }
             catch (Exception e) {
                 continue;