X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Frepo.c;h=4fc38b7557e5dcd2b3ee5120499589e97685807f;hb=db67f9cb45157f2d4660a8fc2f24dcf3957d4b7c;hp=b178564b9209675c814e1edef9f8891acd27432a;hpb=65c03f653ca233e092f2ebe7f0254146d71a1b2d;p=platform%2Fupstream%2Flibsolv.git diff --git a/src/repo.c b/src/repo.c index b178564..4fc38b7 100644 --- a/src/repo.c +++ b/src/repo.c @@ -334,7 +334,7 @@ repo_sidedata_extend(Repo *repo, void *b, size_t size, Id p, int count) { int d = repo->start - p; b = sat_extend(b, n, d, size, REPO_SIDEDATA_BLOCK); - memmove(b + d * size, b, n * size); + memmove((char*)b + d * size, b, n * size); memset(b, 0, d * size); n += d; } @@ -342,7 +342,7 @@ repo_sidedata_extend(Repo *repo, void *b, size_t size, Id p, int count) { int d = p + count - repo->end; b = sat_extend(b, n, d, size, REPO_SIDEDATA_BLOCK); - memset(b + n * size, 0, d * size); + memset((char*)b + n * size, 0, d * size); } return b; } @@ -812,7 +812,7 @@ repo_lookup_str(Repo *repo, Id entry, Id keyname) } for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue; @@ -834,13 +834,13 @@ repo_lookup_num(Repo *repo, Id entry, Id keyname, unsigned int notfound) if (keyname == RPM_RPMDBID) { - if (repo->rpmdbid && entry && entry >= repo->start && entry < repo->end) + if (repo->rpmdbid && entry >= repo->start && entry < repo->end) return repo->rpmdbid[entry - repo->start]; return notfound; } for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue; @@ -879,7 +879,7 @@ repo_lookup_id(Repo *repo, Id entry, Id keyname) } for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue; @@ -907,7 +907,7 @@ repo_lookup_bin_checksum(Repo *repo, Id entry, Id keyname, Id *typep) int i, j; for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue; @@ -932,7 +932,7 @@ repo_lookup_void(Repo *repo, Id entry, Id keyname) int i, j; for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue;