Mercurial > hg
view mercurial/bitmanipulation.h @ 51723:9367571fea21
cext: correct the argument handling of `b85encode()`
The type stub indicated that this argument is `Optional`, which implies None is
allowed. I don't see in the documentation where that's the case for `i`[1], and
trying it in `hg debugshell` resulted in the method failing with a TypeError. I
guess it was typed as an `int` argument because the `p` format unit wasn't added
until Python 3.3[2].
In any event, 2 clients in core (`pvec` and `obsolete`) call this with no
argument supplied, and `mdiff` calls it with True. So I guess we've avoided the
None arg case, and when no arg is supplied, it defaults to the 0 initialization
of the `pad` variable in C. Since the `p` format unit accepts both `int` and
None, as well as `bool`, I'm not bothering to bump the module version- this code
is more permissive than it was, in addition to being more correct.
Interestingly, when I first imported the `cext` and `pure` methods in the same
manner as the previous commit, it dropped the `Optional` part of the argument
type when generating `util.pyi`. No idea why.
[1] https://docs.python.org/3/c-api/arg.html#numbers
[2] https://docs.python.org/3/c-api/arg.html#other-objects
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 20 Jul 2024 01:55:09 -0400 |
parents | d86908050375 |
children |
line wrap: on
line source
#ifndef HG_BITMANIPULATION_H #define HG_BITMANIPULATION_H #include <string.h> #include "compat.h" /* Reads a 64 bit integer from big-endian bytes. Assumes that the data is long enough */ static inline uint64_t getbe64(const char *c) { const unsigned char *d = (const unsigned char *)c; return ((((uint64_t)d[0]) << 56) | (((uint64_t)d[1]) << 48) | (((uint64_t)d[2]) << 40) | (((uint64_t)d[3]) << 32) | (((uint64_t)d[4]) << 24) | (((uint64_t)d[5]) << 16) | (((uint64_t)d[6]) << 8) | (d[7])); } static inline uint32_t getbe32(const char *c) { const unsigned char *d = (const unsigned char *)c; return ((((uint32_t)d[0]) << 24) | (((uint32_t)d[1]) << 16) | (((uint32_t)d[2]) << 8) | (d[3])); } static inline int16_t getbeint16(const char *c) { const unsigned char *d = (const unsigned char *)c; return ((d[0] << 8) | (d[1])); } static inline uint16_t getbeuint16(const char *c) { const unsigned char *d = (const unsigned char *)c; return ((d[0] << 8) | (d[1])); } /* Writes a 64 bit integer to bytes in a big-endian format. Assumes that the buffer is long enough */ static inline void putbe64(uint64_t x, char *c) { c[0] = (x >> 56) & 0xff; c[1] = (x >> 48) & 0xff; c[2] = (x >> 40) & 0xff; c[3] = (x >> 32) & 0xff; c[4] = (x >> 24) & 0xff; c[5] = (x >> 16) & 0xff; c[6] = (x >> 8) & 0xff; c[7] = (x)&0xff; } static inline void putbe32(uint32_t x, char *c) { c[0] = (x >> 24) & 0xff; c[1] = (x >> 16) & 0xff; c[2] = (x >> 8) & 0xff; c[3] = (x)&0xff; } static inline double getbefloat64(const char *c) { const unsigned char *d = (const unsigned char *)c; double ret; int i; uint64_t t = 0; for (i = 0; i < 8; i++) { t = (t << 8) + d[i]; } memcpy(&ret, &t, sizeof(t)); return ret; } #endif