denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swid_inventory object has a get_count method

Browse Source
This commit is contained in:
Andreas Steffen
2013-09-04 21:56:25 +02:00
parent bd3eaaef9b
commit b28686d530
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/plugins/imc_swid/imc_swid.c
+3
View File
@@ -187,6 +187,9 @@ static TNC_Result receive_message(imc_state_t *state, imc_msg_t *in_msg)
out_msg->add_attribute(out_msg, attr); out_msg->add_attribute(out_msg, attr);
break; break;
} }
DBG1(DBG_IMC, "collected %d SWID tag%s%s",
swid_inventory->get_count(swid_inventory), full_tags ? "" : " ID",
swid_inventory->get_count(swid_inventory) == 1 ? "" : "s");
if (full_tags) if (full_tags)
{ {
src/libpts/swid/swid_inventory.c
+3 -16
View File
@@ -54,8 +54,7 @@ struct private_swid_inventory_t {
linked_list_t *list; linked_list_t *list;
}; };
static bool collect_tags(private_swid_inventory_t *this, char *pathname, static bool collect_tags(private_swid_inventory_t *this, char *pathname)
int *tag_count)
{ {
char *rel_name, *abs_name; char *rel_name, *abs_name;
struct stat st; struct stat st;
@@ -83,7 +82,7 @@ static bool collect_tags(private_swid_inventory_t *this, char *pathname,
} }
if (S_ISDIR(st.st_mode)) if (S_ISDIR(st.st_mode))
{ {
if (!collect_tags(this, abs_name, tag_count)) if (!collect_tags(this, abs_name))
{ {
goto end; goto end;
} }
@@ -168,7 +167,6 @@ static bool collect_tags(private_swid_inventory_t *this, char *pathname,
tag_id = swid_tag_id_create(tag_creator, unique_sw_id, unique_seq_id); tag_id = swid_tag_id_create(tag_creator, unique_sw_id, unique_seq_id);
this->list->insert_last(this->list, tag_id); this->list->insert_last(this->list, tag_id);
} }
(*tag_count)++;
} }
success = TRUE; success = TRUE;
@@ -183,18 +181,7 @@ end:
METHOD(swid_inventory_t, collect, bool, METHOD(swid_inventory_t, collect, bool,
private_swid_inventory_t *this) private_swid_inventory_t *this)
{ {
int tag_count = 0; return collect_tags(this, SWID_TAG_DIRECTORY);
if (collect_tags(this, SWID_TAG_DIRECTORY, &tag_count))
{
DBG1(DBG_IMC, "collected %d SWID tag%s%s", tag_count,
this->full_tags ? "" : " ID", (tag_count == 1) ? "" : "s");
return TRUE;
}
else
{
return FALSE;
}
} }
METHOD(swid_inventory_t, add, void, METHOD(swid_inventory_t, add, void,