diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-03-31 08:42:33 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-03-31 08:42:33 +0300 |
| commit | ed07bf20d3bffaa4d99b4b6db2460b1046d7ead3 (patch) | |
| tree | e184507302a66a96eaa91f48a624fd3e0c32f29d /lib/rpmds.c | |
| parent | de4c3a999fcfa2bcf6772b4165b7e0ff1c8edb54 (diff) | |
| download | librpm-tizen-ed07bf20d3bffaa4d99b4b6db2460b1046d7ead3.tar.gz librpm-tizen-ed07bf20d3bffaa4d99b4b6db2460b1046d7ead3.tar.bz2 librpm-tizen-ed07bf20d3bffaa4d99b4b6db2460b1046d7ead3.zip | |
Bunch of formatting & indentation fixes to rpmds
Diffstat (limited to 'lib/rpmds.c')
| -rw-r--r-- | lib/rpmds.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/rpmds.c b/lib/rpmds.c index 403409cf8..ac88e756b 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -311,11 +311,14 @@ rpmds rpmdsSingle(rpmTag tagN, const char * N, const char * EVR, rpmsenseFlags F ds->BT = now; } ds->Count = 1; - ds->N = xmalloc(sizeof(*ds->N)); ds->N[0] = N; + ds->N = xmalloc(sizeof(*ds->N)); + ds->N[0] = N; ds->Nt = RPM_FORCEFREE_TYPE; /* XXX to insure that hfd will free */ - ds->EVR = xmalloc(sizeof(*ds->EVR)); ds->EVR[0] = EVR; + ds->EVR = xmalloc(sizeof(*ds->EVR)); + ds->EVR[0] = EVR; ds->EVRt = RPM_FORCEFREE_TYPE; /* XXX to insure that hfd will free */ - ds->Flags = xmalloc(sizeof(*ds->Flags)); ds->Flags[0] = Flags; + ds->Flags = xmalloc(sizeof(*ds->Flags)); + ds->Flags[0] = Flags; ds->i = 0; { char t[2]; t[0] = ds->Type[0]; @@ -634,7 +637,7 @@ int rpmdsMerge(rpmds * dsp, rpmds ods) const char ** EVR; rpmsenseFlags * Flags; int j; -int save; + int save; if (dsp == NULL || ods == NULL) return -1; @@ -653,7 +656,7 @@ int save; /* * Add new entries. */ -save = ods->i; + save = ods->i; ods = rpmdsInit(ods); if (ods != NULL) while (rpmdsNext(ods) >= 0) { @@ -688,7 +691,8 @@ assert(ods->Flags != NULL); if (ds->u > 0) memcpy(Flags, ds->Flags, ds->u * sizeof(*Flags)); if (ds->u < ds->Count) - memcpy(Flags + ds->u + 1, ds->Flags + ds->u, (ds->Count - ds->u) * sizeof(*Flags)); + memcpy(Flags + ds->u + 1, ds->Flags + ds->u, + (ds->Count - ds->u) * sizeof(*Flags)); Flags[ds->u] = ods->Flags[ods->i]; ds->Flags = _free(ds->Flags); ds->Flags = Flags; @@ -697,7 +701,7 @@ assert(ods->Flags != NULL); ds->Count++; } -ods->i = save; + ods->i = save; return 0; } |