diff --git a/doc/macos.md b/doc/macos.md index b259351a94..332ae059b2 100644 --- a/doc/macos.md +++ b/doc/macos.md @@ -65,7 +65,7 @@ You can verify that the binary is properly signed and verified by using the code $ codesign -dv binr/radare2/radare2 -Additionally, you can run the following command to add the non-priviledge user (username) to the Developer Tools group in macOS, avoiding the related Xcode prompts: +Additionally, you can run the following command to add the non-privileged user (username) to the Developer Tools group in macOS, avoiding the related Xcode prompts: $ sudo dscl . append /Groups/_developer GroupMembership diff --git a/libr/anal/p/anal_riscv.c b/libr/anal/p/anal_riscv.c index 7252bcc993..5314a12f96 100644 --- a/libr/anal/p/anal_riscv.c +++ b/libr/anal/p/anal_riscv.c @@ -529,7 +529,7 @@ static int riscv_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le // branch/jumps/calls/rets if (is_any ("jal")) { - // decide wether it's ret or call + // decide whether it's ret or call int rd = (word >> OP_SH_RD) & OP_MASK_RD; op->type = (rd == 0) ? R_ANAL_OP_TYPE_RET: R_ANAL_OP_TYPE_CALL; op->jump = EXTRACT_UJTYPE_IMM (word) + addr; diff --git a/libr/asm/arch/hppa/gnu/hppa-dis.c b/libr/asm/arch/hppa/gnu/hppa-dis.c index 1fba17af59..73667fc3f4 100644 --- a/libr/asm/arch/hppa/gnu/hppa-dis.c +++ b/libr/asm/arch/hppa/gnu/hppa-dis.c @@ -51,7 +51,7 @@ static const char *const fp_reg_names[] = typedef unsigned int CORE_ADDR; -/* Get at various relevent fields of an instruction word. */ +/* Get at various relevant fields of an instruction word. */ #define MASK_5 0x1f #define MASK_10 0x3ff diff --git a/libr/asm/arch/xtensa/gnu/xtensa-dis.c b/libr/asm/arch/xtensa/gnu/xtensa-dis.c index 3cd0515775..9c9fce934c 100644 --- a/libr/asm/arch/xtensa/gnu/xtensa-dis.c +++ b/libr/asm/arch/xtensa/gnu/xtensa-dis.c @@ -183,7 +183,7 @@ print_insn_xtensa (bfd_vma memaddr, struct disassemble_info *info) an 80-column screen.) The value of bytes_per_line here is not exactly right, because objdump adds an extra space for each chunk so that the amount of whitespace depends on the chunk size. Oh well, it's good - enough.... Note that we set the minimum size to 4 to accomodate + enough.... Note that we set the minimum size to 4 to accommodate literal pools. */ info->bytes_per_line = MAX (maxsize, 4); diff --git a/libr/bin/mangling/cxx/cp-demangle.c b/libr/bin/mangling/cxx/cp-demangle.c index f0099aa2d2..5248868e8e 100644 --- a/libr/bin/mangling/cxx/cp-demangle.c +++ b/libr/bin/mangling/cxx/cp-demangle.c @@ -82,7 +82,7 @@ IN_GLIBCPP_V3 If defined, this file defines only __cxa_demangle() and - __gcclibcxx_demangle_callback(), and no other publically visible + __gcclibcxx_demangle_callback(), and no other publicly visible functions or variables. STANDALONE_DEMANGLER diff --git a/libr/core/cmd_anal.c b/libr/core/cmd_anal.c index 5c8c356016..40a11116bc 100644 --- a/libr/core/cmd_anal.c +++ b/libr/core/cmd_anal.c @@ -99,7 +99,7 @@ static const char *help_msg_ab[] = { static const char *help_msg_abt[] = { "Usage:", "abt", "[addr] [num] # find num paths from current offset to addr", "abt", " [addr] [num]", "find num paths from current offset to addr", - "abte", " [addr]", "emulate from begining of function to the given address", + "abte", " [addr]", "emulate from beginning of function to the given address", "abtj", " [addr] [num]", "display paths in JSON", NULL }; @@ -8723,7 +8723,7 @@ static void cmd_anal_abt(RCore *core, const char *input) { int n = 1; char *p = strchr (input + 1, ' '); if (!p) { - eprintf ("Usage: abte [addr] # emulate from begining of function to the given address.\n"); + eprintf ("Usage: abte [addr] # emulate from beginning of function to the given address.\n"); return; } ut64 addr = r_num_math (core->num, p + 1); diff --git a/libr/core/disasm.c b/libr/core/disasm.c index eb6aa9ceb5..e31c754543 100644 --- a/libr/core/disasm.c +++ b/libr/core/disasm.c @@ -1327,7 +1327,7 @@ static void ds_show_xrefs(RDisasmState *ds) { if (!xrefs) { return; } - // only show fcnline in xrefs when addr is not the begining of a function + // only show fcnline in xrefs when addr is not the beginning of a function bool fcnlines = (ds->fcn && ds->fcn->addr == ds->at); if (r_list_length (xrefs) > ds->maxrefs) { ds_begin_line (ds); diff --git a/libr/core/visual.c b/libr/core/visual.c index 5a2664764d..f31838041c 100644 --- a/libr/core/visual.c +++ b/libr/core/visual.c @@ -290,7 +290,7 @@ static const char *help_msg_visual[] = { "??", "show this help", "$", "set the program counter to the current offset + cursor", "%", "in cursor mode finds matching pair, otherwise toggle autoblocksz", - "^", "seek to the begining of the function", + "^", "seek to the beginning of the function", "!", "enter into the visual panels mode", "TAB", "switch to the next print mode (or element in cursor mode)", "_", "enter the flag/comment/functions/.. hud (same as VF_)", diff --git a/libr/core/windows_heap.c b/libr/core/windows_heap.c index 26970ac7e1..92bbee080c 100644 --- a/libr/core/windows_heap.c +++ b/libr/core/windows_heap.c @@ -1199,7 +1199,7 @@ static void w32_list_heaps(RCore *core, const char format) { pj_kN (pj, "address", (ut64)heap.Base); pj_kN (pj, "count", (ut64)heap.BlockCount); pj_kN (pj, "allocated", (ut64)heap.Allocated); - pj_kN (pj, "commited", (ut64)heap.Committed); + pj_kN (pj, "committed", (ut64)heap.Committed); pj_end (pj); break; default: diff --git a/shlr/gdb/src/gdbclient/xml.c b/shlr/gdb/src/gdbclient/xml.c index f1044bc1da..8ddc2ccbf8 100644 --- a/shlr/gdb/src/gdbclient/xml.c +++ b/shlr/gdb/src/gdbclient/xml.c @@ -509,7 +509,7 @@ static void _write_flag_bits(char *buf, const gdbr_xml_flags_t *flags) { continue; } // To avoid duplicates. This skips flags if first char is same. i.e. - // for x86_64, it will skip VIF because VM already occured. This is + // for x86_64, it will skip VIF because VM already occurred. This is // same as default reg-profiles in r2 c = tolower (flags->fields[i].name[0]) - 'a'; if (fc[c]) { diff --git a/shlr/qnx/src/core.c b/shlr/qnx/src/core.c index 3110fb8eb4..06145796b0 100644 --- a/shlr/qnx/src/core.c +++ b/shlr/qnx/src/core.c @@ -250,7 +250,7 @@ ptid_t qnxr_run (libqnxr_t *g, const char *file, char **args, char **env) { errors += !nto_send_env (g, *env); if (errors) { - eprintf ("%s: error(s) occured while sending environment\n", __func__); + eprintf ("%s: error(s) occurred while sending environment\n", __func__); } nto_send_init (g, DStMsg_env, DSMSG_ENV_CLEARARGV, SET_CHANNEL_DEBUG); @@ -271,7 +271,7 @@ ptid_t qnxr_run (libqnxr_t *g, const char *file, char **args, char **env) { errors |= !nto_send_arg (g, *argv); if (errors) { - eprintf ("%s: error(s) occured while sending args\n", __func__); + eprintf ("%s: error(s) occurred while sending args\n", __func__); } } @@ -689,7 +689,7 @@ int nto_send_env (libqnxr_t *g, const char *env) { if (!nto_send (g, offsetof (DStMsg_env_t, data) + DS_DATA_MAX_SIZE, 1)) { - /* An error occured. */ + /* An error occurred. */ return 0; } len -= DS_DATA_MAX_SIZE; diff --git a/shlr/www/m/index.html b/shlr/www/m/index.html index 5d981a2224..b07b2cf036 100644 --- a/shlr/www/m/index.html +++ b/shlr/www/m/index.html @@ -25,4 +25,4 @@ computerConsole -->
help_outlineHelp
5004003002001001234567

