| defs.h | | defs.h | |
| | | | |
| skipping to change at line 164 | | skipping to change at line 164 | |
| #ifndef S_IWUGO | | #ifndef S_IWUGO | |
| # define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) | | # define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) | |
| #endif | | #endif | |
| #ifndef S_IXUGO | | #ifndef S_IXUGO | |
| # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) | | # define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) | |
| #endif | | #endif | |
| #ifndef S_IRWXUGO | | #ifndef S_IRWXUGO | |
| # define S_IRWXUGO (S_IRUGO | S_IWUGO | S_IXUGO) | | # define S_IRWXUGO (S_IRUGO | S_IWUGO | S_IXUGO) | |
| #endif | | #endif | |
| | | | |
|
| | | #define HXSIZEOF_Z16 sizeof("-65536") | |
| /* 2^32 and -2^31 have differing length */ | | /* 2^32 and -2^31 have differing length */ | |
| #define HXSIZEOF_Z32 sizeof("-4294967296") | | #define HXSIZEOF_Z32 sizeof("-4294967296") | |
| /* 2^64 and -2^63 have same length */ | | /* 2^64 and -2^63 have same length */ | |
| #define HXSIZEOF_Z64 sizeof("18446744073709551616") | | #define HXSIZEOF_Z64 sizeof("18446744073709551616") | |
| | | | |
| #define __HX_STRINGIFY_EXPAND(s) #s | | #define __HX_STRINGIFY_EXPAND(s) #s | |
| #define HX_STRINGIFY(s) __HX_STRINGIFY_EXPAND(s) | | #define HX_STRINGIFY(s) __HX_STRINGIFY_EXPAND(s) | |
| | | | |
| #endif /* _LIBHX_DEFS_H */ | | #endif /* _LIBHX_DEFS_H */ | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| map.h | | map.h | |
| #ifndef _LIBHX_MAP_H | | #ifndef _LIBHX_MAP_H | |
| #define _LIBHX_MAP_H 1 | | #define _LIBHX_MAP_H 1 | |
| | | | |
|
| #include <sys/types.h> | | #ifdef __cplusplus | |
| #ifndef __cplusplus | | # include <cstddef> | |
| | | #else | |
| # include <stdbool.h> | | # include <stdbool.h> | |
|
| | | # include <stddef.h> | |
| #endif | | #endif | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| /** | | /** | |
| * Abstract: | | * Abstract: | |
| * %HXMAPT_DEFAULT: whatever is fast and maps k-v, without preference | | * %HXMAPT_DEFAULT: whatever is fast and maps k-v, without preference | |
| * %HXMAPT_ORDERED: anything ordered, no further preference | | * %HXMAPT_ORDERED: anything ordered, no further preference | |
| | | | |
| skipping to change at line 57 | | skipping to change at line 59 | |
| HXMAP_CKEY = 1 << 29, | | HXMAP_CKEY = 1 << 29, | |
| HXMAP_SDATA = 1 << 30, | | HXMAP_SDATA = 1 << 30, | |
| HXMAP_CDATA = 1 << 31, | | HXMAP_CDATA = 1 << 31, | |
| | | | |
| HXMAP_SCKEY = HXMAP_SKEY | HXMAP_CKEY, | | HXMAP_SCKEY = HXMAP_SKEY | HXMAP_CKEY, | |
| HXMAP_SCDATA = HXMAP_SDATA | HXMAP_CDATA, | | HXMAP_SCDATA = HXMAP_SDATA | HXMAP_CDATA, | |
| }; | | }; | |
| | | | |
| /** | | /** | |
| * Flags for the traverser | | * Flags for the traverser | |
|
| | | * %HXMAP_NOFLAGS: Mnemonic for no flags | |
| * %HXMAP_DTRAV: Support deletion of elements while traversing | | * %HXMAP_DTRAV: Support deletion of elements while traversing | |
| */ | | */ | |
| enum { | | enum { | |
|
| | | HXMAP_NOFLAGS = 0, | |
| HXMAP_DTRAV = 1 << 0, | | HXMAP_DTRAV = 1 << 0, | |
| }; | | }; | |
| | | | |
| struct HXmap_trav; | | struct HXmap_trav; | |
| | | | |
| /** | | /** | |
| * @items: number of items in the map | | * @items: number of items in the map | |
| * @flags: flags for this map | | * @flags: flags for this map | |
| */ | | */ | |
| struct HXmap { | | struct HXmap { | |
| | | | |
End of changes. 4 change blocks. |
| 2 lines changed or deleted | | 6 lines changed or added | |
|
| option.h | | option.h | |
| #ifndef _LIBHX_OPTION_H | | #ifndef _LIBHX_OPTION_H | |
| #define _LIBHX_OPTION_H 1 | | #define _LIBHX_OPTION_H 1 | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
|
| | | # include <cstddef> | |
| # include <cstdio> | | # include <cstdio> | |
| #else | | #else | |
|
| | | # include <stddef.h> | |
| # include <stdio.h> | | # include <stdio.h> | |
| #endif | | #endif | |
|
| #include <sys/types.h> | | | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| #ifndef __libhx_internal_hxmc_t_defined | | #ifndef __libhx_internal_hxmc_t_defined | |
| #define __libhx_internal_hxmc_t_defined 1 | | #define __libhx_internal_hxmc_t_defined 1 | |
| typedef char hxmc_t; | | typedef char hxmc_t; | |
| #endif | | #endif | |
| | | | |
|
| struct HXformat_map; | | | |
| struct HXoption; | | struct HXoption; | |
| | | | |
| /* | | /* | |
| * FORMAT.C | | * FORMAT.C | |
| */ | | */ | |
| extern struct HXformat_map *HXformat_init(void); | | extern struct HXformat_map *HXformat_init(void); | |
| extern void HXformat_free(struct HXformat_map *); | | extern void HXformat_free(struct HXformat_map *); | |
| extern int HXformat_add(struct HXformat_map *, const char *, const void *, | | extern int HXformat_add(struct HXformat_map *, const char *, const void *, | |
| unsigned int); | | unsigned int); | |
|
| extern int HXformat_aprintf(const struct HXformat_map *, | | | |
| hxmc_t **, const char *); | | | |
| extern int HXformat_sprintf(const struct HXformat_map *, | | | |
| char *, size_t, const char *); | | | |
| extern int HXformat_fprintf(const struct HXformat_map *, | | | |
| FILE *, const char *); | | | |
| extern int HXformat2_aprintf(const struct HXformat_map *, | | extern int HXformat2_aprintf(const struct HXformat_map *, | |
| hxmc_t **, const char *); | | hxmc_t **, const char *); | |
| extern int HXformat2_sprintf(const struct HXformat_map *, | | extern int HXformat2_sprintf(const struct HXformat_map *, | |
| char *, size_t, const char *); | | char *, size_t, const char *); | |
| extern int HXformat2_fprintf(const struct HXformat_map *, | | extern int HXformat2_fprintf(const struct HXformat_map *, | |
| FILE *, const char *); | | FILE *, const char *); | |
| | | | |
| /* | | /* | |
| * OPT.C | | * OPT.C | |
| */ | | */ | |
| | | | |
End of changes. 5 change blocks. |
| 8 lines changed or deleted | | 2 lines changed or added | |
|