Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Code cleanup: remove accidental self-assigns in mbr.c that have no effect #1197

Merged
merged 2 commits into from
Apr 15, 2024
Merged

Code cleanup: remove accidental self-assigns in mbr.c that have no effect #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f7f247
Code cleanup: remove accidental self-assigns in mbr.c that have no ef…
micahsnyder Mar 6, 2024
0aee605
Eliminate unused param warnigns when MPOOL disabled
micahsnyder Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions libclamav/hashtab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ cl_error_t cli_hashtab_init(struct cli_hashtable *s, size_t capacity)

cl_error_t cli_htu32_init(struct cli_htu32 *s, size_t capacity, mpool_t *mempool)
{
#ifndef USE_MPOOL
UNUSEDPARAM(mempool);
#endif

if (!s)
return CL_ENULLARG;

Expand Down Expand Up @@ -491,6 +495,10 @@ cl_error_t cli_htu32_insert(struct cli_htu32 *s, const struct cli_htu32_element
size_t tries = 1;
size_t idx;

#ifndef USE_MPOOL
UNUSEDPARAM(mempool);
#endif

if (!s)
return CL_ENULLARG;
if (s->used > s->maxfill) {
Expand Down Expand Up @@ -582,6 +590,10 @@ void cli_hashtab_free(struct cli_hashtable *s)

void cli_htu32_free(struct cli_htu32 *s, mpool_t *mempool)
{
#ifndef USE_MPOOL
UNUSEDPARAM(mempool);
#endif

MPOOL_FREE(mempool, s->htable);
s->htable = NULL;
s->capacity = 0;
Expand Down Expand Up @@ -707,9 +719,9 @@ void cli_hashset_destroy(struct cli_hashset *hs)
hs->capacity = 0;
}

#define BITMAP_CONTAINS(bmap, val) ((bmap)[(val) >> 5] & ((uint64_t)1 << ((val)&0x1f)))
#define BITMAP_INSERT(bmap, val) ((bmap)[(val) >> 5] |= ((uint64_t)1 << ((val)&0x1f)))
#define BITMAP_REMOVE(bmap, val) ((bmap)[(val) >> 5] &= ~((uint64_t)1 << ((val)&0x1f)))
#define BITMAP_CONTAINS(bmap, val) ((bmap)[(val) >> 5] & ((uint64_t)1 << ((val) & 0x1f)))
#define BITMAP_INSERT(bmap, val) ((bmap)[(val) >> 5] |= ((uint64_t)1 << ((val) & 0x1f)))
#define BITMAP_REMOVE(bmap, val) ((bmap)[(val) >> 5] &= ~((uint64_t)1 << ((val) & 0x1f)))

/*
* searches the hashset for the @key.
Expand Down
5 changes: 0 additions & 5 deletions libclamav/mbr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,22 +179,19 @@ cl_error_t cli_scanmbr(cli_ctx *ctx, size_t sectorsize)
/* MBR checks */
status = mbr_check_mbr(&mbr, maplen, sectorsize);
if (status != CL_SUCCESS) {
status = status;
goto done;
}

/* MBR is valid, examine bootstrap code */
status = cli_magic_scan_nested_fmap_type(ctx->fmap, 0, sectorsize, ctx, CL_TYPE_ANY, NULL, LAYER_ATTRIBUTES_NONE);
if (status != CL_SUCCESS) {
status = status;
goto done;
}

/* check that the partition table has no intersections - HEURISTICS */
if (SCAN_HEURISTIC_PARTITION_INTXN && (ctx->dconf->other & OTHER_CONF_PRTNINTXN)) {
status = mbr_primary_partition_intersection(ctx, mbr, sectorsize);
if (status != CL_SUCCESS) {
status = status;
goto done;
}
}
Expand Down Expand Up @@ -225,7 +222,6 @@ cl_error_t cli_scanmbr(cli_ctx *ctx, size_t sectorsize)
status = mbr_scanextprtn(ctx, &prtncount, mbr.entries[i].firstLBA,
mbr.entries[i].numLBA, sectorsize);
if (status != CL_SUCCESS) {
status = status;
goto done;
}
} else {
Expand All @@ -236,7 +232,6 @@ cl_error_t cli_scanmbr(cli_ctx *ctx, size_t sectorsize)
mbr_parsemsg("cli_magic_scan_nested_fmap_type: [%u, +%u)\n", partoff, partsize);
status = cli_magic_scan_nested_fmap_type(ctx->fmap, partoff, partsize, ctx, CL_TYPE_PART_ANY, NULL, LAYER_ATTRIBUTES_NONE);
if (status != CL_SUCCESS) {
status = status;
goto done;
}
}
Expand Down
Loading