error_outline

A network error has occured

This error isn't recoverable.

 \ No newline at end of file + 296.7,128 380.7,184.3 436.7,125 "/>

error_outline

A network error has occurred

This error isn't recoverable.

 \ No newline at end of file diff --git a/shlr/zip/zlib/ChangeLog b/shlr/zip/zlib/ChangeLog index f83f97eb11..0f2535d2a5 100644 --- a/shlr/zip/zlib/ChangeLog +++ b/shlr/zip/zlib/ChangeLog @@ -194,7 +194,7 @@ Changes in 1.2.5.2 (17 Dec 2011) - Add a transparent write mode to gzopen() when 'T' is in the mode - Update python link in zlib man page - Get inffixed.h and MAKEFIXED result to match -- Add a ./config --solo option to make zlib subset with no libary use +- Add a ./config --solo option to make zlib subset with no library use - Add undocumented inflateResetKeep() function for CAB file decoding - Add --cover option to ./configure for gcc coverage testing - Add #define ZLIB_CONST option to use const in the z_stream interface diff --git a/test/new/db/cmd/cmd_print b/test/new/db/cmd/cmd_print index c4f147f61b..660bd88e7c 100644 --- a/test/new/db/cmd/cmd_print +++ b/test/new/db/cmd/cmd_print @@ -627,7 +627,7 @@ prl 1~[0] EOF RUN -NAME=pib from begining of bb +NAME=pib from beginning of bb FILE=../bins/elf/analysis/x64-loop EXPECT=<