From: Sansar Choinyambuu <schoinya@hsr.ch>
Date: Fri, 18 Nov 2011 08:49:49 +0000 (+0100)
Subject: Fixed the building
X-Git-Tag: 4.6.2~191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f10fc0651e0a92cb09ec5fc021f043f6d2ed4361;p=thirdparty%2Fstrongswan.git

Fixed the building
---

diff --git a/src/libpts/pts/pts_database.c b/src/libpts/pts/pts_database.c
index 57613bd5c2..2b0bc4190c 100644
--- a/src/libpts/pts/pts_database.c
+++ b/src/libpts/pts/pts_database.c
@@ -125,8 +125,9 @@ METHOD(pts_database_t, create_comp_hash_enumerator, enumerator_t*,
 				"JOIN products AS p ON ch.product = p.id "
 				"WHERE p.name = ? AND c.vendor_id = ? "
 				"AND c.name = ? AND c.qualifier = ? AND ch.algo = ? ",
-				DB_TEXT, product, DB_INT, comp_name->vendor_id,
-				DB_INT, comp_name->name, DB_INT, comp_name->qualifier,
+				DB_TEXT, product, DB_INT, comp_name->get_vendor_id(comp_name),
+				DB_INT, comp_name->get_name(comp_name),
+				DB_INT, comp_name->get_qualifier(comp_name),
 				DB_INT, algo, DB_BLOB);
 
 	return e;
diff --git a/src/libpts/pts/pts_database.h b/src/libpts/pts/pts_database.h
index b07b8beab8..25bfa25393 100644
--- a/src/libpts/pts/pts_database.h
+++ b/src/libpts/pts/pts_database.h
@@ -24,6 +24,7 @@
 typedef struct pts_database_t pts_database_t;
 
 #include "pts_meas_algo.h"
+#include "components/pts_comp_func_name.h"
 #include <library.h>
 
 /**
@@ -68,10 +69,9 @@ struct pts_database_t {
 	* @param is_dir			TRUE if directory was measured
 	* @return				enumerator over all matching measurement hashes
 	*/
-	enumerator_t* (*create_file_hash_enumerator)(
-											pts_database_t *this, char *product,
-											pts_meas_algorithms_t algo,
-											int id, bool is_dir);
+	enumerator_t* (*create_file_hash_enumerator)(pts_database_t *this,
+								char *product, pts_meas_algorithms_t algo,
+								int id, bool is_dir);
 
 	/**
 	* Get stored measurement hash for functional component entries