Lines 485-491
var_hrswinst(struct variable * vp,
Link Here
|
485 |
#else |
485 |
#else |
486 |
# ifdef HAVE_LIBRPM |
486 |
# ifdef HAVE_LIBRPM |
487 |
char *rpm_groups; |
487 |
char *rpm_groups; |
488 |
if ( headerGetEntry(swi->swi_h, RPMTAG_GROUP, NULL, (void **) &rpm_groups, NULL) ) { |
488 |
if ( headerGet(swi->swi_h, RPMTAG_GROUP,(void **) &rpm_groups, HEADERGET_DEFAULT) ) { |
489 |
if ( strstr(rpm_groups, "System Environment") != NULL ) |
489 |
if ( strstr(rpm_groups, "System Environment") != NULL ) |
490 |
long_return = 2; /* operatingSystem */ |
490 |
long_return = 2; /* operatingSystem */ |
491 |
else |
491 |
else |
Lines 504-510
var_hrswinst(struct variable * vp,
Link Here
|
504 |
{ |
504 |
{ |
505 |
#ifdef HAVE_LIBRPM |
505 |
#ifdef HAVE_LIBRPM |
506 |
int32_t *rpm_data; |
506 |
int32_t *rpm_data; |
507 |
if ( headerGetEntry(swi->swi_h, RPMTAG_INSTALLTIME, NULL, (void **) &rpm_data, NULL) ) { |
507 |
if ( headerGet(swi->swi_h, RPMTAG_INSTALLTIME, (void **) &rpm_data, HEADERGET_DEFAULT) ) { |
508 |
time_t installTime = *rpm_data; |
508 |
time_t installTime = *rpm_data; |
509 |
ret = date_n_time(&installTime, var_len); |
509 |
ret = date_n_time(&installTime, var_len); |
510 |
} else { |
510 |
} else { |
Lines 690-700
Save_HR_SW_info(int ix)
Link Here
|
690 |
swi->swi_h = h; |
690 |
swi->swi_h = h; |
691 |
swi->swi_prevx = ix; |
691 |
swi->swi_prevx = ix; |
692 |
|
692 |
|
693 |
headerGetEntry(swi->swi_h, RPMTAG_NAME, NULL, (void **) &n, NULL); |
693 |
headerGet(swi->swi_h, RPMTAG_NAME, (void **) &n, HEADERGET_DEFAULT); |
694 |
headerGetEntry(swi->swi_h, RPMTAG_VERSION, NULL, (void **) &v, |
694 |
headerGet(swi->swi_h, RPMTAG_VERSION, (void **) &v, |
695 |
NULL); |
695 |
HEADERGET_DEFAULT); |
696 |
headerGetEntry(swi->swi_h, RPMTAG_RELEASE, NULL, (void **) &r, |
696 |
headerGet(swi->swi_h, RPMTAG_RELEASE, (void **) &r, |
697 |
NULL); |
697 |
HEADERGET_DEFAULT); |
698 |
snprintf(swi->swi_name, sizeof(swi->swi_name), "%s-%s-%s", n, v, r); |
698 |
snprintf(swi->swi_name, sizeof(swi->swi_name), "%s-%s-%s", n, v, r); |
699 |
swi->swi_name[ sizeof(swi->swi_name)-1 ] = 0; |
699 |
swi->swi_name[ sizeof(swi->swi_name)-1 ] = 0; |
700 |
} |
700 |
} |