From 2c33cda178ca09de08a073af484caaeb2e4d7102 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Tue, 8 Sep 2020 12:32:04 +0200 Subject: [PATCH] Rename collhandle to more accurate collpkg --- ext/repo_updateinfoxml.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ext/repo_updateinfoxml.c b/ext/repo_updateinfoxml.c index 36d76b5d..d90d906f 100644 --- a/ext/repo_updateinfoxml.c +++ b/ext/repo_updateinfoxml.c @@ -110,7 +110,7 @@ struct parsedata { Id handle; Solvable *solvable; time_t buildtime; - Id collhandle; + Id pkghandle; struct solv_xmlparser xmlp; struct joindata jd; }; @@ -326,12 +326,12 @@ startElement(struct solv_xmlparser *xmlp, int state, const char *name, const cha solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, id, 0); } - /* who needs the collection anyway? */ - pd->collhandle = repodata_new_handle(pd->data); - repodata_set_id(pd->data, pd->collhandle, UPDATE_COLLECTION_NAME, n); - repodata_set_id(pd->data, pd->collhandle, UPDATE_COLLECTION_EVR, evr); + /* UPDATE_COLLECTION is misnamed, it should have been UPDATE_PACKAGE */ + pd->pkghandle = repodata_new_handle(pd->data); + repodata_set_id(pd->data, pd->pkghandle, UPDATE_COLLECTION_NAME, n); + repodata_set_id(pd->data, pd->pkghandle, UPDATE_COLLECTION_EVR, evr); if (a) - repodata_set_id(pd->data, pd->collhandle, UPDATE_COLLECTION_ARCH, a); + repodata_set_id(pd->data, pd->pkghandle, UPDATE_COLLECTION_ARCH, a); break; } case STATE_MODULE: @@ -428,14 +428,14 @@ endElement(struct solv_xmlparser *xmlp, int state, char *content) break; case STATE_PACKAGE: - repodata_add_flexarray(pd->data, pd->handle, UPDATE_COLLECTION, pd->collhandle); - pd->collhandle = 0; + repodata_add_flexarray(pd->data, pd->handle, UPDATE_COLLECTION, pd->pkghandle); + pd->pkghandle = 0; break; /* libntlm-0.4.2-1.fc8.x86_64.rpm */ /* libntlm-0.4.2-1.fc8.x86_64.rpm */ case STATE_FILENAME: - repodata_set_str(pd->data, pd->collhandle, UPDATE_COLLECTION_FILENAME, content); + repodata_set_str(pd->data, pd->pkghandle, UPDATE_COLLECTION_FILENAME, content); break; /* True */ @@ -444,7 +444,7 @@ endElement(struct solv_xmlparser *xmlp, int state, char *content) { /* FIXME: this is per-package, the global flag should be computed at runtime */ repodata_set_void(pd->data, pd->handle, UPDATE_REBOOT); - repodata_set_void(pd->data, pd->collhandle, UPDATE_REBOOT); + repodata_set_void(pd->data, pd->pkghandle, UPDATE_REBOOT); } break; @@ -454,7 +454,7 @@ endElement(struct solv_xmlparser *xmlp, int state, char *content) { /* FIXME: this is per-package, the global flag should be computed at runtime */ repodata_set_void(pd->data, pd->handle, UPDATE_RESTART); - repodata_set_void(pd->data, pd->collhandle, UPDATE_RESTART); + repodata_set_void(pd->data, pd->pkghandle, UPDATE_RESTART); } break; @@ -464,7 +464,7 @@ endElement(struct solv_xmlparser *xmlp, int state, char *content) { /* FIXME: this is per-package, the global flag should be computed at runtime */ repodata_set_void(pd->data, pd->handle, UPDATE_RELOGIN); - repodata_set_void(pd->data, pd->collhandle, UPDATE_RELOGIN); + repodata_set_void(pd->data, pd->pkghandle, UPDATE_RELOGIN); } break; default: -- 2.47.2