krosh/ARSV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix C type and portability warnings

Browse Source
This commit is contained in:
krosh
2026-07-30 04:34:16 +03:00
parent 292421d970
commit 4bd99cf68f
1 changed files with 78 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reimplement/set9.c
+12 -25
View File
@@ -26,7 +26,7 @@ struct set {
}* symbols_v; }* symbols_v;
}; };
struct set* set_new() { struct set* set_new(void) {
struct set* set = xmalloc(sizeof *set); struct set* set = xmalloc(sizeof *set);
set->cnt = 0; set->cnt = 0;
set->symbols_cap = 0; set->symbols_cap = 0;
@@ -201,23 +201,9 @@ static int encode_set_size(int cnt, int bpp) {
* how multiple escapes are avoided. * how multiple escapes are avoided.
*/ */
static char* bits_to_char(int c, char* base62) {
assert(c >= 0 && c <= 61);
if (c < 10) {
*base62++ = c + '0';
} else if (c < 36) {
*base62++ = c - 10 + 'a';
} else if (c < 62) {
*base62++ = c - 36 + 'A';
}
return base62;
}
// --- // ---
static inline char encode_bpp(int bpp) { return bpp - 7 + 'a'; } static inline char encode_bpp(int bpp) { return (char)(bpp - 7 + 'a'); }
struct encode_writer { struct encode_writer {
uint64_t bits; uint64_t bits;
@@ -339,7 +325,7 @@ const char* set_fini(struct set* set, int bpp) {
} }
unsigned unique_hash[set->cnt]; unsigned unique_hash[set->cnt];
size_t unique_cnt = 0; int unique_cnt = 0;
// delete duplicates // delete duplicates
for (size_t i = 0; i < set->cnt; ++i) { for (size_t i = 0; i < set->cnt; ++i) {
@@ -407,7 +393,7 @@ static int set_meta_fini(struct set_meta* meta) {
return 0; return 0;
} }
// UCHAR_MAX == 255 // UCHAR_MAX == 255
static const unsigned char char_to_num[255 + 1] = {[0] = 0xff, /* конец строки */ __extension__ static const unsigned char char_to_num[255 + 1] = {[0] = 0xff, /* конец строки */
[1 ...('0' - 1)] = 0xee, [1 ...('0' - 1)] = 0xee,
@@ -631,7 +617,8 @@ static int cache_decode_set(struct set_meta* meta, int target_bpp, const unsigne
int len = (int)meta->len; int len = (int)meta->len;
int capacity = meta->value_capacity; int capacity = meta->value_capacity;
struct cache_ent* ent = xmalloc(sizeof(*ent) + (size_t)(capacity) * sizeof(unsigned) + len + 1); struct cache_ent* ent =
xmalloc(sizeof(*ent) + (size_t)capacity * sizeof(unsigned) + (size_t)len + 1);
ent->hash_arr = (unsigned*)(ent + 1); ent->hash_arr = (unsigned*)(ent + 1);
ent->str = (char*)(ent->hash_arr + capacity); ent->str = (char*)(ent->hash_arr + capacity);
@@ -760,7 +747,7 @@ static int downsample_set(int cnt, const unsigned* hash_pt, unsigned* ds_pt, int
while (v1 < v1_end) *ds_pt++ = *v1++; while (v1 < v1_end) *ds_pt++ = *v1++;
while (v2 < v2_end) *ds_pt++ = *v2++ & mask; while (v2 < v2_end) *ds_pt++ = *v2++ & mask;
return ds_pt - ds_start; return (int)(ds_pt - ds_start);
} }
static const unsigned* step_lower_bound(const unsigned* first, const unsigned* last, unsigned value, static const unsigned* step_lower_bound(const unsigned* first, const unsigned* last, unsigned value,
@@ -901,11 +888,11 @@ int main(void) {
set1 = set_free(set1); set1 = set_free(set1);
set2 = set_free(set2); set2 = set_free(set2);
str10 = _free(str10); str10 = _free((void*)str10);
str11 = _free(str11); str11 = _free((void*)str11);
str20 = _free(str20); str20 = _free((void*)str20);
str21 = _free(str21); str21 = _free((void*)str21);
str22 = _free(str22); str22 = _free((void*)str22);
fprintf(stderr, "%s: api test OK\n", __FILE__); fprintf(stderr, "%s: api test OK\n", __FILE__);