ds->Flags = xmalloc(sizeof(*ds->Flags));
ds->Flags[0] = Flags;
ds->i = 0;
- { char t[2];
- t[0] = ds->Type[0];
- t[1] = '\0';
- ds->DNEVR = rpmdsNewDNEVR(t, ds);
- }
exit:
return rpmdsLink(ds, (ds ? ds->Type : NULL));
if (ds != NULL) {
i = ds->i;
ds->i = ix;
+ ds->DNEVR = _free(ds->DNEVR);
}
return i;
}
const char * DNEVR = NULL;
if (ds != NULL && ds->i >= 0 && ds->i < ds->Count) {
- if (ds->DNEVR != NULL)
- DNEVR = ds->DNEVR;
+ if (ds->DNEVR == NULL) {
+ char t[2] = { ds->Type[0], '\0' };
+ ds->DNEVR = rpmdsNewDNEVR(t, ds);
+ }
+ DNEVR = ds->DNEVR;
}
return DNEVR;
}
void rpmdsNotify(rpmds ds, const char * where, int rc)
{
+ const char *DNEVR;
+
if (!rpmIsDebug())
return;
if (!(ds != NULL && ds->i >= 0 && ds->i < ds->Count))
return;
- if (!(ds->Type != NULL && ds->DNEVR != NULL))
+ if (!(ds->Type != NULL && (DNEVR = rpmdsDNEVR(ds)) != NULL))
return;
rpmlog(RPMLOG_DEBUG, "%9s: %-45s %-s %s\n", ds->Type,
- (!strcmp(ds->DNEVR, "cached") ? ds->DNEVR : ds->DNEVR+2),
+ (!strcmp(DNEVR, "cached") ? DNEVR : DNEVR+2),
(rc ? _("NO ") : _("YES")),
(where != NULL ? where : ""));
}
if (ds != NULL && ++ds->i >= 0) {
if (ds->i < ds->Count) {
- char t[2];
i = ds->i;
ds->DNEVR = _free(ds->DNEVR);
- t[0] = ((ds->Type != NULL) ? ds->Type[0] : '\0');
- t[1] = '\0';
- ds->DNEVR = rpmdsNewDNEVR(t, ds);
-
} else
ds->i = -1;
rpmds rpmdsInit(rpmds ds)
{
- if (ds != NULL)
+ if (ds != NULL) {
ds->i = -1;
+ ds->DNEVR = _free(ds->DNEVR);
+ }
return ds;
}