static int pkg_constraint_satisfied(pkg_t *pkg, void *cdata)
{
depend_t *depend = (depend_t *)cdata;
-#if 0
- pkg_t * temp = pkg_new();
- int comparison;
- parseVersion(temp, depend->version);
- comparison = pkg_compare_versions(pkg, temp);
- free(temp);
-
- fprintf(stderr, "%s: pkg=%s pkg->version=%s constraint=%p type=%d version=%s comparison=%d satisfied=%d\n",
- __FUNCTION__, pkg->name, pkg->version,
- depend, depend->constraint, depend->version,
- comparison, version_constraints_satisfied(depend, pkg));
-#endif
if (version_constraints_satisfied(depend, pkg))
return 1;
else
pkg_vec_t *unsatisfied, char *** unresolved)
{
pkg_t * satisfier_entry_pkg;
- register int i, j, k;
+ int i, j, k;
int count, found;
char ** the_lost;
abstract_pkg_t * ab_pkg;
pkg_t *satisfying_pkg =
pkg_hash_fetch_best_installation_candidate(conf, satisfying_apkg,
pkg_installed_and_constraint_satisfied,
- dependence_to_satisfy, 1);
+ dependence_to_satisfy, 1, NULL);
/* Being that I can't test constraing in pkg_hash, I will test it here */
if (satisfying_pkg != NULL) {
if (!pkg_installed_and_constraint_satisfied ( satisfying_pkg,dependence_to_satisfy)) {
pkg_t *satisfying_pkg =
pkg_hash_fetch_best_installation_candidate(conf, satisfying_apkg,
pkg_constraint_satisfied,
- dependence_to_satisfy, 1);
+ dependence_to_satisfy, 1, NULL);
/* Being that I can't test constraing in pkg_hash, I will test it here too */
if (satisfying_pkg != NULL) {
if (!pkg_constraint_satisfied ( satisfying_pkg,dependence_to_satisfy)) {
compound_depend_t * conflicts;
depend_t ** possible_satisfiers;
depend_t * possible_satisfier;
- register int i, j, k;
+ int i, j, k;
int count;
abstract_pkg_t * ab_pkg;
pkg_t **pkg_scouts;
static int is_pkg_in_pkg_vec(pkg_vec_t * vec, pkg_t * pkg)
{
- register int i;
+ int i;
pkg_t ** pkgs = vec->pkgs;
for(i = 0; i < vec->len; i++)
{
int oldlen = 0, newlen = 0;
char ** result;
- register int i, j;
+ int i, j;
if(!newstuff)
return oldstuff;
void printDepends(pkg_t * pkg)
{
- register int i, j;
+ int i, j;
compound_depend_t * depend;
int count;
int buildProvides(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
{
- register int i, j;
+ int i, j;
/* every pkg provides itself */
abstract_pkg_vec_insert(ab_pkg->provided_by, ab_pkg);
if (pkg->provides)
return 0;
- pkg->provides = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * (pkg->provides_count + 1));
+ pkg->provides = (abstract_pkg_t **)calloc((pkg->provides_count + 1), sizeof(abstract_pkg_t *));
if (pkg->provides == NULL) {
fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
return -1 ;
/* Abhaya: added conflicts support */
int buildConflicts(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
{
- register int i;
+ int i;
compound_depend_t * conflicts;
if (!pkg->conflicts_count)
return 0;
- conflicts = pkg->conflicts = malloc(sizeof(compound_depend_t) *
- pkg->conflicts_count);
+ conflicts = pkg->conflicts = calloc(pkg->conflicts_count, sizeof(compound_depend_t));
if (conflicts == NULL) {
fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
return -1;
conflicts->type = CONFLICTS;
parseDepends(conflicts, hash,
pkg->conflicts_str[i]);
-#if 0
- for (j = 0; j < conflicts->possibility_count; j++) {
- depend_t *possibility = conflicts->possibilities[j];
- abstract_pkg_t *conflicting_apkg = possibility->pkg;
- pkg_add_conflict_pair(ab_pkg, conflicting_apkg);
- }
-#endif
conflicts++;
}
return 0;
int buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg)
{
- register int i, j;
+ int i, j;
if (!pkg->replaces_count)
return 0;
- pkg->replaces = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * pkg->replaces_count);
+ pkg->replaces = (abstract_pkg_t **)calloc(pkg->replaces_count, sizeof(abstract_pkg_t *));
if (pkg->replaces == NULL) {
fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
return -1;
}
- // if (strcmp(ab_pkg->name, pkg->name))
- // fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name);
-
for(i = 0; i < pkg->replaces_count; i++){
abstract_pkg_t *old_abpkg = ensure_abstract_pkg_by_name(hash, pkg->replaces_str[i]);
int buildDepends(hash_table_t * hash, pkg_t * pkg)
{
int count;
- register int i;
+ int i;
compound_depend_t * depends;
if(!(count = pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count))
if (0 && pkg->pre_depends_count)
fprintf(stderr, "pkg=%s pre_depends_count=%d depends_count=%d\n",
pkg->name, pkg->pre_depends_count, pkg->depends_count);
- depends = pkg->depends = malloc(sizeof(compound_depend_t) * count);
+ depends = pkg->depends = calloc(count, sizeof(compound_depend_t));
if (depends == NULL) {
fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
return -1;
{
compound_depend_t * depends;
int count, othercount;
- register int i, j;
+ int i, j;
abstract_pkg_t * ab_depend;
abstract_pkg_t ** temp;
static depend_t * depend_init(void)
{
- depend_t * d = (depend_t *)malloc(sizeof(depend_t));
+ depend_t * d = (depend_t *)calloc(1, sizeof(depend_t));
if ( d==NULL ){
fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
return NULL;
{
char * pkg_name, buffer[2048];
int num_of_ors = 0;
- register int i;
- register char * src, * dest;
+ int i;
+ char * src, * dest;
depend_t ** possibilities;
/* first count the number of ored possibilities for satisfying dependency */
compound_depend->type = DEPEND;
compound_depend->possibility_count = num_of_ors + 1;
- possibilities = (depend_t **)malloc(sizeof(depend_t *) * (num_of_ors + 1));
+ possibilities = (depend_t **)calloc((num_of_ors + 1), sizeof(depend_t *) );
if (!possibilities)
return -ENOMEM;
compound_depend->possibilities = possibilities;