summaryrefslogtreecommitdiff
path: root/mallocx.c
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2019-09-11 01:11:04 +0300
committerIvan Maidanski <ivmai@mail.ru>2019-09-11 01:11:04 +0300
commita20818be9ec660588af325d82e515ebb75bd9905 (patch)
treecf0766e19fa5ee4380f2236ab4bf088b7cd5d330 /mallocx.c
parentfe3a50824e878995999462843aff679d52e9f61b (diff)
downloadbdwgc-a20818be9ec660588af325d82e515ebb75bd9905.tar.gz
Workaround 'argument to function is always 1' cppcheck false positives
* allchblk.c (GC_print_hblkfreelist): Replace "while(p!=0)" with "while(p)"; add a marker that the change is for cppcheck. * allchblk.c (GC_free_block_ending_at, GC_add_to_fl, GC_split_block, GC_allochblk_nth, GC_freehblk): Replace "if(p!=0)" with "if(p)". * alloc.c (GC_set_fl_marks): Likewise. * extra/MacOS.c (GC_MacFreeTemporaryMemory): Likewise. * mallocx.c (GC_generic_malloc_many): Likewise. * allchblk.c (GC_allochblk_nth): Replace "if(0==p)" with "if(p){}else". * malloc.c (GC_free): Likewise. * malloc.c (GC_generic_malloc_uncollectable): Replace "if(0==p)return 0;<code>;return p;" with "if(p){<code>}return p;". * mallocx.c (GC_generic_malloc_many): Replace "p+=v;while((p2=*p)!=0)" with "for(p+=v;(p2=*p)!=0;)". * reclaim.c (GC_continue_reclaim, GC_reclaim_all): Likewise.
Diffstat (limited to 'mallocx.c')
-rw-r--r--mallocx.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mallocx.c b/mallocx.c
index 1aa45699..217988a8 100644
--- a/mallocx.c
+++ b/mallocx.c
@@ -349,8 +349,7 @@ GC_API void GC_CALL GC_generic_malloc_many(size_t lb, int k, void **result)
struct hblk * hbp;
hdr * hhdr;
- rlh += lg;
- while ((hbp = *rlh) != 0) {
+ for (rlh += lg; (hbp = *rlh) != NULL; ) {
hhdr = HDR(hbp);
*rlh = hhdr -> hb_next;
GC_ASSERT(hhdr -> hb_sz == lb);
@@ -441,7 +440,7 @@ GC_API void GC_CALL GC_generic_malloc_many(size_t lb, int k, void **result)
/* Next try to allocate a new block worth of objects of this size. */
{
struct hblk *h = GC_allochblk(lb, k, 0);
- if (h != 0) {
+ if (h /* != NULL */) { /* CPPCHECK */
if (IS_UNCOLLECTABLE(k)) GC_set_hdr_marks(HDR(h));
GC_bytes_allocd += HBLKSIZE - HBLKSIZE % lb;
# ifdef PARALLEL_MARK