[zypp-commit] r9177 - in /trunk/sat-solver/src: dirpool.c pool.c repodata.c util.h

Author: matz Date: Mon Mar 17 16:04:03 2008 New Revision: 9177 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9177&view=rev Log: Initialize all allocated array members for blocky arrays (when it matters, e.g. when extending also in blocks). Modified: trunk/sat-solver/src/dirpool.c trunk/sat-solver/src/pool.c trunk/sat-solver/src/repodata.c trunk/sat-solver/src/util.h Modified: trunk/sat-solver/src/dirpool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/dirpool.c?rev=9177&r1=9176&r2=9177&view=diff ============================================================================== --- trunk/sat-solver/src/dirpool.c (original) +++ trunk/sat-solver/src/dirpool.c Mon Mar 17 16:04:03 2008 @@ -32,8 +32,7 @@ if (!dp->ndirs) return; dp->dirs = sat_extend_resize(dp->dirs, dp->ndirs, sizeof(Id), DIR_BLOCK); - dirtraverse = sat_extend_resize(0, dp->ndirs, sizeof(Id), DIR_BLOCK); - memset(dirtraverse, 0, dp->ndirs * sizeof(Id)); + dirtraverse = sat_calloc_block(dp->ndirs, sizeof(Id), DIR_BLOCK); for (parent = 0, i = 0; i < dp->ndirs; i++) { if (dp->dirs[i] > 0) @@ -100,4 +99,3 @@ dp->dirtraverse[dp->ndirs] = 0; return dp->ndirs++; } - Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=9177&r1=9176&r2=9177&view=diff ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Mon Mar 17 16:04:03 2008 @@ -124,7 +124,7 @@ stringpool_init (&pool->ss, initpool_data); - /* alloc space for ReDep 0 */ + /* alloc space for RelDep 0 */ pool->rels = sat_extend_resize(0, 1, sizeof(Reldep), REL_BLOCK); pool->nrels = 1; memset(pool->rels, 0, sizeof(Reldep)); @@ -339,10 +339,8 @@ pool_freeidhashes(pool); /* XXX: should not be here! */ pool_freewhatprovides(pool); num = pool->ss.nstrings; - pool->whatprovides = whatprovides = sat_extend_resize(0, num, sizeof(Offset), WHATPROVIDES_BLOCK); - memset(whatprovides, 0, num * sizeof(Offset)); - pool->whatprovides_rel = sat_extend_resize(0, pool->nrels, sizeof(Offset), WHATPROVIDES_BLOCK); - memset(pool->whatprovides_rel, 0, pool->nrels * sizeof(Offset)); + pool->whatprovides = whatprovides = sat_calloc_block(num, sizeof(Offset), WHATPROVIDES_BLOCK); + pool->whatprovides_rel = sat_calloc_block(pool->nrels, sizeof(Offset), WHATPROVIDES_BLOCK); /* count providers for each name */ for (i = 1; i < pool->nsolvables; i++) Modified: trunk/sat-solver/src/repodata.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repodata.c?rev=9177&r1=9176&r2=9177&view=diff ============================================================================== --- trunk/sat-solver/src/repodata.c (original) +++ trunk/sat-solver/src/repodata.c Mon Mar 17 16:04:03 2008 @@ -872,8 +872,7 @@ return; if (!data->incoreoffset) { - data->incoreoffset = sat_extend_resize(data->incoreoffset, num, sizeof(Id), REPODATA_BLOCK); - memset(data->incoreoffset, 0, num * sizeof(Id)); + data->incoreoffset = sat_calloc_block(num, sizeof(Id), REPODATA_BLOCK); data->start = start; data->end = start + num; return; @@ -896,8 +895,8 @@ int i; if (!data->attrs) { - data->attrs = sat_extend_resize(0, data->end - data->start, sizeof(Id *), REPODATA_BLOCK); - memset(data->attrs, 0, (data->end - data->start) * sizeof(Id *)); + data->attrs = sat_calloc_block(data->end - data->start, sizeof(Id *), + REPODATA_BLOCK); } i = 0; if (data->attrs[entry]) Modified: trunk/sat-solver/src/util.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/util.h?rev=9177&r1=9176&r2=9177&view=diff ============================================================================== --- trunk/sat-solver/src/util.h (original) +++ trunk/sat-solver/src/util.h Mon Mar 17 16:04:03 2008 @@ -14,6 +14,7 @@ #define SATSOLVER_UTIL_H #include +#include extern void *sat_malloc(size_t); extern void *sat_malloc2(size_t, size_t); @@ -44,4 +45,13 @@ return buf; } +static inline void *sat_calloc_block(size_t len, size_t size, size_t block) +{ + void *buf; + if (!len) + return 0; + buf = sat_malloc2((len + block) & ~block, size); + memset(buf, 0, ((len + block) & ~block) * size); + return buf; +} #endif /* SATSOLVER_UTIL_H */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org