folkslinux
/
tdnf
mirror of https://github.com/vmware/tdnf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

client: address cppcheck warnings 

Signed-off-by: Shreenidhi Shedi <shreenidhi.shedi@broadcom.com>
This commit is contained in:
Shreenidhi Shedi 2024-03-14 22:26:02 +05:30
parent a32029d173
commit fa54ec8ea3
6 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
client/api.c
View File

@ -2209,7 +2209,7 @@ TDNFHistoryResolve(
for (int i = 0; i < hd->added_count; i++)
{
char *pszPkgName = history_get_nevra(hnm, hd->added_ids[i]);
const char *pszPkgName = history_get_nevra(hnm, hd->added_ids[i]);
if (pszPkgName)
{
if (strncmp(pszPkgName, "gpg-pubkey-", 11) == 0)
@ -2258,7 +2258,7 @@ TDNFHistoryResolve(
for (int i = 0; i < hd->removed_count; i++)
{
char *pszPkgName = history_get_nevra(hnm, hd->removed_ids[i]);
const char *pszPkgName = history_get_nevra(hnm, hd->removed_ids[i]);
if (pszPkgName)
{
if (strncmp(pszPkgName, "gpg-pubkey-", 11) == 0)
@ -2404,20 +2404,33 @@ TDNFHistoryList(
pHistoryInfoItems[i].nAddedCount = tas[i].delta.added_count;
pHistoryInfoItems[i].nRemovedCount = tas[i].delta.removed_count;
if (hnm)
if (!hnm)
continue;
if (tas[i].delta.added_count > 0)
{
dwError = TDNFAllocateMemory(tas[i].delta.added_count, sizeof(char *), (void **)&pHistoryInfoItems[i].ppszAddedPkgs);
dwError = TDNFAllocateMemory(tas[i].delta.added_count,
sizeof(char *),
(void **)&pHistoryInfoItems[i].ppszAddedPkgs);
BAIL_ON_TDNF_ERROR(dwError);
for (int j = 0; j < tas[i].delta.added_count; j++)
{
dwError = TDNFAllocateString(history_get_nevra(hnm, tas[i].delta.added_ids[j]),
&pHistoryInfoItems[i].ppszAddedPkgs[j]);
&pHistoryInfoItems[i].ppszAddedPkgs[j]);
BAIL_ON_TDNF_ERROR(dwError);
}
dwError = TDNFAllocateMemory(tas[i].delta.removed_count, sizeof(char *), (void **)&pHistoryInfoItems[i].ppszRemovedPkgs);
}
if (tas[i].delta.removed_count > 0)
{
dwError = TDNFAllocateMemory(tas[i].delta.removed_count,
sizeof(char *),
(void **)&pHistoryInfoItems[i].ppszRemovedPkgs);
BAIL_ON_TDNF_ERROR(dwError);
for (int j = 0; j < tas[i].delta.removed_count; j++)
{
dwError = TDNFAllocateString(history_get_nevra(hnm, tas[i].delta.removed_ids[j]),
&pHistoryInfoItems[i].ppszRemovedPkgs[j]);
&pHistoryInfoItems[i].ppszRemovedPkgs[j]);
BAIL_ON_TDNF_ERROR(dwError);
}
}

1
client/config.c
View File

@ -119,7 +119,6 @@ TDNFReadConfig(
/* defaults */
pConf->nGPGCheck = 0;
pConf->nInstallOnlyLimit = 1;
pConf->nCleanRequirementsOnRemove = 0;
pConf->nKeepCache = 0;
pConf->nOpenMax = TDNF_DEFAULT_OPENMAX;

21
client/goal.c
View File

@ -12,7 +12,7 @@ static
uint32_t
TDNFGoalGetAllResultsIgnoreNoData(
Transaction* pTrans,
Solver* pSolv,
const Solver* pSolv,
PTDNF_SOLVED_PKG_INFO* ppInfo,
PTDNF pTdnf,
int nReInstall
@ -633,7 +633,7 @@ error:
uint32_t
TDNFAddUserInstall(
PTDNF pTdnf,
Queue* pQueueGoal,
const Queue* pQueueGoal,
PTDNF_SOLVED_PKG_INFO ppInfo
)
{
@ -737,7 +737,6 @@ TDNFMarkAutoInstalled(
*/
for (pPkgInfo = ppInfo->pPkgsToInstall; pPkgInfo; pPkgInfo = pPkgInfo->pNext)
{
int rc;
const char *pszName = pPkgInfo->pszName;
int nFlag = 1;
/* check if user installed */
@ -757,7 +756,7 @@ TDNFMarkAutoInstalled(
}
if (!nAutoOnly || nFlag == 1)
{
rc = history_set_auto_flag(pHistoryCtx, pszName, nFlag);
int rc = history_set_auto_flag(pHistoryCtx, pszName, nFlag);
if (rc != 0)
{
dwError = ERROR_TDNF_HISTORY_ERROR;
@ -854,7 +853,7 @@ static
uint32_t
TDNFGoalGetAllResultsIgnoreNoData(
Transaction* pTrans,
Solver* pSolv,
const Solver* pSolv,
PTDNF_SOLVED_PKG_INFO* ppInfo,
PTDNF pTdnf,
int nReInstall
@ -1078,7 +1077,7 @@ TDNFSolvCheckInstallOnlyLimitInTrans(
for (int j = 0; j < pTrans->steps.count; j++) {
Id idType;
Id idPkg = pTrans->steps.elements[j];
Solvable *s = pool_id2solvable(pPool, idPkg);
const Solvable *s = pool_id2solvable(pPool, idPkg);
if (idName == s->name) {
idType = transaction_type(pTrans, idPkg,
@ -1160,7 +1159,7 @@ TDNFSolvAddMinVersions(
for (int i = 0; ppszPackages && ppszPackages[i]; i++)
{
char *pszPkg = ppszPackages[i];
const char *pszPkg = ppszPackages[i];
dwError = TDNFAllocateString(pszPkg, &pszTmp);
BAIL_ON_TDNF_ERROR(dwError);
@ -1247,7 +1246,7 @@ TDNFSolvAddProtectPkgs(
/* assuming that all erase jobs that we added use SOLVER_SOLVABLE */
if (((how & SOLVER_JOBMASK) == SOLVER_ERASE) && (how & SOLVER_SOLVABLE)) {
Id what = pQueueJobs->elements[j+1];
Solvable *s = pool_id2solvable(pPool, what);
s = pool_id2solvable(pPool, what);
for (i = 0; i < qPkgs.count; i++) {
if (qPkgs.elements[i] == s->name)
break;
@ -1259,10 +1258,10 @@ TDNFSolvAddProtectPkgs(
for (i = 0; i < pQueueJobs->count; i += 2) {
if (i == j)
continue;
Id how = pQueueJobs->elements[i];
how = pQueueJobs->elements[i];
if (((how & SOLVER_JOBMASK) == SOLVER_INSTALL) && (how & SOLVER_SOLVABLE)) {
Id what_add = pQueueJobs->elements[i+1];
Solvable *s_add = pool_id2solvable(pPool, what_add);
const Solvable *s_add = pool_id2solvable(pPool, what_add);
if (s_add->name == s->name) {
break;
}
@ -1342,7 +1341,7 @@ TDNFSolvCheckProtectPkgsInTrans(
if (idType == SOLVER_TRANSACTION_OBSOLETED ||
idType == SOLVER_TRANSACTION_ERASE) {
int j;
Solvable *s = pool_id2solvable(pPool, idPkg);
const Solvable *s = pool_id2solvable(pPool, idPkg);
for (j = 0; j < qPkgs.count; j++) {
if (qPkgs.elements[j] == s->name) {
pr_err("package %s would be %s but it is protected\n",

4
client/prototypes.h
View File

@ -400,7 +400,7 @@ TDNFHistoryGoal(
uint32_t
TDNFAddUserInstall(
PTDNF pTdnf,
Queue* pQueueGoal,
const Queue* pQueueGoal,
PTDNF_SOLVED_PKG_INFO ppInfo
);
@ -708,7 +708,7 @@ TDNFDownloadRepoMDParts(
uint32_t
TDNFLoadReposFromFile(
PTDNF pTdnf,
char* pszRepoFile,
const char* pszRepoFile,
PTDNF_REPO_DATA* ppRepos
);

6
client/repolist.c
View File

@ -368,7 +368,7 @@ error:
uint32_t
TDNFEventRepoReadConfigEnd(
PTDNF pTdnf,
struct cnfnode *cn_section
const struct cnfnode *cn_section
)
{
uint32_t dwError = 0;
@ -402,7 +402,7 @@ error:
uint32_t
TDNFEventRepoReadConfigStart(
PTDNF pTdnf,
struct cnfnode *cn_section
const struct cnfnode *cn_section
)
{
uint32_t dwError = 0;
@ -436,7 +436,7 @@ error:
uint32_t
TDNFLoadReposFromFile(
PTDNF pTdnf,
char* pszRepoFile,
const char* pszRepoFile,
PTDNF_REPO_DATA* ppRepos
)
{

2
client/rpmtrans.c
View File

@ -149,7 +149,7 @@ TDNFRunTransactionWithHistory(
PTDNF pTdnf,
PTDNFRPMTS pTS,
struct history_ctx *pHistoryCtx,
char *pszCmdLine
const char *pszCmdLine
)
{
uint32_t dwError = 0;