From f5c5cea8b0ae15bcbc0cd6dd835630f06e2788e7 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Sun, 5 Dec 2021 18:23:27 -0800 Subject: [PATCH] Correct typos --- CHANGES | 51 +++++++++++++++++++++++------------------- HOWTO.INSTALL | 12 +++++----- LIBRARY | 10 ++++----- Makefile | 18 +++++++-------- Makefile.ship | 20 ++++++++--------- README.WINDOWS | 12 +++++----- banned.h | 12 +++++----- block.c | 2 +- byteswap.c | 22 +++++++++--------- byteswap.h | 20 ++++++++--------- cal/Makefile | 4 ++-- cal/README | 2 +- cal/regress.cal | 7 +++--- cal/set8700.line | 6 ++--- cal/sumtimes.cal | 6 ++--- cal/test8900.cal | 4 ++-- calc.c | 10 ++++----- calc.man | 2 +- calc.spec.in | 12 +++++----- calcerr.tbl | 14 ++++++------ codegen.c | 4 ++-- config.c | 16 ++++++------- config.h | 8 +++---- cscript/Makefile | 4 ++-- cscript/powerterm.calc | 2 +- cscript/square.calc | 2 +- custom/CUSTOM_CAL | 4 ++-- custom/Makefile | 6 ++--- custom/Makefile.head | 6 ++--- custom/c_argv.c | 4 ++-- decl.h | 2 +- file.c | 10 ++++----- func.c | 34 ++++++++++++++-------------- have_const.c | 2 +- have_offscl.c | 2 +- have_posscl.c | 2 +- have_stdvs.c | 2 +- have_uid_t.c | 2 +- have_unused.c | 2 +- have_varvs.c | 2 +- help/Makefile | 8 +++---- help/cfsim | 8 +++---- help/command | 2 +- help/config | 2 +- help/dms2d | 4 ++-- help/fopen | 4 ++-- help/fpathopen | 6 ++--- help/gms2g | 4 ++-- help/hms2h | 4 ++-- help/modify | 4 ++-- help/script | 2 +- help/sqrt | 4 ++-- hist.c | 2 +- input.c | 14 ++++++------ lib_calc.c | 8 +++---- longbits.c | 2 +- matfunc.c | 4 ++-- obj.c | 2 +- opcodes.c | 4 ++-- qfunc.c | 2 +- qmath.c | 2 +- qtrans.c | 8 +++---- quickhash.c | 2 +- rpm.mk | 4 ++-- seed.c | 12 +++++----- sha1.c | 4 ++-- strl.c | 4 ++-- symbol.c | 2 +- token.h | 8 +++---- value.c | 2 +- value.h | 2 +- zfunc.c | 4 ++-- zio.c | 2 +- zmath.c | 10 ++++----- zmath.h | 6 ++--- zmod.c | 4 ++-- zmul.c | 18 +++++++-------- zprime.c | 16 ++++++------- zrand.c | 2 +- zrandom.c | 8 +++---- 80 files changed, 289 insertions(+), 283 deletions(-) diff --git a/CHANGES b/CHANGES index 3069a7e..38288d6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@ -The following are the changes from calc version 2.14.0.9 to date: +The following are the changes from calc version 2.14.0.11 to date: + + Fixed a number of typos. + + +The following are the changes from calc version 2.14.0.9 to 2.14.0.10: Due to issues with clang and Apple Silicon, ARCH_CFLAGS is now, by default, empty: @@ -17,23 +22,23 @@ The following are the changes from calc version 2.14.0.9 to date: arch: uname -p hardware: uname -m - Fixed compiling calc on Apple Silicon with homebrew. On Apple + Fixed compiling calc on Apple Silicon with HomeBrew. On Apple Silicon, HomeBrew installs on into a different location. The Makefile checks if ${hardware} is arm64 and adjusts the location of libraries such as readline and history accordingly. - Pluged a number of memory leaks. + Plugged a number of memory leaks. - Fixed a few cases where v_subtype was not properly initialuzed. + Fixed a few cases where v_subtype was not properly initialized. Improved the way that internal pre-defined constants are managed. Removed unused internal pre-defined constants. Added code to prevent an internal pre-defined constant (that was never allocated) from being freed. - Remove unnecessary spaces inbetween or next to tabs. + Remove unnecessary spaces in-between or next to tabs. - Update copright dates to account for 2021 modifications. + Update Copyright dates to account for 2021 modifications. The following are the changes from calc version 2.14.0.7 to 2.14.0.8: @@ -108,7 +113,7 @@ The following are the changes from calc version 2.14.0.0 to 2.14.0.6: The optional 2nd argument is ignored by g2d(grad, ep) and d2g(deg, ep). The clean and clobber makefile rules no longer list custom/Makefile - as a dependecy. + as a dependency. Unfortunately due to the complex dependency issues between Makefile, Makefile.ship and custom/Makefile, parallel GNU make @@ -246,7 +251,7 @@ The following are the changes from calc version 2.14.0.0 to 2.14.0.6: Fixed typo in cal/statistics.cal thanks to a report by . - Fixed an old Windoz pun in README.WINDOWS as requested by . Fixed a really obscure bug in the internal initconstants() @@ -257,7 +262,7 @@ The following are the changes from calc version 2.14.0.0 to 2.14.0.6: multi-architecture testing found the bug. Now, after all those years, it is fixed. - Fixed issues identied by the default CodeUL GitHub security code scan: + Fixed issues identified by the default CodeUL GitHub security code scan: Wrong type of arguments to printf in have_fpos_pos.c Multiplication result converted to larger type in zfunc.c @@ -1304,7 +1309,7 @@ The following are the changes from calc version 2.12.4.0 to 2.12.4.2: dot org) for this patch. Michael Penk (mpenk at wuska dot com) reported success in installs - under windoz via Cygwin by making a change to the Cygwin target. + under Windows via Cygwin by making a change to the Cygwin target. These changes have been folded into the main calc Makefile. The old recommendation of using 'make win32_hsrc' is no longer required for Cygwin. See the README.WINDOWS file for details. @@ -1478,7 +1483,7 @@ The following are the changes from calc version 2.12.1.10 to 2.12.2: All extern functions are now declared with the symbol E_FUNC. The include file decl.h defines these 4 symbols by default to static, extern, static, and extern respectively. Under - Windoz, DLL is also defined according to the _EXPORTING symbol + Windows, DLL is also defined according to the _EXPORTING symbol and is prepended to the EXTERN and E_FUNC symbols. The decl.h file has replaced the win32dll.h file. @@ -2212,8 +2217,8 @@ The following are the changes from calc version 2.12.0 to 2.12.0.8: doalltimes(1e6) Calc now ignores carriage returns (\r), vertical tabs (\v), and - form feeds (\f) when token parsing. Thus users on Windoz systems - can write files using their \r\n format and users on non-Windoz + form feeds (\f) when token parsing. Thus users on Windows systems + can write files using their \r\n format and users on non-Windows systems can read them without errors. The quomod() builtin function now takes an optional 5th argument @@ -2555,7 +2560,7 @@ The following are the changes from calc version 2.11.6.0 to 2.11.6.2: Fixed help typos reported by Marc Mezzarobba . - Forced system("") to return 0 under windoz. + Forced system("") to return 0 under Windows. The direct.h include file is not used when compiling under Cygwin. @@ -2865,10 +2870,10 @@ The following are the changes from calc version 2.11.5t2 to 2.11.5t2.1: The calc builtin function, fopen(), now allows one to specify opening files in binary modes. On POSIX / Linux / Un*x-like systems, text file is the same as a binary file and so 'b' to an fopen has - no effect and is ignored. However on systems such as MS Windoz + no effect and is ignored. However on systems such as MS Windows the 'b' / binary mode has meaning. See 'help fopen' for details. - On systems (such as MS Windoz), calc will produce a different error + On systems (such as MS Windows), calc will produce a different error message when it attempts to open /dev/tty. This will condition will occur in things like calc scripts when they switch from ``batch processing'' commands from and want to start interactive mode. @@ -2903,14 +2908,14 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1: Thanks goes to Martin Buck for reporting this bug and testing the fix. - An effort was made to make calc easier to build under Windoz + An effort was made to make calc easier to build under Windows using the Cygwin project (http://sources.redhat.com/cygwin/). Thanks to the work of Thomas Jones-Low (tjoneslo at softstart dot com), a number of #if defined(_WIN32)'s have been added - to calc source. These changes should not effect Windoz + to calc source. These changes should not effect Windows free system such as GNU/Linux, Solaris, POSIX-like, etc ... - Added windll.h to deal with Windoz related DLL issues. + Added windll.h to deal with Windows related DLL issues. Using the convention of 'extern DLL' instead of 'DLL extern' to deal with symbols that export to or import from a DLL. @@ -2927,12 +2932,12 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1: If HAVE_URANDOM is NO, then the Makefile will assume /dev/urandom does not exist. - If TERMCONTROL is -DUSE_WIN32, then the Windoz terminal control + If TERMCONTROL is -DUSE_WIN32, then the Windows terminal control (no TERMIOS, no TERMIO, no SGTTY) will be assumed. Added a win32_hsrc Makefile rule to create hsrc files appropriate - for a Windoz system using Cygwin gcc environment. Added win32.mkdef - which is used by the win32_hsrc rule to set the Windoz specific + for a Windows system using Cygwin gcc environment. Added win32.mkdef + which is used by the win32_hsrc rule to set the Windows specific Makefile values to build hsrc files. The hsrc files are built under the win32 directory. @@ -3013,7 +3018,7 @@ The following are the changes from calc version 2.11.5t0 to 2.11.5t1.1: config("windows") Now shipping a win32 sub-directory that contains hsrc .h files - that have been attempted to be built for windoz. + that have been attempted to be built for Windows. The following are the changes from calc version 2.11.4t1 to 2.11.4t2: diff --git a/HOWTO.INSTALL b/HOWTO.INSTALL index 9f88131..8d4fd35 100644 --- a/HOWTO.INSTALL +++ b/HOWTO.INSTALL @@ -54,7 +54,7 @@ Installing calc from the bzip2-ed tarball in 4 easy steps: make target=Darwin chk make target=Darwin install - If your target system does not have a moderm Makefile (such as gmake), + If your target system does not have a modern Makefile (such as gmake), then you should try using the Makefile.simple and custom/Makefile.simple files: @@ -69,17 +69,17 @@ Installing calc from the bzip2-ed tarball in 4 easy steps: suggestion. If you are using a modern make (such as gmake), you may override - any values set in the Mkefile by adding them to Makefile.local + any values set in the Makefile by adding them to Makefile.local using the := directive. For example: HAVE_STRING_H:= YES HAVE_TIMES_H:= YES SED:= /usr/local/bin/nsed - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - ! If you are building under Windoz or a Windoz-like environment ! - ! (such as Cygwin or DJGPP), read the README.WINDOWS file. ! - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + ! If you are building under Windows or a Windows-like environment ! + ! (such as Cygwin or DJGPP), read the README.WINDOWS file. ! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! You should determine if these Makefile variables are reasonable: diff --git a/LIBRARY b/LIBRARY index f5e4216..3710860 100644 --- a/LIBRARY +++ b/LIBRARY @@ -320,10 +320,10 @@ The arbitrary precision integer routines define a structure called a ZVALUE. This is defined in zmath.h. A ZVALUE contains a pointer to an array of integers, the length of the array, and a sign flag. The array is allocated using malloc, so you need to free this array when you are done with a -ZVALUE. To do this, you should call zfree with the ZVALUE as an argument -(or call freeh with the pointer as an argument) and never try to free the -array yourself using free. The reason for this is that sometimes the pointer -points to one of two statically allocated arrays which should NOT be freed. +ZVALUE. To do this, you should call zfree() with the ZVALUE as an argument +and never try to free the array yourself using free(). The reason for this +is that sometimes the pointer points to a statically allocated arrays which +should NOT be freed. The ZVALUE structures are passed to routines by value, and are returned through pointers. For example, to multiply two small integers together, @@ -615,7 +615,7 @@ These have the values 0, 1, and i. LAST THINGS LAST ---------------- -If you wish, when you are all doen you can call libcalc_call_me_last() +If you wish, when you are all done you can call libcalc_call_me_last() to free a small amount of storage associated with the libcalc_call_me_first() call. This is not required, but is does bring things to a closure. diff --git a/Makefile b/Makefile index a2e9121..2a123de 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ endif # SHELL= /bin/bash # # On some systems such as macOS, the bash shell is very -# far behind to the point wehre is cannot be depended on. +# far behind to the point where is cannot be depended on. # On such systems, the zsh may be a much better alternative # shell for this Makefile to use: # @@ -103,7 +103,7 @@ PREFIX= /usr/local # if calculations. # # In the case of calc, we are motivated in part by the desire for calc -# to correctly calculate: even durings extremely long calculations. +# to correctly calculate: even during extremely long calculations. # # If UNBAN is NOT defined, then calling certain functions # will result in a call to a non-existent function (link error). @@ -142,12 +142,12 @@ USE_READLINE= -DUSE_READLINE #READLINE_LIB= -L${PREFIX}/lib -lreadline -lhistory -lncurses ifeq ($(target),Darwin) ifeq ($(hardware),arm64) -# Darwin arm64 homebrew installs readline & history +# Darwin arm64 HomeBrew installs readline & history # libs in /opt/homebrew/opt/readline/lib READLINE_LIB= -L/opt/homebrew/opt/readline/lib -lreadline -lhistory -lncurses else # Assume Darwin non-arm64 is x86_64 -# Darwin x86_64 homebrew installs readline & history +# Darwin x86_64 HomeBrew installs readline & history # libs in ${PREFIX}/opt/readline/lib READLINE_LIB= -L${PREFIX}/opt/readline/lib -lreadline -lhistory -lncurses endif @@ -157,12 +157,12 @@ endif # ifeq ($(target),Darwin) ifeq ($(hardware),arm64) -# Darwin arm64 homebrew installs readline & history *.h +# Darwin arm64 HomeBrew installs readline & history *.h # under /opt/homebrew/opt/readline/include READLINE_INCLUDE= -I${PREFIX}/opt/homebrew/opt/readline/include else # Assume Darwin non-arm64 is x86_64 -# Darwin x86_64 homebrew installs readline & history *.h +# Darwin x86_64 HomeBrew installs readline & history *.h # under ${PREFIX}/opt/readline/include READLINE_INCLUDE= -I${PREFIX}/opt/readline/include endif @@ -240,10 +240,10 @@ CI= ci # H=@: do not report hsrc file formation progress # H=@ do echo hsrc file formation progress # -# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation # S= full ${CC} output during hsrc file formation # -# E= 2>/dev/null slience command stderr during hsrc file formation +# E= 2>/dev/null silence command stderr during hsrc file formation # E= full command stderr during hsrc file formation # # V=@: do not echo debug statements (quiet mode) @@ -621,7 +621,7 @@ have_strlcat.h: ## # -# Build .h files for windoz based systems +# Build .h files for Windows based systems # # This is really a internal utility rule that is used to create the # win32 sub-directory for distribution. diff --git a/Makefile.ship b/Makefile.ship index 8b84bcc..e5533b3 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -164,7 +164,7 @@ CCBAN= -UUNBAN # -DUSE_TERMIOS use struct termios from # -DUSE_TERMIO use struct termios from # -DUSE_SGTTY use struct sgttyb from -# -DUSE_NOTHING windoz system, don't use any of them +# -DUSE_NOTHING Windows system, don't use any of them # # Select TERMCONTROL= -DUSE_TERMIOS for DJGPP. # @@ -1067,7 +1067,7 @@ READLINE_EXTRAS= #READLINE_LIB= -L/sw/lib -lreadline #READLINE_EXTRAS= -lhistory -lncurses # -# For Apple OS X: install homebrew and then: +# For Apple OS X: install HomeBrew and then: # # brew install readline # @@ -1197,12 +1197,12 @@ CALC_ENV= CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help \ # Some out of date operating systems require/want an executable to # end with a certain file extension. Some compiler systems such as -# windoz build calc as calc.exe. The EXT variable is used to denote +# Windows build calc as calc.exe. The EXT variable is used to denote # the extension required by such. Note that Cygwin requires EXT to be -# the same as Linux/Un*x/GNU, even though it runs under windoz. +# the same as Linux/Un*x/GNU, even though it runs under Windows. # # EXT= # normal Un*x / Linux / GNU/Linux / Cygwin -# EXT=.exe # windoz +# EXT=.exe # Windows # # If in doubt, use EXT= # @@ -1944,10 +1944,10 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} # H=@: do not report hsrc file formation progress # H=@ do echo hsrc file formation progress # -# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation # S= full ${CC} output during hsrc file formation # -# E= 2>/dev/null slience command stderr during hsrc file formation +# E= 2>/dev/null silence command stderr during hsrc file formation # E= full command stderr during hsrc file formation # # V=@: do not echo debug statements (quiet mode) @@ -2971,7 +2971,7 @@ terminal.h: ${MAKE_FILE} ${LOC_MKF} ${Q} echo '#if !defined(USE_TERMIO)' >> $@ ${Q} echo '#if !defined(USE_SGTTY)' >> $@ -${Q} if [ X"${TERMCONTROL}" = X"-DUSE_WIN32" ]; then \ - echo '/* windoz, use none of these modes */' >> $@; \ + echo '/* Windows, use none of these modes */' >> $@; \ echo '#undef USE_TERMIOS /* */' >> $@; \ echo '#undef USE_TERMIO /* */' >> $@; \ echo '#undef USE_SGTTY /* */' >> $@; \ @@ -4041,7 +4041,7 @@ have_strlcat.h: have_strlcat.c banned.h have_ban_pragma.h \ ### # -# Build .h files for windoz based systems +# Build .h files for Windows based systems # # This is really a internal utility rule that is used to create the # win32 sub-directory for distribution. @@ -4182,7 +4182,7 @@ sample_many-static${EXT}: sample_many.o ${CALC_STATIC_LIBS} \ ### # -# Homegrown make dependency rules. Your system may not support +# Home grown make dependency rules. Your system may not support # or have the needed tools. You can ignore this section. # # We will form a skeleton tree of *.c files containing only #include "foo.h" diff --git a/README.WINDOWS b/README.WINDOWS index 7b17098..1cdb36c 100644 --- a/README.WINDOWS +++ b/README.WINDOWS @@ -3,12 +3,12 @@ Dear calc user on a Windows based system, See the HOWTO.INSTALL file for information on how to build and install calc. See also the README file. -NOTE: The main developers do not have access to a Windoz based platform. - While we will make an effort to not break calc Windoz based system, - our lack of a Windoz test environment will mean we will make mistakes - from time to time. Hopefully Windowz users can overcome these mistakes. +NOTE: The main developers do not have access to a Windows based platform. + While we will make an effort to not break calc Windows based system, + our lack of a Windows test environment will mean we will make mistakes + from time to time. Hopefully Windows users can overcome these mistakes. Of course you are welcome to send us any patches that fix your - Windoz build environment. + Windows build environment. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -141,7 +141,7 @@ Follow those recommendations. In cases where they conflict with the above Makefile list, follow the recommendation in the Makefile. -## Copyright (C) 2002-2009 Landon Curt Noll and Thomas Jones-Low +## Copyright (C) 2002-2009,2021 Landon Curt Noll and Thomas Jones-Low ## ## Calc is open software; you can redistribute it and/or modify it under ## the terms of the version 2.1 of the GNU Lesser General Public License diff --git a/banned.h b/banned.h index ca53c1c..424d363 100644 --- a/banned.h +++ b/banned.h @@ -1,14 +1,14 @@ /* - * banned - optionally ban dqngerious functions + * banned - optionally ban dangerous functions * * Unless UNBAN is defined, this file will turn the use * of certain dangerous functions into syntax errors. * * In the case of calc, we are motivated in part by the desire for - * calc to correctly calculate: even durings extremely long calculations. + * calc to correctly calculate: even during extremely long calculations. * * If UNBAN is NOT defined, then calling certain functions - * will result in a syntaxc error. + * will result in a syntax error. * * If we define UNBAN, then the effect of this file is disabled. * @@ -17,7 +17,7 @@ * if calculations. * * In the case of calc, we are motivated in part by the desire for calc - * to correctly calculate: even durings extremely long calculations. + * to correctly calculate: even during extremely long calculations. * * If UNBAN is NOT defined, then calling certain functions * will result in a call to a non-existent function (link error). @@ -88,11 +88,11 @@ * then into function calls that do not exist. * * In the case of calc, we are motivated in part by the desire - * for calc to correctly calculate: even durings extremely long + * for calc to correctly calculate: even during extremely long * calculations. * * If UNBAN is NOT defined, then calling certain functions - * will result in a syntaxc error. + * will result in a syntax error. * * Unlike the above URL, we suggest an alternative function. * In many cases, additional logic is required to use the diff --git a/block.c b/block.c index 75e4a34..c2b439a 100644 --- a/block.c +++ b/block.c @@ -156,7 +156,7 @@ blk_free(BLOCK *blk) * blk - the BLOCK to check * * returns: - * if all is ok, otherwise math_error() is called and this + * if all is OK, otherwise math_error() is called and this * function does not return */ S_FUNC void diff --git a/byteswap.c b/byteswap.c index fa031a3..369db46 100644 --- a/byteswap.c +++ b/byteswap.c @@ -36,7 +36,7 @@ * swap_b8_in_HALFs - swap 8 and if needed, 16 bits in an array of HALFs * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a HALF array to swap * len - length of the src HALF array @@ -76,7 +76,7 @@ swap_b8_in_HALFs(HALF *dest, HALF *src, LEN len) * swap_b8_in_ZVALUE - swap 8 and if needed, 16 bits in a ZVALUE * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a ZVALUE to swap * all - TRUE => swap every element, FALSE => swap only the @@ -144,7 +144,7 @@ swap_b8_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all) * swap_b8_in_NUMBER - swap 8 and if needed, 16 bits in a NUMBER * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a NUMBER to swap * all - TRUE => swap every element, FALSE => swap only the @@ -208,7 +208,7 @@ swap_b8_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all) * swap_b8_in_COMPLEX - swap 8 and if needed, 16 bits in a COMPLEX * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a COMPLEX to swap * all - TRUE => swap every element, FALSE => swap only the @@ -272,7 +272,7 @@ swap_b8_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all) * swap_b16_in_HALFs - swap 16 bits in an array of HALFs * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a HALF array to swap * len - length of the src HALF array @@ -312,7 +312,7 @@ swap_b16_in_HALFs(HALF *dest, HALF *src, LEN len) * swap_b16_in_ZVALUE - swap 16 bits in a ZVALUE * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a ZVALUE to swap * all - TRUE => swap every element, FALSE => swap only the @@ -379,7 +379,7 @@ swap_b16_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all) * swap_b16_in_NUMBER - swap 16 bits in a NUMBER * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a NUMBER to swap * all - TRUE => swap every element, FALSE => swap only the @@ -443,7 +443,7 @@ swap_b16_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all) * swap_b16_in_COMPLEX - swap 16 bits in a COMPLEX * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a COMPLEX to swap * all - TRUE => swap every element, FALSE => swap only the @@ -507,7 +507,7 @@ swap_b16_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all) * swap_HALF_in_ZVALUE - swap HALFs in a ZVALUE * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a ZVALUE to swap * all - TRUE => swap every element, FALSE => swap only the @@ -575,7 +575,7 @@ swap_HALF_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all) * swap_HALF_in_NUMBER - swap HALFs in a NUMBER * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a NUMBER to swap * all - TRUE => swap every element, FALSE => swap only the @@ -639,7 +639,7 @@ swap_HALF_in_NUMBER(NUMBER *dest, NUMBER *src, BOOL all) * swap_HALF_in_COMPLEX - swap HALFs in a COMPLEX * * given: - * dest - pointer to where the swapped src wil be put or + * dest - pointer to where the swapped src will be put or * NULL to allocate the storage * src - pointer to a COMPLEX to swap * all - TRUE => swap every element, FALSE => swap only the diff --git a/byteswap.h b/byteswap.h index 1acfae4..75234ca 100644 --- a/byteswap.h +++ b/byteswap.h @@ -1,7 +1,7 @@ /* * byteswap - byte swapping macros * - * Copyright (C) 1999,2014 Landon Curt Noll + * Copyright (C) 1999,2014,2021 Landon Curt Noll * * Calc is open software; you can redistribute it and/or modify it under * the terms of the version 2.1 of the GNU Lesser General Public License @@ -39,7 +39,7 @@ /* * SWAP_B8_IN_B16 - swap 8 bits in 16 bits * - * dest - pointer to where the swapped src wil be put + * dest - pointer to where the swapped src will be put * src - pointer to a 16 bit value to swap * * This macro will either switch to the opposite byte sex (Big Endian vs. @@ -53,7 +53,7 @@ /* * SWAP_B16_IN_B32 - swap 16 bits in 32 bits * - * dest - pointer to where the swapped src wil be put + * dest - pointer to where the swapped src will be put * src - pointer to a 32 bit value to swap */ #define SWAP_B16_IN_B32(dest, src) ( \ @@ -64,7 +64,7 @@ /* * SWAP_B8_IN_B32 - swap 8 & 16 bits in 32 bits * - * dest - pointer to where the swapped src wil be put + * dest - pointer to where the swapped src will be put * src - pointer to a 32 bit value to swap * * This macro will either switch to the opposite byte sex (Big Endian vs. @@ -82,7 +82,7 @@ /* * SWAP_B32_IN_B64 - swap 32 bits in 64 bits * - * dest - pointer to where the swapped src wil be put + * dest - pointer to where the swapped src will be put * src - pointer to a 64 bit value to swap */ #define SWAP_B32_IN_B64(dest, src) ( \ @@ -93,7 +93,7 @@ /* * SWAP_B16_IN_B64 - swap 16 & 32 bits in 64 bits * - * dest - pointer to where the swapped src wil be put + * dest - pointer to where the swapped src will be put * src - pointer to a 64 bit value to swap */ #define SWAP_B16_IN_B64(dest, src) ( \ @@ -106,7 +106,7 @@ /* * SWAP_B8_IN_B64 - swap 16 & 32 bits in 64 bits * - * dest - pointer to where the swapped src wil be put + * dest - pointer to where the swapped src will be put * src - pointer to a 64 bit value to swap * * This macro will either switch to the opposite byte sex (Big Endian vs. @@ -124,7 +124,7 @@ /* * SWAP_B32_IN_B64 - swap 32 bits in 64 bits (simulated by 2 32 bit values) * - * dest - pointer to where the swapped src wil be put + * dest - pointer to where the swapped src will be put * src - pointer to a 64 bit value to swap */ #define SWAP_B32_IN_B64(dest, src) ( \ @@ -135,7 +135,7 @@ /* * SWAP_B16_IN_B64 - swap 16 & 32 bits in 64 bits (simulated by 2 32 bit vals) * - * dest - pointer to where the swapped src wil be put + * dest - pointer to where the swapped src will be put * src - pointer to a 64 bit value to swap */ #define SWAP_B16_IN_B64(dest, src) ( \ @@ -146,7 +146,7 @@ /* * SWAP_B8_IN_B64 - swap 16 & 32 bits in 64 bits (simulated by 2 32 bit vals) * - * dest - pointer to where the swapped src wil be put + * dest - pointer to where the swapped src will be put * src - pointer to a 64 bit value to swap * * This macro will either switch to the opposite byte sex (Big Endian vs. diff --git a/cal/Makefile b/cal/Makefile index 50a3c57..f6fc2c9 100644 --- a/cal/Makefile +++ b/cal/Makefile @@ -220,10 +220,10 @@ T= # H=@: do not report hsrc file formation progress # H=@ do echo hsrc file formation progress # -# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation # S= full ${CC} output during hsrc file formation # -# E= 2>/dev/null slience command stderr during hsrc file formation +# E= 2>/dev/null silence command stderr during hsrc file formation # E= full command stderr during hsrc file formation # # V=@: do not echo debug statements (quiet mode) diff --git a/cal/README b/cal/README index 0968f35..b00156b 100644 --- a/cal/README +++ b/cal/README @@ -892,7 +892,7 @@ palindrome.cal nextprimepal(val) prevprimepal(val) - Functions to form and manipulate palendromes in base 10. + Functions to form and manipulate palindromes in base 10. Important functions are: diff --git a/cal/regress.cal b/cal/regress.cal index 95eb301..d6ca9e1 100644 --- a/cal/regress.cal +++ b/cal/regress.cal @@ -7101,9 +7101,10 @@ define test_sha1() vrfy(sha1("x", "y", "z") == sha1("xyz"), '7208: sha1("x", "y", "z") == sha1("xyz")'); - vrfy(sha1(sha1("this is",7^19-8,"a composit",3i+4.5,"hash")) == - 0xc3e1b562bf45b3bcfc055ac65b5b39cdeb6a6c55, - '7209: sha1(sha1("this is",7^19-8,"a composit",3i+4.5,"hash")) == ...'); + vrfy(sha1(sha1("this is",7^19-8,"a composite",3i+4.5,"hash")) == + 0x68aa4fe0a9b6d1662f8d2dbdeee8879239185d09, + '7209: sha1(sha1("this is",7^19-8,"a composite",3i+4.5,"hash")) ' + + '== ...'); z = sha1(list(1,2,3), "curds and whey", 2^21701-1, pi(1e-100)); diff --git a/cal/set8700.line b/cal/set8700.line index fcbb8e9..39e54d1 100644 --- a/cal/set8700.line +++ b/cal/set8700.line @@ -1,7 +1,7 @@ ## ## set8700 - dotest line tests for the 8700 set of regress.cal ## -## Copyright (C) 2006 Ernest Bowen and Landon Curt Noll +## Copyright (C) 2006,2021 Ernest Bowen and Landon Curt Noll ## ## Calc is open software; you can redistribute it and/or modify it under ## the terms of the version 2.1 of the GNU Lesser General Public License @@ -159,7 +159,7 @@ set8700_A = 42, protect(set8700_A,1024), set8700_B = set8700_A, protect(set8700_ set8700_A = 6 * 7, protect(set8700_A) == 1024 set8700_A == set8700_B -## Testing matrix protectioon +## Testing matrix protection set8700_A = mat [3] = {1, 2, list(3,4)}; 1 protect(set8700_A, 65, 1), protect(set8700_A) == 1089 protect(set8700_A[0]) == 65 @@ -261,7 +261,7 @@ protect(set8700_L[0]) == 0 protect(set8700_L[1]) == 512 ## protect(set8700_A) copied protect(set8700_L[1][1]) == 1024 ## protect(set8700_A[1]) copied -## Testing list with "intialization" +## Testing list with "initialization" set8700_L = list(1,2,3), protect(set8700_L) == 0 protect(set8700_L[0]) | protect(set8700_L[1]) | protect(set8700_L[2]) == 0 ## All zero set8700_L = {1,set8700_A}, set8700_L[1] == set8700_A diff --git a/cal/sumtimes.cal b/cal/sumtimes.cal index 735855d..464d461 100644 --- a/cal/sumtimes.cal +++ b/cal/sumtimes.cal @@ -1,7 +1,7 @@ /* - * sumtimes - runtimes evaluating sums & squares of large lists and mats + * sumtimes - runtime evaluating sums & squares of large lists and mats * - * Copyright (C) 2006 Ernest Bowen + * Copyright (C) 2006,2021 Ernest Bowen * * Calc is open software; you can redistribute it and/or modify it under * the terms of the version 2.1 of the GNU Lesser General Public License @@ -160,7 +160,7 @@ define timehmean(N, M = 10) { v2 = hmean(sumtimes_A); sumtimes_t2 = usertime(); print v1, v2; - print "List harmonic meanruntimes"; + print "List harmonic mean runtimes"; printf('\tStandard "for" loop:\t\t%.4f\n', sumtimes_t1 - sumtimes_t0); printf('\tUsing builtin "hmean":\t\t%.4f\n', sumtimes_t2 - sumtimes_t1); } diff --git a/cal/test8900.cal b/cal/test8900.cal index 7db4a4d..5e2b10c 100644 --- a/cal/test8900.cal +++ b/cal/test8900.cal @@ -2867,7 +2867,7 @@ define t035() epsilon(eps); return 6; } -/* Percentiles. Numbers shamlessly stolen from a question at stackoverflow*/ +/* Percentiles. Numbers shamelessly stolen from a question at stackoverflow */ if (abs (invbetainc(0.025, 10008, 151744) - 0.060703546312525377697082321820950758320207425674954679415395) > @@ -3081,7 +3081,7 @@ define test8900(verbose = 0, tnum, testnum = 8903) return tnum; } - /* We will cause erors intentionally. A lot of them. */ + /* We will cause errors intentionally. A lot of them. */ old_errmax = errmax(-1); /* diff --git a/calc.c b/calc.c index 814a6be..268ab30 100644 --- a/calc.c +++ b/calc.c @@ -49,7 +49,7 @@ # endif # define strdup _strdup # define isatty _isatty -#endif /* Windoz */ +#endif /* Windows */ #define CALC_C #include "calc.h" @@ -712,11 +712,11 @@ main(int argc, char **argv) "Change operating systems\n" "or don't use this calc mode " "in the future, sorry!\n"); -#else /* Windoz free systems */ +#else /* Windows free systems */ fprintf(stderr, "Unable to associate stdin" " with /dev/tty"); -#endif /* Windoz free systems */ +#endif /* Windows free systems */ set_run_state(RUN_EXIT_WITH_ERROR); break; } @@ -742,11 +742,11 @@ main(int argc, char **argv) "Change operating systems\n" "or don't use this calc mode " "in the future, sorry!\n"); -#else /* Windoz free systems */ +#else /* Windows free systems */ fprintf(stderr, "Unable to associate stdin" " with /dev/tty"); -#endif /* Windoz free systems */ +#endif /* Windows free systems */ set_run_state(RUN_EXIT_WITH_ERROR); break; } diff --git a/calc.man b/calc.man index 97b1840..5856863 100644 --- a/calc.man +++ b/calc.man @@ -252,7 +252,7 @@ For example: .fi .in -5n .sp 1 -This allows the script to run independely of +This allows the script to run independently of startup scripts. .sp 1 diff --git a/calc.spec.in b/calc.spec.in index 4614c32..ff65762 100644 --- a/calc.spec.in +++ b/calc.spec.in @@ -1,7 +1,7 @@ # # calc.spec.in - template specfile for calc # -# Copyright (C) 2003-2014 Petteri Kettunen and Landon Curt Noll +# Copyright (C) 2003-2014,2021 Petteri Kettunen and Landon Curt Noll # # Calc is open software; you can redistribute it and/or modify it under # the terms of the version 2.1 of the GNU Lesser General Public License @@ -49,7 +49,7 @@ BuildRoot: %{_tmppath}/build-root Calc is arbitrary precision C-like arithmetic system that is a calculator, an algorithm prototype and mathematical research tool. Calc comes with a rich set of builtin mathematical and -programmatic functions. +programming functions. For the latest calc release, see the calc project home page: @@ -165,11 +165,11 @@ echo '-=- calc.spec beginning make clean -=-' %attr(644, root, root) %{_libdir}/libcustcalc.a %changelog -* Sun Mar 24 2019 cLandon Curt Noll http://www.isthe.com/chongo +* Sun Mar 24 2019 Landon Curt Noll http://www.isthe.com/chongo - Release: 13 - Disable compiling with the default ARCH_CFLAGS= -march=native - by clearking the ARCH_CFLAGS value in order to maximize - the RPM binary protability. + by clearing the ARCH_CFLAGS value in order to maximize + the RPM binary portability. * Mon Sep 01 2014 Landon Curt Noll http://www.isthe.com/chongo - Release: 12 @@ -178,7 +178,7 @@ echo '-=- calc.spec beginning make clean -=-' use -j1 while building these RPMs to avoid this make bug. This only impacts the speed of building the rpms. - Stopped removing %{_buildroot} at the beginning of install - as this, acording to a number of sources, was asking for trouble. + as this, according to a number of sources, was asking for trouble. - Clean removes tmp, BUILD, SPEC, and BUILDROOT dirs under topdir. - Fixed the building of the calc-debuginfo rpm. - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, diff --git a/calcerr.tbl b/calcerr.tbl index d7fdad2..0b9d5d1 100644 --- a/calcerr.tbl +++ b/calcerr.tbl @@ -259,7 +259,7 @@ E_COPY6 Non-integer or negative destination index for copy E_COPY7 Destination index too large for copy E_COPY8 Freed block source for copy E_COPY9 Unsuitable source type for copy -E_COPY10 Freed block destinction for copy +E_COPY10 Freed block destination for copy E_COPY11 Unsuitable destination type for copy E_COPY12 Incompatible source and destination for copy E_COPY13 No-copy-from source variable @@ -530,15 +530,15 @@ E_H2HM1 Non-lvalue arguments 2 or 3 for h2hm E_H2HM2 Non-real-number arg 1 for h2hm E_H2HM3 No-assign-to argument 2 or 3 for h2hm E_H2HM4 Invalid rounding arg 4 for h2hm -E_DMS2D1 Non-real-number aarguments 1, 2 or 3 for dms2d +E_DMS2D1 Non-real-number arguments 1, 2 or 3 for dms2d E_DMS2D2 Invalid rounding arg 4 for dms2d -E_DM2D1 Non-real-number aarguments 1 or 2 for dm2d +E_DM2D1 Non-real-number arguments 1 or 2 for dm2d E_DM2D2 Invalid rounding arg 4 for dm2d -E_GMS2G1 Non-real-number aarguments 1, 2 or 3 for gms2g +E_GMS2G1 Non-real-number arguments 1, 2 or 3 for gms2g E_GMS2G2 Invalid rounding arg 4 for gms2g -E_GM2G1 Non-real-number aarguments 1 or 2 for gm2g +E_GM2G1 Non-real-number arguments 1 or 2 for gm2g E_GM2G2 Invalid rounding arg 4 for gm2g -E_HMS2H1 Non-real-number aarguments 1, 2 or 3 for hms2h +E_HMS2H1 Non-real-number arguments 1, 2 or 3 for hms2h E_HMS2H2 Invalid rounding arg 4 for hms2h -E_HM2H1 Non-real-number aarguments 1 or 2 for hm2h +E_HM2H1 Non-real-number arguments 1 or 2 for hm2h E_HM2H2 Invalid rounding arg 4 for hm2h diff --git a/codegen.c b/codegen.c index acb0694..e005937 100644 --- a/codegen.c +++ b/codegen.c @@ -451,7 +451,7 @@ getsimplebody(void) /* - * Get the body of a function, or a subbody of a function. + * Get the body of a function, or a sub-body of a function. * body = '{' [ declarations ] ... [ statement ] ... '}' * | [ declarations ] ... [statement ] ... '\n' */ @@ -1516,7 +1516,7 @@ getexprlist(void) /* - * Get an opassignment or possibly just an assignment or expression. + * Get an op-assignment or possibly just an assignment or expression. * Returns flags describing the type of assignment or expression found. * assignment = lvalue '=' assignment * | lvalue '+=' assignment diff --git a/config.c b/config.c index 6801e57..a3858c6 100644 --- a/config.c +++ b/config.c @@ -149,8 +149,8 @@ CONFIG oldstd = { /* backward compatible standard configuration */ SQ_ALG2, /* size of number to use square alg 2 */ POW_ALG2, /* size of modulus to use REDC for powers */ REDC_ALG2, /* size of modulus to use REDC algorithm 2 */ - TRUE, /* ok to print a tilde on approximations */ - TRUE, /* ok to print tab before numeric values */ + TRUE, /* OK to print a tilde on approximations */ + TRUE, /* OK to print tab before numeric values */ 0, /* quomod() default rounding mode */ 2, /* quotient // default rounding mode */ 0, /* mod % default rounding mode */ @@ -160,8 +160,8 @@ CONFIG oldstd = { /* backward compatible standard configuration */ 8, /* cfsim() default rounding mode */ 2, /* output default rounding mode */ 24, /* round()/bround() default rounding mode */ - FALSE, /* ok to print leading 0 before decimal pt */ - 0, /* ok to print trailing 0's */ + FALSE, /* OK to print leading 0 before decimal pt */ + 0, /* OK to print trailing 0's */ MAXSCANCOUNT, /* max scan errors before abort */ PROMPT1, /* normal prompt */ PROMPT2, /* prompt when inside multi-line input */ @@ -209,8 +209,8 @@ CONFIG newstd = { /* new non-backward compatible configuration */ SQ_ALG2, /* size of number to use square alg 2 */ POW_ALG2, /* size of modulus to use REDC for powers */ REDC_ALG2, /* size of modulus to use REDC algorithm 2 */ - TRUE, /* ok to print a tilde on approximations */ - TRUE, /* ok to print tab before numeric values */ + TRUE, /* OK to print a tilde on approximations */ + TRUE, /* OK to print tab before numeric values */ 0, /* quomod() default rounding mode */ 2, /* quotient // default rounding mode */ 0, /* mod % default rounding mode */ @@ -220,8 +220,8 @@ CONFIG newstd = { /* new non-backward compatible configuration */ 8, /* cfsim() default rounding mode */ 24, /* output default rounding mode */ 24, /* round()/bround() default rounding mode */ - TRUE, /* ok to print leading 0 before decimal pt */ - 0, /* ok to print trailing 0's */ + TRUE, /* OK to print leading 0 before decimal pt */ + 0, /* OK to print trailing 0's */ MAXSCANCOUNT, /* max scan errors before abort */ "; ", /* normal prompt */ ";; ", /* prompt when inside multi-line input */ diff --git a/config.h b/config.h index c2c54cd..85a0ca4 100644 --- a/config.h +++ b/config.h @@ -130,8 +130,8 @@ struct config { LEN sq2; /* size of number to use square algorithm 2 */ LEN pow2; /* size of modulus to use REDC for powers */ LEN redc2; /* size of modulus to use REDC algorithm 2 */ - BOOL tilde_ok; /* ok to print a tilde on approximations */ - BOOL tab_ok; /* ok to print tab before numeric values */ + BOOL tilde_ok; /* OK to print a tilde on approximations */ + BOOL tab_ok; /* OK to print tab before numeric values */ LEN quomod; /* quomod() default rounding mode */ LEN quo; /* quotient // default rounding mode */ LEN mod; /* mod % default rounding mode */ @@ -141,8 +141,8 @@ struct config { LEN cfsim; /* cfsim() default rounding mode */ LEN outround; /* output default rounding mode */ LEN round; /* round()/bround() default rounding mode */ - BOOL leadzero; /* ok to print leading 0 before decimal pt */ - BOOL fullzero; /* ok to print trailing 0's */ + BOOL leadzero; /* OK to print leading 0 before decimal pt */ + BOOL fullzero; /* OK to print trailing 0's */ long maxscancount; /* max scan errors before abort */ char *prompt1; /* normal prompt */ char *prompt2; /* prompt when inside multi-line input */ diff --git a/cscript/Makefile b/cscript/Makefile index 26cb17a..9b4f6bd 100644 --- a/cscript/Makefile +++ b/cscript/Makefile @@ -219,10 +219,10 @@ T= # H=@: do not report hsrc file formation progress # H=@ do echo hsrc file formation progress # -# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation # S= full ${CC} output during hsrc file formation # -# E= 2>/dev/null slience command stderr during hsrc file formation +# E= 2>/dev/null silence command stderr during hsrc file formation # E= full command stderr during hsrc file formation # # V=@: do not echo debug statements (quiet mode) diff --git a/cscript/powerterm.calc b/cscript/powerterm.calc index 59edd29..131d613 100644 --- a/cscript/powerterm.calc +++ b/cscript/powerterm.calc @@ -92,7 +92,7 @@ if (base_lim <= 2^20+1) { /* 2^20 requires ~96 Megs of memory */ } /* - * remove nestest powers + * remove nearest powers */ while (abs(x) >= base_lim) { diff --git a/cscript/square.calc b/cscript/square.calc index 540c124..fe0e848 100644 --- a/cscript/square.calc +++ b/cscript/square.calc @@ -1,6 +1,6 @@ #!/usr/local/src/bin/calc/calc -q -p -f /* - * sqaure - print the squares of input values + * square - print the squares of input values * * Copyright (C) 2000-2007,2014,2019,2021 Ernest Bowen * diff --git a/custom/CUSTOM_CAL b/custom/CUSTOM_CAL index b513043..f9129c9 100644 --- a/custom/CUSTOM_CAL +++ b/custom/CUSTOM_CAL @@ -4,7 +4,7 @@ Custom calc resource files The following custom calc resource files are provided because they serve as examples of how use the custom interface. The custom interface allows for machine dependent and/or non-portable code to be added as -builtins to the calc program. A few example custom functions and +built-ins to the calc program. A few example custom functions and resource files are shipped with calc to provide you with examples. By default, the custom builtin returns an error. Calc have been @@ -41,7 +41,7 @@ pzasusb8.cal Run custom("pzasusb8") on a standard set of data, print Endian related information and print value size information. -## Copyright (C) 1999 Landon Curt Noll +## Copyright (C) 1999,2021 Landon Curt Noll ## ## Calc is open software; you can redistribute it and/or modify it under ## the terms of the version 2.1 of the GNU Lesser General Public License diff --git a/custom/Makefile b/custom/Makefile index 1baa45f..6bd25fe 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -229,10 +229,10 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \ # H=@: do not report hsrc file formation progress # H=@ do echo hsrc file formation progress # -# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation # S= full ${CC} output during hsrc file formation # -# E= 2>/dev/null slience command stderr during hsrc file formation +# E= 2>/dev/null silence command stderr during hsrc file formation # E= full command stderr during hsrc file formation # # V=@: do not echo debug statements (quiet mode) @@ -487,7 +487,7 @@ ALLOW_CUSTOM= -DCUSTOM # the extension required by such. # # EXT= # normal Un*x / Linux / GNU/Linux systems -# EXT=.exe # windoz / Cygwin +# EXT=.exe # Windows / Cygwin # # If in doubt, use EXT= # diff --git a/custom/Makefile.head b/custom/Makefile.head index 58fcf52..fc69672 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -229,10 +229,10 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \ # H=@: do not report hsrc file formation progress # H=@ do echo hsrc file formation progress # -# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation # S= full ${CC} output during hsrc file formation # -# E= 2>/dev/null slience command stderr during hsrc file formation +# E= 2>/dev/null silence command stderr during hsrc file formation # E= full command stderr during hsrc file formation # # V=@: do not echo debug statements (quiet mode) @@ -487,7 +487,7 @@ ALLOW_CUSTOM= -DCUSTOM # the extension required by such. # # EXT= # normal Un*x / Linux / GNU/Linux systems -# EXT=.exe # windoz / Cygwin +# EXT=.exe # Windows / Cygwin # # If in doubt, use EXT= # diff --git a/custom/c_argv.c b/custom/c_argv.c index d1a9de9..10aaa45 100644 --- a/custom/c_argv.c +++ b/custom/c_argv.c @@ -57,7 +57,7 @@ c_argv(char *UNUSED(name), int count, VALUE **vals) { VALUE result; /* what we will return */ ZVALUE zfilelen; /* length of a file as a ZVALUE */ - NUMBER *filelen; /* pointer to length of a file as a NUMER */ + NUMBER *filelen; /* pointer to length of a file as a NUMBER */ char *type; /* the name of the arg type */ int i; @@ -103,7 +103,7 @@ c_argv(char *UNUSED(name), int count, VALUE **vals) type = "assoc"; break; case V_OBJ: /* address of object structure */ - type = "ocject"; + type = "object"; break; case V_FILE: /* opened file id */ type = "file"; diff --git a/decl.h b/decl.h index 729f855..c9eb7b1 100644 --- a/decl.h +++ b/decl.h @@ -52,7 +52,7 @@ /* - * MS windoz macros + * MS Windows macros */ #elif defined(_WIN32) || defined(WINDOZ) diff --git a/file.c b/file.c index f663375..bccf41f 100644 --- a/file.c +++ b/file.c @@ -338,7 +338,7 @@ init_fileio(FILEIO *fiop, char *name, char *mode, * NOTE: This function will not return 0, 1 or 2 since they are * reserved for stdin, stdout, stderr. In fact, it must not * return 0, 1, or 2 because it will confuse those who call - * the opensearchfiile() function + * the opensearchfile() function */ FILEID openid(char *name, char *mode) @@ -383,7 +383,7 @@ openid(char *name, char *mode) /* - * openpathid - open the specified abse filename, or + * openpathid - open the specified base filename, or * relative filename along a search path * * given: @@ -398,7 +398,7 @@ openid(char *name, char *mode) * NOTE: This function will not return 0, 1 or 2 since they are * reserved for stdin, stdout, stderr. In fact, it must not * return 0, 1, or 2 because it will confuse those who call - * the opensearchfiile() function + * the opensearchfile() function */ FILEID openpathid(char *name, char *mode, char *pathlist) @@ -744,7 +744,7 @@ flushall(void) } return err; } -#endif /* Windoz free systems */ +#endif /* Windows free systems */ /* @@ -2328,7 +2328,7 @@ fscanfile(FILE *fp, char *fmt, int count, VALUE **vals) var = *vals++; count--; if (var->v_type != V_ADDR) - math_error("Assigning to nonvariable"); + math_error("Assigning to non-variable"); var = var->v_addr; subtype = var->v_subtype; freevalue(var); diff --git a/func.c b/func.c index 64e5e44..b766f85 100644 --- a/func.c +++ b/func.c @@ -4035,7 +4035,7 @@ f_d2dms(int count, VALUE **vals) v4->v_subtype = s4; /* - * calcuate the normalized return value + * calculate the normalized return value * * return_value = mod(degs, 360, rnd); */ @@ -4147,7 +4147,7 @@ f_d2dm(int count, VALUE **vals) v3->v_subtype = s3; /* - * calcuate the normalized return value + * calculate the normalized return value * * return_value = mod(degs, 360, rnd); */ @@ -4252,7 +4252,7 @@ f_g2gms(int count, VALUE **vals) v4->v_subtype = s4; /* - * calcuate the normalized return value + * calculate the normalized return value * * return_value = mod(grads, 400, rnd); */ @@ -4364,7 +4364,7 @@ f_g2gm(int count, VALUE **vals) v3->v_subtype = s3; /* - * calcuate the normalized return value + * calculate the normalized return value * * return_value = mod(grads, 400, rnd); */ @@ -4469,7 +4469,7 @@ f_h2hms(int count, VALUE **vals) v4->v_subtype = s4; /* - * calcuate the normalized return value + * calculate the normalized return value * * return_value = mod(hours, 24, rnd); */ @@ -4581,7 +4581,7 @@ f_h2hm(int count, VALUE **vals) v3->v_subtype = s3; /* - * calcuate the normalized return value + * calculate the normalized return value * * return_value = mod(hours, 24, rnd); */ @@ -6826,8 +6826,8 @@ f_usertime(void) int who = RUSAGE_SELF; /* obtain time for just this process */ int status; /* getrusage() return code */ NUMBER *ret; /* CPU time to return */ - NUMBER *secret; /* whole sconds of CPU time to return */ - NUMBER *usecret; /* microseconds of CPU time to return */ + NUMBER *secret; /* whole seconds of CPU time to return */ + NUMBER *usecret; /* microseconds of CPU time to return */ /* get the resource information for ourself */ status = getrusage(who, &usage); @@ -6865,8 +6865,8 @@ f_systime(void) int who = RUSAGE_SELF; /* obtain time for just this process */ int status; /* getrusage() return code */ NUMBER *ret; /* CPU time to return */ - NUMBER *secret; /* whole sconds of CPU time to return */ - NUMBER *usecret; /* microseconds of CPU time to return */ + NUMBER *secret; /* whole seconds of CPU time to return */ + NUMBER *usecret; /* microseconds of CPU time to return */ /* get the resource information for ourself */ status = getrusage(who, &usage); @@ -6905,8 +6905,8 @@ f_runtime(void) NUMBER *user; /* user CPU time to return */ NUMBER *sys; /* kernel CPU time to return */ NUMBER *ret; /* total CPU time to return */ - NUMBER *secret; /* whole sconds of CPU time to return */ - NUMBER *usecret; /* microseconds of CPU time to return */ + NUMBER *secret; /* whole seconds of CPU time to return */ + NUMBER *usecret; /* microseconds of CPU time to return */ /* get the resource information for ourself */ status = getrusage(who, &usage); @@ -7476,7 +7476,7 @@ f_fflush(int count, VALUE **vals) if (count == 0) { #if !defined(_WIN32) i = flushall(); -#endif /* Windoz free systems */ +#endif /* Windows free systems */ } else { for (n = 0; n < count; n++) { if (vals[n]->v_type != V_FILE) @@ -9050,9 +9050,9 @@ f_system(VALUE *vp) } else { result.v_num = itoq((long)system(vp->v_str->s_str)); } -#else /* Windoz free systems */ +#else /* Windows free systems */ result.v_num = itoq((long)system(vp->v_str->s_str)); -#endif /* Windoz free systems */ +#endif /* Windows free systems */ return result; } @@ -9097,7 +9097,7 @@ f_sleep(int count, VALUE **vals) res.v_type = V_NUM; res.v_num = itoq(time); } -#endif /* Windoz free systems */ +#endif /* Windows free systems */ return res; } @@ -10078,7 +10078,7 @@ STATIC CONST struct builtin builtins[] = { {"freeredc", 0, 0, 0, OP_NOP, 0, f_freeredc, "free redc data cache"}, {"freestatics", 0, 0, 0, OP_NOP, 0, f_freestatics, - "free all unscoped static variables"}, + "free all un-scoped static variables"}, {"freopen", 2, 3, 0, OP_NOP, 0, f_freopen, "reopen a file stream to a named file"}, {"fscan", 2, IN, FA, OP_NOP, 0, f_fscan, diff --git a/have_const.c b/have_const.c index 568f326..4f608f3 100644 --- a/have_const.c +++ b/have_const.c @@ -33,7 +33,7 @@ * This prog outputs several defines: * * HAVE_CONST - * defined ==> ok to use const + * defined ==> OK to use const * undefined ==> do not use const * * CONST diff --git a/have_offscl.c b/have_offscl.c index 35b336c..7ab331c 100644 --- a/have_offscl.c +++ b/have_offscl.c @@ -38,7 +38,7 @@ * This prog outputs several defines: * * HAVE_OFF_T_SCALAR - * defined ==> ok to perform arithmetic ops, = and comparisons + * defined ==> OK to perform arithmetic ops, = and comparisons * undefined ==> convert to ZVALUE first */ diff --git a/have_posscl.c b/have_posscl.c index 82e54a2..b574ac5 100644 --- a/have_posscl.c +++ b/have_posscl.c @@ -37,7 +37,7 @@ * This prog outputs several defines: * * HAVE_FILEPOS_SCALAR - * defined ==> ok to perform arithmetic ops, = and comparisons + * defined ==> OK to perform arithmetic ops, = and comparisons * undefined ==> convert to ZVALUE first */ diff --git a/have_stdvs.c b/have_stdvs.c index 6bc17c6..7522d8f 100644 --- a/have_stdvs.c +++ b/have_stdvs.c @@ -152,7 +152,7 @@ main(void) puts(" *"); puts(" * Systems that do not have vsnprintf() need something. In some"); puts(" * cases the snprintf function will deal correctly with the"); - puts(" * va_alist 4th arg. Same gors for a lack of an vsnprintf()"); + puts(" * va_alist 4th arg. Same goes for a lack of an vsnprintf()"); puts(" * function. In either case we use the #defines below and"); puts(" * hope for the best!"); puts(" */"); diff --git a/have_uid_t.c b/have_uid_t.c index 7139d5c..1ba564f 100644 --- a/have_uid_t.c +++ b/have_uid_t.c @@ -33,7 +33,7 @@ * This prog outputs several defines: * * HAVE_UID_T - * defined ==> ok to use uid_t + * defined ==> OK to use uid_t * undefined ==> do not use uid_t */ diff --git a/have_unused.c b/have_unused.c index 45951b7..f90a598 100644 --- a/have_unused.c +++ b/have_unused.c @@ -34,7 +34,7 @@ * This prog outputs several defines: * * HAVE_UNUSED - * defined ==> ok to use unused + * defined ==> OK to use unused * undefined ==> do not use unused * * UNUSED diff --git a/have_varvs.c b/have_varvs.c index 846c1ab..c85850f 100644 --- a/have_varvs.c +++ b/have_varvs.c @@ -141,7 +141,7 @@ main(void) puts(" *"); puts(" * Systems that do not have vsnprintf() need something. In some"); puts(" * cases the snprintf() function will deal correctly with the"); - puts(" * va_alist 4th arg. Same gors for a lack of an vsnprintf()"); + puts(" * va_alist 4th arg. Same goes for a lack of an vsnprintf()"); puts(" * function. In either case we use the #defines below and"); puts(" * hope for the best!"); puts(" */"); diff --git a/help/Makefile b/help/Makefile index 306525f..1f11aa9 100644 --- a/help/Makefile +++ b/help/Makefile @@ -220,10 +220,10 @@ T= # H=@: do not report hsrc file formation progress # H=@ do echo hsrc file formation progress # -# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation # S= full ${CC} output during hsrc file formation # -# E= 2>/dev/null slience command stderr during hsrc file formation +# E= 2>/dev/null silence command stderr during hsrc file formation # E= full command stderr during hsrc file formation # # V=@: do not echo debug statements (quiet mode) @@ -270,7 +270,7 @@ TRUE= true # the extension required by such. # # EXT= # normal Un*x / Linux / GNU/Linux systems -# EXT=.exe # windoz / Cygwin +# EXT=.exe # Windows / Cygwin # # If in doubt, use EXT= # @@ -685,7 +685,7 @@ ${SINGULAR_FILES}: ${PLURAL_FILES} # into a stand-alone program that generates a suitable function list # that is sandwiched between the top and bottom builtin help text. # -# We form funclist.c by sedding out unwanted stuff from builtins table, +# We form funclist.c by sed-ing out unwanted stuff from builtins table, # converting NUMBER* and VALUE into harmless types and converting # the showbuiltins() function into main(). Combined with the -DFUNCLIST # we will avoid all of the complex calc types, macros and defines and diff --git a/help/cfsim b/help/cfsim index 18db78f..24d4ca6 100644 --- a/help/cfsim +++ b/help/cfsim @@ -34,7 +34,7 @@ DESCRIPTION consider the two cases rnd = 8 and rnd = 16. If den(x) > 2, cfsim(x, 8) returns the value of the penultimate simple - continued-fraction approximant to x, i.e. if: + continued-fraction approximate to x, i.e. if: x = a_0 + 1/(a_1 + 1/(a_2 + ... + 1/a_n) ...)), @@ -47,7 +47,7 @@ DESCRIPTION of x described above, this is given by replacing a_n by a_n - 1. If den(x) = 2, the definition adopted is to round towards zero for the - approximant case (rnd = 8) and from zero for the "nearest" case (rnd = 16). + approximate case (rnd = 8) and from zero for the "nearest" case (rnd = 16). For integral x, cfsim(x, 8) returns zero, cfsim(x,16) returns x - sgn(x). @@ -55,7 +55,7 @@ DESCRIPTION rnd integer x half-integer x den(x) > 2 - 8 0 x - sgn(x)/2 approximant + 8 0 x - sgn(x)/2 approximate 16 x - sgn(x) x + sgn(x)/2 nearest From either cfsim(x, 0) and cfsim(x, 1), the other is easily @@ -73,7 +73,7 @@ DESCRIPTION "good" approximations to x with decreasing denominators and correspondingly decreasing accuracy; each denominator is less than half the preceding denominator. (Unlike the "forward" sequence of - continued-fraction approximants these are not necessarily alternately + continued-fraction approximates these are not necessarily alternately greater than and less than x.) Some other properties: diff --git a/help/command b/help/command index 8d84e9b..f67f564 100644 --- a/help/command +++ b/help/command @@ -226,7 +226,7 @@ Command sequence opcodes func internal opcodes for function `func' sizes size in octets of calc value types realglobals numeric global variables - statics unscoped static variables + statics un-scoped static variables numbers calc number cache redcdata REDC data defined strings calc string cache diff --git a/help/config b/help/config index ea959d8..f8b99a3 100644 --- a/help/config +++ b/help/config @@ -879,7 +879,7 @@ DESCRIPTION Returns the rate at which the operating system advances the clock on POSIX based systems. Returns 0 on non-POSIX based systems. - The non-zero value returned is in Hetrz. + The non-zero value returned is in Hertz. This config parameter is read-only and cannot be set. diff --git a/help/dms2d b/help/dms2d index 29d791d..b731286 100644 --- a/help/dms2d +++ b/help/dms2d @@ -8,7 +8,7 @@ SYNOPSIS TYPES d real m real - s real (defauls to 0) + s real (defaults to 0) rnd nonnegative integer, defaults to config("mod") return degrees @@ -16,7 +16,7 @@ TYPES DESCRIPTION Convert degrees, m minutes, and s seconds returning degrees. - The return value in degrees, is quivalent to the following: + The return value in degrees, is equivalent to the following: mod(d + m/60 + s/3600, 360, rnd); diff --git a/help/fopen b/help/fopen index 7d0daab..f07357b 100644 --- a/help/fopen +++ b/help/fopen @@ -44,8 +44,8 @@ DESCRIPTION operating system). Adding 'b' to an fopen has no effect and is ignored. - Some non-POSIX systems sucn as MS Windoz treat text files - and binary files differently. In text mode MS Windoz consider + Some non-POSIX systems such as MS Windows treat text files + and binary files differently. In text mode MS Windows consider "\r\n" and end-of-line character. On an Apple MAC, the text mode end-of-line character is "\r". diff --git a/help/fpathopen b/help/fpathopen index 91ec1d3..0f884af 100644 --- a/help/fpathopen +++ b/help/fpathopen @@ -51,7 +51,7 @@ DESCRIPTION fpathopen("fizzbin", "r", ".:/tmp:/var/tmp:~chongo/pub:~/tmp"); - This call will likely open (and create if needded) for appending, + This call will likely open (and create if needed) for appending, the file "/tmp/log" assuming that the user is not allowed to create files in the previous system directories: @@ -98,8 +98,8 @@ DESCRIPTION operating system). Adding 'b' to an fopen has no effect and is ignored. - Some non-POSIX systems sucn as MS Windoz treat text files - and binary files differently. In text mode MS Windoz consider + Some non-POSIX systems such as MS Windows treat text files + and binary files differently. In text mode MS Windows consider "\r\n" and end-of-line character. On an Apple MAC, the text mode end-of-line character is "\r". diff --git a/help/gms2g b/help/gms2g index 0027fd7..e924a46 100644 --- a/help/gms2g +++ b/help/gms2g @@ -8,7 +8,7 @@ SYNOPSIS TYPES d real m real - s real (defauls to 0) + s real (default to 0) rnd nonnegative integer, defaults to config("mod") return gradians @@ -16,7 +16,7 @@ TYPES DESCRIPTION Convert gradians, m minutes, and s seconds returning gradians. - The return value in gradians, is quivalent to the following: + The return value in gradians, is equivalent to the following: mod(d + m/60 + s/4000, 400, rnd); diff --git a/help/hms2h b/help/hms2h index 5b0edaa..b89b901 100644 --- a/help/hms2h +++ b/help/hms2h @@ -8,7 +8,7 @@ SYNOPSIS TYPES h real m real - s real (defauls to 0) + s real (defaults to 0) rnd nonnegative integer, defaults to config("mod") return hours @@ -16,7 +16,7 @@ TYPES DESCRIPTION Convert hours, m minutes, and s seconds returning hours. - The return value in hours, is quivalent to the following: + The return value in hours, is equivalent to the following: mod(h + m/60 + s/3600, 24, rnd); diff --git a/help/modify b/help/modify index 937f37d..323050c 100644 --- a/help/modify +++ b/help/modify @@ -5,7 +5,7 @@ SYNOPSIS modify(A, fname) TYPES - A lvalue with list, matrix or objectvalue + A lvalue with list, matrix or object value fname string, the name of a user-defined function return null value if successful, otherwise an error value @@ -54,7 +54,7 @@ LINK LIBRARY SEE ALSO makelist -## Copyright (C) 1999 Landon Curt Noll +## Copyright (C) 1999,2021 Landon Curt Noll ## ## Calc is open software; you can redistribute it and/or modify it under ## the terms of the version 2.1 of the GNU Lesser General Public License diff --git a/help/script b/help/script index 191b165..ef0c3f0 100644 --- a/help/script +++ b/help/script @@ -220,7 +220,7 @@ Calc shell scripts features. For example, for unquoted arguments or arguments in double quotes parameter expansion (indicated by unquoted '$') and command substitution (using backquotes) occur before lines are - compiled by calc. For example, if doit is an executable + compiled by calc. For example, if "doit" is an executable script with contents calc -q -- "$1($2)" diff --git a/help/sqrt b/help/sqrt index 604f7cf..3a48a8d 100644 --- a/help/sqrt +++ b/help/sqrt @@ -41,7 +41,7 @@ DESCRIPTION z bit 5 ((z & 32) > 0) - 0: return aprox square root + 0: return an approximation square root 1: return exact square root when real & imaginary are rational @@ -131,7 +131,7 @@ LINK LIBRARY SEE ALSO appr, epsilon -## Copyright (C) 1999 Landon Curt Noll +## Copyright (C) 1999,2021 Landon Curt Noll ## ## Calc is open software; you can redistribute it and/or modify it under ## the terms of the version 2.1 of the GNU Lesser General Public License diff --git a/hist.c b/hist.c index a7367d5..3ec1f79 100644 --- a/hist.c +++ b/hist.c @@ -651,7 +651,7 @@ read_key(void) cur_map = ent->next; if (ent->func) /* ignore Saber-C warning #65 - has 1 arg, expecting 0 */ - /* ok to ignore in proc read_key */ + /* OK to ignore in proc read_key */ (*ent->func)(key); else insert_char(key); diff --git a/input.c b/input.c index a6a1a47..162f092 100644 --- a/input.c +++ b/input.c @@ -411,7 +411,7 @@ homeexpand(char *name) return NULL; -#else /* Windoz free systems */ +#else /* Windows free systems */ struct passwd *ent; /* password entry */ char *home2; /* fullpath of the home directory */ @@ -483,7 +483,7 @@ homeexpand(char *name) snprintf(fullpath, snprintf_len, "%s%s", home2, after); fullpath[snprintf_len] = '\0'; /* paranoia */ return fullpath; -#endif /* Windoz free systems */ +#endif /* Windows free systems */ } @@ -603,7 +603,7 @@ curstream(void) * * given: * str string to be opened - * num lengh of string to open + * num length of string to open */ int openstring(char *str, size_t num) @@ -1003,14 +1003,14 @@ isinoderead(struct stat *sbuf) /* found a match */ return i; } -#else /* Windoz free systems */ +#else /* Windows free systems */ if (readset[i].active && sbuf->st_dev == readset[i].inode.st_dev && sbuf->st_ino == readset[i].inode.st_ino) { /* found a match */ return i; } -#endif /* Windoz free systems */ +#endif /* Windows free systems */ } /* no match found */ @@ -1133,14 +1133,14 @@ addreadset(char *name, char *path, struct stat *sbuf) return -1; } } -#else /* Windoz free systems */ +#else /* Windows free systems */ path_len = strlen(path); readset[ret].path = (char *)malloc(path_len+1); if (readset[ret].path == NULL) { return -1; } strlcpy(readset[ret].path, path, path_len+1); -#endif /* Windoz free systems */ +#endif /* Windows free systems */ readset[ret].inode = *sbuf; readset[ret].active = 1; diff --git a/lib_calc.c b/lib_calc.c index 4facef4..84f2ff2 100644 --- a/lib_calc.c +++ b/lib_calc.c @@ -87,11 +87,11 @@ typedef struct {int fd;} ttystruct; #if !defined(_WIN32) # if !defined(USE_SGTTY) && !defined (USE_TERMIOS) && !defined(USE_TERMIO) --=*#*=- A Windoz free system without termio, termios or sgtty!!! -=*#*=- +-=*#*=- A Windows free system without termio, termios or sgtty!!! -=*#*=- -=*#*=- We do not know how to compile for such a host, sorry!!!! -=*#*=- # endif -#endif /* Windoz */ +#endif /* Windows */ #include "banned.h" /* include after system header <> includes */ @@ -521,7 +521,7 @@ initenv(void) /* just assume . is home if all else fails */ home = strdup("."); } -#else /* Windoz free systems */ +#else /* Windows free systems */ if (home == NULL || home[0] == '\0') { /* free home if it was previously allocated, but empty */ if (home != NULL) { @@ -538,7 +538,7 @@ initenv(void) home = strdup(ent->pw_dir); } } -#endif /* Windoz free systems */ +#endif /* Windows free systems */ /* paranoia */ if (home == NULL) { math_error("Unable to allocate string for $HOME"); diff --git a/longbits.c b/longbits.c index 76339d1..b78bdd8 100644 --- a/longbits.c +++ b/longbits.c @@ -56,7 +56,7 @@ * SB32 signed 32 bit value * * HAVE_B64 - * defined ==> ok to use USB64 (unsigned 64 bit value) + * defined ==> OK to use USB64 (unsigned 64 bit value) * and SB64 (signed 64 bit value) * undefined ==> do not use USB64 nor SB64 * diff --git a/matfunc.c b/matfunc.c index edfbb1e..58c82c1 100644 --- a/matfunc.c +++ b/matfunc.c @@ -1212,7 +1212,7 @@ VALUE matdet(MATRIX *m) { long n; /* original matrix is n x n */ - long k; /* working submatrix is k x k */ + long k; /* working sub-matrix is k x k */ long i, j; VALUE *pivot, *div, *val; VALUE *vp, *vv; @@ -1251,7 +1251,7 @@ matdet(MATRIX *m) * Find the first nonzero value in the rest of the column * downwards from pivot. If there is no such value, then * the determinant is zero. If the first nonzero entry is not - * the pivot, then swap rows in the k * k submatrix, and + * the pivot, then swap rows in the k * k sub-matrix, and * remember that the determinant changes sign. */ val = pivot; diff --git a/obj.c b/obj.c index 816d8b3..33f185f 100644 --- a/obj.c +++ b/obj.c @@ -214,7 +214,7 @@ objcall(int action, VALUE *v1, VALUE *v2, VALUE *v3) char *namestr_ret; /* namestr() return string */ size_t opi_name_len; /* length of the oip name */ - /* initilaize name */ + /* initialize name */ memset(name, 0, sizeof(name)); /* initialize VALUEs */ diff --git a/opcodes.c b/opcodes.c index 3ba7103..a5637aa 100644 --- a/opcodes.c +++ b/opcodes.c @@ -3910,7 +3910,7 @@ calculate(FUNC *fp, int argcount) switch (op->o_type) { case OPNUL: /* no extra arguments */ /* ignore Saber-C warning #65 - has 1 arg, expected 0 */ - /* ok to ignore in proc calculate */ + /* OK to ignore in proc calculate */ (*op->o_func)(fp); break; @@ -3935,7 +3935,7 @@ calculate(FUNC *fp, int argcount) case OPGLB: /* global symbol reference (pointer arg) */ /* ignore Saber-C warning #68 - benign type mismatch */ - /* ok to ignore in proc calculate */ + /* OK to ignore in proc calculate */ (*op->o_func)(fp, *(&fp->f_opcodes[pc])); pc += PTR_SIZE; break; diff --git a/qfunc.c b/qfunc.c index 357caec..9d941be 100644 --- a/qfunc.c +++ b/qfunc.c @@ -466,7 +466,7 @@ qissquare(NUMBER *q) /* - * Compute the greatest integer of the Kth root of a number. + * Compute the greatest integer of the K-th root of a number. * Example: qiroot(85, 3) = 4. */ NUMBER * diff --git a/qmath.c b/qmath.c index 0654d24..d329078 100644 --- a/qmath.c +++ b/qmath.c @@ -1460,7 +1460,7 @@ qfreenum(NUMBER *q) /*NOTREACHED*/ } if (q->links != 0) { - math_error("Calling qfreenum with nozero links!!!"); + math_error("Calling qfreenum with non-zero links!!!"); /*NOTREACHED*/ } zfree(q->num); diff --git a/qtrans.c b/qtrans.c index baadb05..8447d50 100644 --- a/qtrans.c +++ b/qtrans.c @@ -79,7 +79,7 @@ STATIC NUMBER *pivalue[PI_CACHE_LEN] = { }; /* - * other static function decls + * other static function declarations */ STATIC NUMBER *qexprel(NUMBER *q, long bitnum); @@ -817,7 +817,7 @@ qpi(NUMBER *epsilon) /* - * qpidiv180 - calcucalte pi / 180 + * qpidiv180 - calculate pi / 180 * * This function returns pi/180 as used to covert between radians and degrees. */ @@ -861,7 +861,7 @@ qpidiv180(NUMBER *epsilon) /* - * qpidiv200 - calcucalte pi / 200 + * qpidiv200 - calculate pi / 200 * * This function returns pi/200 as used to covert between radians and gradians. */ @@ -1343,7 +1343,7 @@ qpower(NUMBER *q1, NUMBER *q2, NUMBER *epsilon) /* - * Calculate the Kth root of a number to within the specified accuracy. + * Calculate the K-th root of a number to within the specified accuracy. */ NUMBER * qroot(NUMBER *q1, NUMBER *q2, NUMBER *epsilon) diff --git a/quickhash.c b/quickhash.c index df9bdb8..01821e0 100644 --- a/quickhash.c +++ b/quickhash.c @@ -64,7 +64,7 @@ S_FUNC QCKHASH blk_hash(BLOCK *blk, QCKHASH val); /* * quasi_fnv - quasi Fowler/Noll/Vo-0 32 bit hash * - * NOTE: General use of FNV-0 hadh + * NOTE: General use of FNV-0 hash * * The basis of this hash algorithm was taken from an idea sent * as reviewer comments to the IEEE POSIX P1003.2 committee by: diff --git a/rpm.mk b/rpm.mk index 16e9007..ebbd25c 100644 --- a/rpm.mk +++ b/rpm.mk @@ -109,10 +109,10 @@ TMPDIR= ${RPM_TOP}/tmp # H=@: do not report hsrc file formation progress # H=@ do echo hsrc file formation progress # -# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation +# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation # S= full ${CC} output during hsrc file formation # -# E= 2>/dev/null slience command stderr during hsrc file formation +# E= 2>/dev/null silence command stderr during hsrc file formation # E= full command stderr during hsrc file formation # # V=@: do not echo debug statements (quiet mode) diff --git a/seed.c b/seed.c index 4ec40d1..f1e6216 100644 --- a/seed.c +++ b/seed.c @@ -161,7 +161,7 @@ typedef struct s_hash64 hash64; /* - * prvate_hash64_buf - perform a Fowler/Noll/Vo-1 64 bit hash + * private_hash64_buf - perform a Fowler/Noll/Vo-1 64 bit hash * * input: * buf - start of buffer to hash @@ -172,7 +172,7 @@ typedef struct s_hash64 hash64; * 64 bit hash as a static hash64 structure */ S_FUNC hash64 -prvate_hash64_buf(char *buf, unsigned len) +private_hash64_buf(char *buf, unsigned len) { hash64 hval; /* current hash value */ #if !defined(HAVE_B64) @@ -351,7 +351,7 @@ pseudo_seed(void) #endif #if defined(HAVE_GETRUSAGE) struct rusage rusage; /* resource utilization */ - struct rusage rusage_chld; /* resource utilization of children */ + struct rusage rusage_child; /* resource utilization of children */ #endif #if defined(HAVE_SYS_TIME_H) struct timeval tp2; /* time of day again */ @@ -433,7 +433,7 @@ pseudo_seed(void) #endif #if defined(HAVE_GETRUSAGE) (void) getrusage(RUSAGE_SELF, &sdata.rusage); - (void) getrusage(RUSAGE_CHILDREN, &sdata.rusage_chld); + (void) getrusage(RUSAGE_CHILDREN, &sdata.rusage_child); #endif #if defined(HAVE_SYS_TIME_H) (void) gettimeofday(&sdata.tp2, NULL); @@ -447,12 +447,12 @@ pseudo_seed(void) /* * seed the generator with the above data */ - hash_val = prvate_hash64_buf((char *)&sdata, sizeof(sdata)); + hash_val = private_hash64_buf((char *)&sdata, sizeof(sdata)); /* * load the hash data into the ZVALUE * - * We do not care about byte-order or endian issues, we just + * We do not care about byte-order or Endian issues, we just * want to load in data. */ hash.len = sizeof(hash_val) / sizeof(HALF); diff --git a/sha1.c b/sha1.c index d963098..38b665a 100644 --- a/sha1.c +++ b/sha1.c @@ -142,7 +142,7 @@ sha1Init(HASH *state) * * Note that this code, like MD5, seems to break some optimizing compilers. * It may be necessary to split it into sections, e.g., based on the four - * subrounds. One may also want to roll each subround into a loop. + * sub-rounds. One may also want to roll each sub-round into a loop. */ S_FUNC void sha1Transform(USB32 *digest, USB32 *W) @@ -510,7 +510,7 @@ sha1_type(int type, HASH *state) * sha1_init_state - initialize a hash state structure for this hash * * given: - * state - pointer to the hfunction element to initialize + * state - pointer to the function element to initialize */ void sha1_init_state(HASH *state) diff --git a/strl.c b/strl.c index ce08fda..7805cb8 100644 --- a/strl.c +++ b/strl.c @@ -160,7 +160,7 @@ strlcat(char * dst, const char * src, size_t dstsize) * firewall */ if (dst == NULL || src == NULL || dstsize <= 0) { - /* nothing can be concatinated */ + /* nothing can be concatenated */ #if defined(STRL_TEST) printf("in %s: return 0\n", __FUNCTION__); #endif /* STRL_TEST */ @@ -195,7 +195,7 @@ strlcat(char * dst, const char * src, size_t dstsize) catlen = dstsize - dstlen; /* - * perform the cancatimation + * perform the concatenation */ dst += dstlen; #if defined(STRL_TEST) diff --git a/symbol.c b/symbol.c index 211bdfb..64ca7e9 100644 --- a/symbol.c +++ b/symbol.c @@ -573,7 +573,7 @@ showstatics(void) if (count > 0) printf("\nNumber: %ld\n", count); else - printf("No unscoped static variables\n"); + printf("No un-scoped static variables\n"); } /* diff --git a/token.h b/token.h index c94e363..2e768bd 100644 --- a/token.h +++ b/token.h @@ -1,7 +1,7 @@ /* * token - token defines * - * Copyright (C) 1999-2007,2014 David I. Bell + * Copyright (C) 1999-2007,2014,2021 David I. Bell * * Calc is open software; you can redistribute it and/or modify it under * the terms of the version 2.1 of the GNU Lesser General Public License @@ -54,7 +54,7 @@ #define T_MOD 13 /* modulo sign "%" */ #define T_POWER 14 /* power sign "^" or "**" */ #define T_EQ 15 /* equality "==" */ -#define T_NE 16 /* notequal "!=" */ +#define T_NE 16 /* not-equal "!=" */ #define T_LT 17 /* less than "<" */ #define T_GT 18 /* greater than ">" */ #define T_LE 19 /* less than or equals "<=" */ @@ -69,8 +69,8 @@ #define T_MULTEQUALS 28 /* multiply equals "*=" */ #define T_DIVEQUALS 29 /* divide equals "/=" */ #define T_MODEQUALS 30 /* modulo equals "%=" */ -#define T_PLUSPLUS 31 /* plusplus "++" */ -#define T_MINUSMINUS 32 /* minusminus "--" */ +#define T_PLUSPLUS 31 /* plus-plus "++" */ +#define T_MINUSMINUS 32 /* minus-minus "--" */ #define T_COMMA 33 /* comma "," */ #define T_ANDAND 34 /* logical and "&&" */ #define T_OROR 35 /* logical or "||" */ diff --git a/value.c b/value.c index 5a9212f..8c78383 100644 --- a/value.c +++ b/value.c @@ -2988,7 +2988,7 @@ config_print(CONFIG *cfg) { NAMETYPE *cp; VALUE tmp; - int tab_over; /* TRUE => ok move over one tab stop */ + int tab_over; /* TRUE => OK move over one tab stop */ size_t len; /* diff --git a/value.h b/value.h index 5fe0b41..2ff1321 100644 --- a/value.h +++ b/value.h @@ -403,7 +403,7 @@ E_FUNC VALUE *associndex(ASSOC *ap, BOOL create, long dim, VALUE *indices); #define OBJ_ONE 1 /* create the multiplicative identity */ #define OBJ_TEST 2 /* test a value for "zero" */ #define OBJ_ADD 3 /* add two values */ -#define OBJ_SUB 4 /* subtrace one value from another */ +#define OBJ_SUB 4 /* sub-trace one value from another */ #define OBJ_NEG 5 /* negate a value */ #define OBJ_MUL 6 /* multiply two values */ #define OBJ_DIV 7 /* divide one value by another */ diff --git a/zfunc.c b/zfunc.c index 0dff5c0..41075fc 100644 --- a/zfunc.c +++ b/zfunc.c @@ -2010,7 +2010,7 @@ done: if (s == 0) { /* * Take an arbitrary root of a number (to the greatest integer). - * This uses the following iteration to get the Kth root of N: + * This uses the following iteration to get the K-th root of N: * x = ((K-1) * x + N / x^(K-1)) / K */ void @@ -2055,7 +2055,7 @@ zroot(ZVALUE z1, ZVALUE z2, ZVALUE *dest) sival.ivalue = k - 1; k1.v = &sival.silow; /* ignore Saber-C warning #112 - get ushort from uint */ - /* ok to ignore on name zroot`sival */ + /* OK to ignore on name zroot`sival */ k1.len = 1 + (sival.sihigh != 0); k1.sign = 0; z1.sign = 0; diff --git a/zio.c b/zio.c index 931de01..0735885 100644 --- a/zio.c +++ b/zio.c @@ -237,7 +237,7 @@ math_divertio(void) /* - * Undivert output and return the saved output as a string. This also + * Un-divert output and return the saved output as a string. This also * restores the output state to what it was before the diversion began. * The string needs freeing by the caller when it is no longer needed. */ diff --git a/zmath.c b/zmath.c index 8a9876e..560a4fb 100644 --- a/zmath.c +++ b/zmath.c @@ -515,7 +515,7 @@ zadd(ZVALUE z1, ZVALUE z2, ZVALUE *res) while (len--) { sival.ivalue = ((FULL) *p1++) + ((FULL) *p2++) + carry; /* ignore Saber-C warning #112 - get ushort from uint */ - /* ok to ignore on name zadd`sival */ + /* OK to ignore on name zadd`sival */ *pd++ = sival.silow; carry = sival.sihigh; } @@ -583,7 +583,7 @@ zsub(ZVALUE z1, ZVALUE z2, ZVALUE *res) carry = 0; while (--len2 >= 0) { /* ignore Saber-C warning #112 - get ushort from uint */ - /* ok to ignore on name zsub`sival */ + /* OK to ignore on name zsub`sival */ sival.ivalue = (BASE1 - ((FULL) *h1++)) + *h2++ + carry; *hd++ = (HALF)(BASE1 - sival.silow); carry = sival.sihigh; @@ -644,7 +644,7 @@ zmuli(ZVALUE z, long n, ZVALUE *res) carry = 0; while (len--) { /* ignore Saber-C warning #112 - get ushort from uint */ - /* ok to ignore on name zmuli`sival */ + /* OK to ignore on name zmuli`sival */ sival.ivalue = ((FULL) *h1++) * low + carry; *sd++ = sival.silow; carry = sival.sihigh; @@ -1587,7 +1587,7 @@ zlowbit(ZVALUE z) dataval = *zp; bitval = bitmask; /* ignore Saber-C warning #530 about empty while statement */ - /* ok to ignore in proc zlowbit */ + /* OK to ignore in proc zlowbit */ while ((*(bitval++) & dataval) == 0) { } return (n*BASEB)+(bitval-bitmask-1); @@ -1612,7 +1612,7 @@ zhighbit(ZVALUE z) bitval = bitmask+BASEB; if (dataval) { /* ignore Saber-C warning #530 about empty while statement */ - /* ok to ignore in proc zhighbit */ + /* OK to ignore in proc zhighbit */ while ((*(--bitval) & dataval) == 0) { } } diff --git a/zmath.h b/zmath.h index eab734d..e76f9e2 100644 --- a/zmath.h +++ b/zmath.h @@ -149,7 +149,7 @@ typedef SB32 SFULL; /* signed FULL */ /* - * other misc typedefs + * other miscellaneous typedefs */ typedef USB32 QCKHASH; /* 32 bit hash value */ #if defined(HAVE_B64) && LONG_BITS == 32 @@ -397,7 +397,7 @@ E_FUNC void zlcmfact(ZVALUE z, ZVALUE *dest); /* - * Misc misc functions. :-) + * miscellaneous functions. :-) */ E_FUNC void zsquaremod(ZVALUE z1, ZVALUE z2, ZVALUE *res); E_FUNC void zminmod(ZVALUE z1, ZVALUE z2, ZVALUE *res); @@ -675,7 +675,7 @@ EXTERN ZVALUE _b32_; /* _b64_ is _pow4baseval_ or _pow8baseval_ depending on BASEB */ EXTERN ZVALUE _b64_; -EXTERN HALF *half_tbl[]; /* preset HALF constants, NULL termated list */ +EXTERN HALF *half_tbl[]; /* preset HALF constants, NULL terminated list */ EXTERN BOOL _math_abort_; /* nonzero to abort calculations */ EXTERN ZVALUE _tenpowers_[]; /* table of 10^2^n */ diff --git a/zmod.c b/zmod.c index 3c889ac..8dc5318 100644 --- a/zmod.c +++ b/zmod.c @@ -1953,7 +1953,7 @@ zredcpower(REDC *rp, ZVALUE z1, ZVALUE z2, ZVALUE *res) * break; * } * } while (ret > modulus); - * ret = ((ret < 0) ? ret+modlus : ((ret == modulus) ? 0 : ret)); + * ret = ((ret < 0) ? ret+modulus : ((ret == modulus) ? 0 : ret)); * * return ret; * } @@ -2155,7 +2155,7 @@ zhnrmod(ZVALUE v, ZVALUE zh, ZVALUE zn, ZVALUE zr, ZVALUE *res) /* ... while (abs(ret) > modulus); */ } while ((zrelval = zabsrel(ret, modulus)) > 0); - /* ret = ((ret < 0) ? ret+modlus : ((ret == modulus) ? 0 : ret)); */ + /* ret = ((ret < 0) ? ret+modulus : ((ret == modulus) ? 0 : ret)); */ if (ret.sign) { zadd(ret, modulus, &t); zfree(ret); diff --git a/zmul.c b/zmul.c index 0e95a85..0efc948 100644 --- a/zmul.c +++ b/zmul.c @@ -50,7 +50,7 @@ S_FUNC LEN dosquare(HALF *vp, LEN size, HALF *ans); * Multiply two numbers using the following formula recursively: * (A*S+B)*(C*S+D) = (S^2+S)*A*C + S*(A-B)*(D-C) + (S+1)*B*D * where S is a power of 2^16, and so multiplies by it are shifts, and - * A,B,C,D are the left and right halfs of the numbers to be multiplied. + * A,B,C,D are the left and right HALFs of the numbers to be multiplied. * * given: * z1 numbers to multiply @@ -126,7 +126,7 @@ domul(HALF *v1, LEN size1, HALF *v2, LEN size2, HALF *ans) LEN sizeAB; /* size of subtraction of A and B */ LEN sizeDC; /* size of subtraction of D and C */ LEN sizeABDC; /* size of product of above two results */ - LEN subsize; /* size of difference of halfs */ + LEN subsize; /* size of difference of HALFs */ LEN copysize; /* size of number left to copy */ LEN sizetotal; /* total size of product */ LEN len; /* temporary length */ @@ -207,7 +207,7 @@ domul(HALF *v1, LEN size1, HALF *v2, LEN size2, HALF *ans) len -= 4; sival.ivalue = ((FULL) *h1++) * digit + carry; /* ignore Saber-C warning #112 - get ushort from uint */ - /* ok to ignore on name domul`sival */ + /* OK to ignore on name domul`sival */ *hd++ = sival.silow; carry = sival.sihigh; sival.ivalue = ((FULL) *h1++) * digit + carry; @@ -375,7 +375,7 @@ domul(HALF *v1, LEN size1, HALF *v2, LEN size2, HALF *ans) } /* - * Now we know that the high halfs of the numbers are nonzero, + * Now we know that the high HALFs of the numbers are nonzero, * so we can use the complete formula. * (A*S+B)*(C*S+D) = (S^2+S)*A*C + S*(A-B)*(D-C) + (S+1)*B*D. * The steps are done in the following order: @@ -643,7 +643,7 @@ domul(HALF *v1, LEN size1, HALF *v2, LEN size2, HALF *ans) * Square a number by using the following formula recursively: * (A*S+B)^2 = (S^2+S)*A^2 + (S+1)*B^2 - S*(A-B)^2 * where S is a power of 2^16, and so multiplies by it are shifts, - * and A and B are the left and right halfs of the number to square. + * and A and B are the left and right HALFs of the number to square. */ void zsquare(ZVALUE z, ZVALUE *res) @@ -715,7 +715,7 @@ dosquare(HALF *vp, LEN size, HALF *ans) LEN sizeAABB; /* size of sum of squares of A and B */ LEN sizeAB; /* size of difference of A and B */ LEN sizeABAB; /* size of square of difference of A and B */ - LEN subsize; /* size of difference of halfs */ + LEN subsize; /* size of difference of HALFs */ LEN copysize; /* size of number left to copy */ LEN sumsize; /* size of sum */ LEN sizetotal; /* total size of square */ @@ -810,7 +810,7 @@ dosquare(HALF *vp, LEN size, HALF *ans) digit = ((FULL) *hd); sival.ivalue = digit + digit + carry; /* ignore Saber-C warning #112 - get ushort from uint */ - /* ok to ignore on name dosquare`sival */ + /* OK to ignore on name dosquare`sival */ *hd++ = sival.silow; carry = sival.sihigh; } @@ -887,7 +887,7 @@ dosquare(HALF *vp, LEN size, HALF *ans) * (A-B)^2 * (S^2+S)*A^2 + (S+1)*B^2 - S*(A-B)^2. * - * Begin by forming the squares of two the halfs concatenated + * Begin by forming the squares of two the HALFs concatenated * together in the final result location. Make sure that the * highest words of the results are zero. */ @@ -957,7 +957,7 @@ dosquare(HALF *vp, LEN size, HALF *ans) } /* - * Calculate the absolute value of the difference of the two halfs + * Calculate the absolute value of the difference of the two HALFs * into a temporary location. */ if (sizeA == sizeB) { diff --git a/zprime.c b/zprime.c index 20bb5f0..ad3c965 100644 --- a/zprime.c +++ b/zprime.c @@ -161,7 +161,7 @@ zisprime(ZVALUE z) } /* ignore Saber-C warning #530 about empty for statement */ - /* ok to ignore in proc zisprime */ + /* OK to ignore in proc zisprime */ /* a number >=2^16 and < 2^32 */ for (isqr=fsqrt(n), tp=prime; (*tp <= isqr) && (n % *tp); ++tp) { } @@ -279,8 +279,8 @@ next_prime(FULL n) */ do { /* ignore Saber-C warning #530 - empty for statement */ - /* ok to ignore in proc next_prime */ - /* XXX - speed up test for large n by using gcds */ + /* OK to ignore in proc next_prime */ + /* XXX - speed up test for large n by using GCDs */ /* find a factor, or give up if not found */ for (tp=JPRIME; (*tp <= isqr) && (n % *tp); ++tp) { } @@ -368,8 +368,8 @@ zpprime(ZVALUE z) /* factor values until we find a prime */ do { /* ignore Saber-C warning #530 - empty for statement */ - /* ok to ignore in proc zpprime */ - /* XXX - speed up test for large n by using gcds */ + /* OK to ignore in proc zpprime */ + /* XXX - speed up test for large n by using GCDs */ /* find a factor, or give up if not found */ for (tp=prime; (*tp <= isqr) && (n % *tp); ++tp) { } @@ -684,7 +684,7 @@ small_factor(ZVALUE z, FULL limit) * bytes that indicate the offsets between odd values that * are not a multiple of 3,4,5,7 & 11. */ - /* XXX - speed up test for large z by using gcds */ + /* XXX - speed up test for large z by using GCDs */ j = jmp + jmpptr(NXT_MAP_PRIME); for (top=NXT_MAP_PRIME; top <= limit; top += nxtjmp(j)) { if ((val % top) == 0) { @@ -870,7 +870,7 @@ zpfact(ZVALUE z, ZVALUE *dest) } /* ignore Saber-C warning #530 about empty for statement */ - /* ok to ignore in proc zpfact */ + /* OK to ignore in proc zpfact */ /* find the next prime */ for (tp=prime; (*tp <= isqr) && (p % (long)(*tp)); ++tp) { } @@ -1601,7 +1601,7 @@ fsqrt(FULL x) } /* ignore Saber-C warning #530 about empty for statement */ - /* ok to ignore in proc fsqrt */ + /* OK to ignore in proc fsqrt */ /* determine our initial guess */ for (i=0, y=x; y >= (FULL)256; i+=8, y>>=8) { } diff --git a/zrand.c b/zrand.c index b706ffb..7afe795 100644 --- a/zrand.c +++ b/zrand.c @@ -191,7 +191,7 @@ * * The following calc code produces the same effect: * - * (* reload default subtractive table xored with low 64 seed bits *) + * (* reload default subtractive table xor-ed with low 64 seed bits *) * seed_xor = seed & ((1<<64)-1); * for (i=0; i < 100; ++i) { * subtractive[i] = xor(default_subtractive[i], seed_xor); diff --git a/zrandom.c b/zrandom.c index 2c3e86a..34abc08 100644 --- a/zrandom.c +++ b/zrandom.c @@ -891,7 +891,7 @@ * * pmod(ir,2,n) > pmod(pmod(ir,2,n),2,n) * - * Thus, for thw Blum modulus 'n', the method outlined for srandom(ir) yields + * Thus, for the Blum modulus 'n', the method outlined for srandom(ir) yields * the initial quadratic residue of: * * r = 0x748b6d882ff4b074e2f1e93a8627d626506c73ca5a62546c90f23fd7ed3e7b11e @@ -934,7 +934,7 @@ * be beyond the reach for a while. * * The lengths of the two Blum probable primes 'p' and 'q' used to make up - * the 20 Blum modului 'n=p*q' differ slightly to avoid certain + * the 20 Blum moduli 'n=p*q' differ slightly to avoid certain * factorization attacks that work on numbers that are a perfect square, * or where the two primes are nearly the same. I elected to have the * sizes differ by up to 6% of the product size to avoid such attacks. @@ -983,7 +983,7 @@ * where 'ip', 'iq' and 'ir' are large integers that are unlikely to be * 'guessed' and where numbers around the size of iq*ir are beyond * the current reach of the best factoring methods on the fastest - * SGI/Cray supercomuters. + * SGI/Cray supercomputers. * * Of course you can increase the '25' value if 1 of 4^25 odds of a * non-prime are too probable for you. @@ -2807,7 +2807,7 @@ zrandom(long cnt, ZVALUE *res) /* * If we need only part of the buffer, use * the top bits and keep the bottom in place. - * If we need extactly all of the buffer, + * If we need exactly all of the buffer, * process it as a partial buffer fill. */ if (dest.len <= blum.bits) {