mirror of
https://github.com/lcn2/calc.git
synced 2025-08-16 01:03:29 +03:00
prep for calc version 2.14.1.4
Updated COPYING file to indicate that these files are now covered under "The Unlicense" (see https://unlicense.org): sha1.c sha1.h cal/dotest.cal cal/screen.cal Updated help/credit to match the above changes to COPYING. Updated CONTRIB-CODE and calc.man to refer to using GitHub pull requests for contributing to calc (instead of using Email). Updated BUGS and calc.man to refer to using GitHub issues for reporting calc bugs (instead of using Email). Updated QUESTIONS and calc.man to refer to using GitHub issues for asking calc questions (instead of using Email). Fixed Makefile.local command example to refer to overriding the Makefile variable DEBUG (instead of CDEBUG). Fixed all make chk ASAN warnings under macOS 13.2.1 when calc is compiled with the following uncommented lines in Makefile.local: DEBUG:= -O0 -g CFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined LDFLAGS+= -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined CALC_ENV+= ASAN_OPTIONS=detect_stack_use_after_return=1 Improved how pointers to functions are declared for the builtins array in func.c to avoid function declarations without a prototype that is now deprecated in C. Improved how pointers to functions are declared for the opcodes array in opcodes.c to avoid function declarations without a prototype Replaced use of egrep with grep -E in Makefiles. Fixed cases where variables were set but not used in symbol.c, calc.c, and the main function in func.c as used by funclist.c. Added rule name to "DO NOT EDIT -- generated by the Makefile" lines in constructed files. Test if <sys/vfs.h> exists and set HAVE_SYS_VFS_H accordingly in have_sys_vfs.h. Added HAVE_SYS_VFS_H to allow one to force this value. Test if <sys/param.h> exists and set HAVE_SYS_PARAM_H accordingly in have_sys_param.h. Added HAVE_SYS_PARAM_H to allow one to force this value. Test if <sys/mount.h> exists and set HAVE_SYS_MOUNT_H accordingly in have_sys_mount.h. Added HAVE_SYS_MOUNT_H to allow one to force this value. Test if the system as the statfs() system call and set HAVE_STATFS accordingly in have_statfs.h. Added HAVE_STATFS to allow one to force this value. The pseudo_seed() function will also try to call statfs() if possible and permitted by the HAVE_STATFS value.
This commit is contained in:
44
value.h
44
value.h
@@ -167,7 +167,8 @@ struct value {
|
||||
#define V_OPTR 19 /* octet address as pointer */
|
||||
#define V_SPTR 20 /* string address as pointer */
|
||||
#define V_NPTR 21 /* number address as pointer */
|
||||
#define V_MAX 21 /* highest legal value */
|
||||
|
||||
#define V_MAX V_NPTR /* highest legal value - must be last and match highest V_something value */
|
||||
|
||||
#define V_NOSUBTYPE 0 /* subtype has no meaning */
|
||||
#define V_NOASSIGNTO 1 /* protection status 1 */
|
||||
@@ -189,7 +190,46 @@ struct value {
|
||||
*/
|
||||
|
||||
|
||||
#define TWOVAL(a,b) ((a) << 5 | (b)) /* for switch of two values */
|
||||
/*
|
||||
* NOTE: The shift of 8 in TWOVAL() macro below assumes V_MAX < 1<<8
|
||||
*
|
||||
* The macro TWOVAL_ARGS_OK(a,b) will return true if both a and b are in range,
|
||||
* otherwise it will return false.
|
||||
*
|
||||
* The TWOVAL_INVALID is a value that TWOVAL_ARGS_OK(a,b) is true,
|
||||
* will never match a TWOVAL(a,b) value (i.e., using V_something defined values).
|
||||
*
|
||||
* The TWOVAL_AS_UINT(a,b) may be assigned to a unsigned int value so that
|
||||
* with one switches on that unsigned int, cases with a and/or b being
|
||||
* out of range will fall into the default (non-matching) case.
|
||||
*
|
||||
* unsigned int twoval_as_uint;
|
||||
*
|
||||
* ...
|
||||
*
|
||||
* twoval_as_uint = TWOVAL_AS_UINT(a,b);
|
||||
* switch (twoval_as_uint) {
|
||||
* case TWOVAL(V_INT,V_INT):
|
||||
* ...
|
||||
* break;
|
||||
* case TWOVAL(V_INT,V_NUM):
|
||||
* ...
|
||||
* break;
|
||||
* default:
|
||||
* ...
|
||||
* break;
|
||||
* }
|
||||
*
|
||||
* If a is NOT 0 <= a <= V_MAX or if b is NOT 0 <= b <= V_MAX,
|
||||
* when () macro returns -1 (all bits set) in order to
|
||||
* not match and true TWOVAL() macro combination that uses
|
||||
* uses a V_something defined value above.
|
||||
*/
|
||||
|
||||
#define TWOVAL(a,b) ((unsigned int)(((a) << 8) | (b))) /* logical OR for switch of two V_something values */
|
||||
#define TWOVAL_ARGS_OK(a,b) (((a) >= 0) && ((a) <= V_MAX) && ((b) >= 0) && ((b) <= V_MAX))
|
||||
#define TWOVAL_INVALID ((unsigned int)(-1)) /* never a valid TWOVAL(a,b) value when a and b are in range */
|
||||
#define TWOVAL_AS_UINT(a,b) (TWOVAL_ARGS_OK(a,b) ? TWOVAL(a,b) : TWOVAL_INVALID)
|
||||
|
||||
#define NULL_VALUE ((VALUE *) 0)
|
||||
|
||||
|
Reference in New Issue
Block a user