summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/fsm.c6
-rw-r--r--lib/order.c3
-rw-r--r--lib/rpmal.c12
-rw-r--r--lib/rpmdb.c9
-rw-r--r--lib/rpmte.c9
-rw-r--r--lib/transaction.c10
-rw-r--r--rpmio/rpmpgp.c3
7 files changed, 34 insertions, 18 deletions
diff --git a/lib/fsm.c b/lib/fsm.c
index 32ba0d0ff..4ee70d295 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -67,7 +67,8 @@ struct fsmIterator_s {
* @param fsm file state machine
* @return transaction set
*/
-static rpmts fsmGetTs(const FSM_t fsm) {
+static rpmts fsmGetTs(const FSM_t fsm)
+{
const FSMI_t iter = fsm->iter;
return (iter ? iter->ts : NULL);
}
@@ -2263,7 +2264,8 @@ static const char * fileActionString(rpmFileAction a)
* @param a file stage
* @return formatted string
*/
-static const char * fileStageString(fileStage a) {
+static const char * fileStageString(fileStage a)
+{
switch(a) {
case FSM_UNKNOWN: return "unknown";
diff --git a/lib/order.c b/lib/order.c
index 00d2b4f9a..e709bd5fb 100644
--- a/lib/order.c
+++ b/lib/order.c
@@ -258,7 +258,8 @@ typedef struct sccData_s {
int sccCnt; /* Number of SCC's found */
} * sccData;
-static void tarjan(sccData sd, tsortInfo tsi) {
+static void tarjan(sccData sd, tsortInfo tsi)
+{
tsortInfo tsi_q;
relation rel;
diff --git a/lib/rpmal.c b/lib/rpmal.c
index 6753ca7db..15c263409 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -120,11 +120,13 @@ rpmal rpmalFree(rpmal al)
return NULL;
}
-static unsigned int fileHash(struct fileNameEntry_s file){
+static unsigned int fileHash(struct fileNameEntry_s file)
+{
return rstrhash(file.dirName) ^ rstrhash(file.baseName);
}
-static int fileCompare(struct fileNameEntry_s one, struct fileNameEntry_s two) {
+static int fileCompare(struct fileNameEntry_s one, struct fileNameEntry_s two)
+{
int rc = 0;
rc = strcmp(one.dirName, two.dirName);
if (!rc)
@@ -154,7 +156,8 @@ void rpmalDel(rpmal al, rpmte p)
alp->p = NULL;
}
-static void rpmalAddFiles(rpmal al, rpmalNum pkgNum, rpmfi fi){
+static void rpmalAddFiles(rpmal al, rpmalNum pkgNum, rpmfi fi)
+{
struct fileNameEntry_s fileName;
struct availableIndexEntry_s fileEntry;
int i;
@@ -178,7 +181,8 @@ static void rpmalAddFiles(rpmal al, rpmalNum pkgNum, rpmfi fi){
}
}
-static void rpmalAddProvides(rpmal al, rpmalNum pkgNum, rpmds provides){
+static void rpmalAddProvides(rpmal al, rpmalNum pkgNum, rpmds provides)
+{
struct availableIndexEntry_s indexEntry;
rpm_color_t dscolor;
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 60ebf8739..92b2d5dd1 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -1299,15 +1299,18 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi)
return NULL;
}
-unsigned int rpmdbGetIteratorOffset(rpmdbMatchIterator mi) {
+unsigned int rpmdbGetIteratorOffset(rpmdbMatchIterator mi)
+{
return (mi ? mi->mi_offset : 0);
}
-unsigned int rpmdbGetIteratorFileNum(rpmdbMatchIterator mi) {
+unsigned int rpmdbGetIteratorFileNum(rpmdbMatchIterator mi)
+{
return (mi ? mi->mi_filenum : 0);
}
-int rpmdbGetIteratorCount(rpmdbMatchIterator mi) {
+int rpmdbGetIteratorCount(rpmdbMatchIterator mi)
+{
return (mi && mi->mi_set ? mi->mi_set->count : 0);
}
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 448a35af9..acc985f81 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -449,7 +449,8 @@ rpm_loff_t rpmtePkgFileSize(rpmte te)
return (te != NULL ? te->pkgFileSize : 0);
}
-unsigned int rpmteHeaderSize(rpmte te) {
+unsigned int rpmteHeaderSize(rpmte te)
+{
return (te != NULL ? te->headerSize : 0);
}
@@ -478,7 +479,8 @@ void rpmteSetTSI(rpmte te, tsortInfo tsi)
te->tsi = tsi;
}
-void rpmteSetDependsOn(rpmte te, rpmte depends) {
+void rpmteSetDependsOn(rpmte te, rpmte depends)
+{
te->depends = depends;
}
@@ -823,7 +825,8 @@ const char * rpmteTypeString(rpmte te)
}
}
-rpmfs rpmteGetFileStates(rpmte te) {
+rpmfs rpmteGetFileStates(rpmte te)
+{
return te->fs;
}
diff --git a/lib/transaction.c b/lib/transaction.c
index f2f7e4752..bf2e48012 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -228,7 +228,8 @@ static void rpmtsUpdateDSI(const rpmts ts, dev_t dev, const char *dirName,
}
/* return DSI of the device the rpmdb lives on */
-static rpmDiskSpaceInfo rpmtsDbDSI(const rpmts ts) {
+static rpmDiskSpaceInfo rpmtsDbDSI(const rpmts ts)
+{
const char *dbhome = rpmdbHome(rpmtsGetRdb(ts));
struct stat sb;
int rc;
@@ -241,8 +242,8 @@ static rpmDiskSpaceInfo rpmtsDbDSI(const rpmts ts) {
}
/* Update DSI for changing size of the rpmdb */
-static void rpmtsUpdateDSIrpmDBSize(const rpmte p,
- rpmDiskSpaceInfo dsi) {
+static void rpmtsUpdateDSIrpmDBSize(const rpmte p, rpmDiskSpaceInfo dsi)
+{
rpm_loff_t headerSize;
int64_t bneeded;
@@ -288,7 +289,8 @@ static void rpmtsCheckDSIProblems(const rpmts ts, const rpmte te)
}
}
-static void rpmtsFreeDSI(rpmts ts){
+static void rpmtsFreeDSI(rpmts ts)
+{
rpmDiskSpaceInfo dsi;
if (ts == NULL)
return;
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 28ae48f81..3da67710a 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -1626,7 +1626,8 @@ static void at_forkchild(void)
_new_process = 1;
}
-int rpmInitCrypto(void) {
+int rpmInitCrypto(void)
+{
int rc = 0;
/* Lazy NSS shutdown for re-initialization after fork() */