Fixed the building
authorSansar Choinyambuu <schoinya@hsr.ch>
Fri, 18 Nov 2011 08:49:49 +0000 (09:49 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 28 Nov 2011 20:20:23 +0000 (21:20 +0100)
src/libpts/pts/pts_database.c
src/libpts/pts/pts_database.h

index 57613bd..2b0bc41 100644 (file)
@@ -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;
index b07b8be..25bfa25 100644 (file)
@@ -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