diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java index 0c102676b1..7b6698d6c9 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java @@ -498,7 +498,7 @@ public enum VariableValueUtils { } /** - * Find the fuction's variable whose storage contains the given stack offset + * Find the function's variable whose storage contains the given stack offset * * @param function the function * @param stackAddress the stack offset diff --git a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/ElasticDatabase.java b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/ElasticDatabase.java index 5a2810c2c4..3fbcfe89ae 100755 --- a/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/ElasticDatabase.java +++ b/Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/elastic/ElasticDatabase.java @@ -3527,7 +3527,7 @@ public class ElasticDatabase implements FunctionDatabase { /** * Entry point for Elasticsearch version of the QueryChildren command: - * Query for the child functins of submitted functions + * Query for the child functions of submitted functions * @param query is command parameters * @throws LSHException for problems adding records to the response * @throws ElasticException for communication problems with the server diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreeProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreeProvider.java index 7bf4f44851..e859843685 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreeProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreeProvider.java @@ -721,7 +721,7 @@ public class CallTreeProvider extends ComponentProviderAdapter { //@formatter:off showNamespaceAction = new ToggleActionBuilder("Show Namespace", plugin.getName()) .selected(false) - .description("Function nodes will include the funtion namespace when selected") + .description("Function nodes will include the function namespace when selected") .helpLocation(new HelpLocation(plugin.getName(), "Call_Tree_Action_Show_Namespaces")) .menuPath("Show Namespace") .onAction(c -> { diff --git a/Ghidra/Features/Base/src/test/java/ghidra/app/util/cparser/C/CParserUtilsTest.java b/Ghidra/Features/Base/src/test/java/ghidra/app/util/cparser/C/CParserUtilsTest.java index ccd8e93f47..71faccd4da 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/app/util/cparser/C/CParserUtilsTest.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/app/util/cparser/C/CParserUtilsTest.java @@ -55,7 +55,7 @@ public class CParserUtilsTest extends AbstractGenericTest { catch (Throwable t) { return t; } - Assert.fail("Funcion text did not trigger a parse problem: " + function); + Assert.fail("Function text did not trigger a parse problem: " + function); return null;// can't get here } } diff --git a/Ghidra/Features/Base/src/test/java/ghidra/program/database/MergeProgram.java b/Ghidra/Features/Base/src/test/java/ghidra/program/database/MergeProgram.java index 45cc02fa11..d171ac19d4 100644 --- a/Ghidra/Features/Base/src/test/java/ghidra/program/database/MergeProgram.java +++ b/Ghidra/Features/Base/src/test/java/ghidra/program/database/MergeProgram.java @@ -388,7 +388,7 @@ public class MergeProgram { } catch (Exception e) { - throw new RuntimeException("Exception updating function function", e); + throw new RuntimeException("Exception updating function", e); } } } diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/ExtendedFlatProgramAPI.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/ExtendedFlatProgramAPI.java index 2a3da5b4fa..1a05567e36 100644 --- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/ExtendedFlatProgramAPI.java +++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/ExtendedFlatProgramAPI.java @@ -198,7 +198,7 @@ public class ExtendedFlatProgramAPI extends FlatProgramAPI { * valid but not created, create it * @param address the given address * @param allowNullFunctionPointer if true, allow null pointers as a valid function pointer - * @return true if it is a functin pointer, else returns false + * @return true if it is a function pointer, else returns false * @throws CancelledException if cancelled */ public boolean isFunctionPointer(Address address, boolean allowNullFunctionPointer) diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java index 4d6ea41d53..e97a74ad33 100644 --- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java +++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java @@ -1256,7 +1256,7 @@ public class RecoveredClassHelper { /** * temporarily change the function signature of the given constructor or destructor to replace - * any empty structure with same size undefined datatype and to also remove the functin from + * any empty structure with same size undefined datatype and to also remove the function from * its namespace to remove the empty structure from the this param. This is so that the * class member data calculations are made without bad info * @param function the given function @@ -7863,7 +7863,7 @@ public class RecoveredClassHelper { // to the purecall function and we don't want to rename that function to the new name // since anyone calling purecall will call it if (!componentFunctionDefinition.getName().contains("purecall")) { - // otherwise update data type with new new signature + // otherwise update data type with the new signature FunctionDefinition changedFunctionDefinition = updateFunctionDefinition(componentFunctionDefinition, newFunctionDefinition); diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh index eb4c4f4ce8..b5c6750965 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh @@ -1642,7 +1642,7 @@ class FuncCallSpecs : public FuncProto { PcodeOp *op; ///< Pointer to CALL or CALLIND instruction string name; ///< Name of function if present Address entryaddress; ///< First executing address of function - Funcdata *fd; ///< The Funcdata object for the called functon (if known) + Funcdata *fd; ///< The Funcdata object for the called function (if known) int4 effective_extrapop; ///< Working extrapop for the CALL uintb stackoffset; ///< Relative offset of stack-pointer at time of this call int4 stackPlaceholderSlot; ///< Slot containing temporary stack tracing placeholder (-1 means unused)