From eaeb4e371a1ad8d3a7b3b85ad54e99afdfc106d9 Mon Sep 17 00:00:00 2001 From: Omar Tarabai Date: Thu, 24 Jul 2014 14:27:25 +0000 Subject: sensor: minor fixes --- src/include/gnunet_sensor_util_lib.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/include/gnunet_sensor_util_lib.h') diff --git a/src/include/gnunet_sensor_util_lib.h b/src/include/gnunet_sensor_util_lib.h index 54066decb..780b88cda 100644 --- a/src/include/gnunet_sensor_util_lib.h +++ b/src/include/gnunet_sensor_util_lib.h @@ -38,7 +38,7 @@ extern "C" /** * Structure containing sensor definition */ -struct SensorInfo +struct GNUNET_SENSOR_SensorInfo { /** @@ -196,7 +196,7 @@ struct GNUNET_SENSOR_Reading /** * Sensor this reading is related to */ - struct SensorInfo *sensor; + struct GNUNET_SENSOR_SensorInfo *sensor; /** * Timestamp of taking the reading @@ -257,8 +257,10 @@ struct GNUNET_SENSOR_ReadingMessage uint16_t value_size; }; + GNUNET_NETWORK_STRUCT_END + /** * Reads sensor definitions from local data files * @@ -267,6 +269,7 @@ GNUNET_NETWORK_STRUCT_END struct GNUNET_CONTAINER_MultiHashMap * GNUNET_SENSOR_load_all_sensors (); + /* * Get path to the directory containing the sensor definition files * @@ -275,16 +278,6 @@ GNUNET_SENSOR_load_all_sensors (); char * GNUNET_SENSOR_get_sensor_dir (); -/** - * Parses a sensor reading message struct - * - * @param msg message header received - * @param sensors multihashmap of loaded sensors - * @return sensor reading struct or NULL if error - */ -struct GNUNET_SENSOR_Reading * -GNUNET_SENSOR_parse_reading_message (const struct GNUNET_MessageHeader *msg, - struct GNUNET_CONTAINER_MultiHashMap *sensors); /** * Destroys a group of sensors in a hashmap and the hashmap itself -- cgit v1.2.3