diff options
author | Omar Tarabai <tarabai@devegypt.com> | 2014-07-24 14:27:25 +0000 |
---|---|---|
committer | Omar Tarabai <tarabai@devegypt.com> | 2014-07-24 14:27:25 +0000 |
commit | eaeb4e371a1ad8d3a7b3b85ad54e99afdfc106d9 (patch) | |
tree | 025d5a6b999d94d586efdfd2e14d89d20c41bcfb /src/include | |
parent | 2b1af57c696d62b6be7b179eabdb4b4a0c0d4b6d (diff) | |
download | gnunet-eaeb4e371a1ad8d3a7b3b85ad54e99afdfc106d9.tar.gz gnunet-eaeb4e371a1ad8d3a7b3b85ad54e99afdfc106d9.zip |
sensor: minor fixes
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_sensor_util_lib.h | 17 |
1 files changed, 5 insertions, 12 deletions
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" | |||
38 | /** | 38 | /** |
39 | * Structure containing sensor definition | 39 | * Structure containing sensor definition |
40 | */ | 40 | */ |
41 | struct SensorInfo | 41 | struct GNUNET_SENSOR_SensorInfo |
42 | { | 42 | { |
43 | 43 | ||
44 | /** | 44 | /** |
@@ -196,7 +196,7 @@ struct GNUNET_SENSOR_Reading | |||
196 | /** | 196 | /** |
197 | * Sensor this reading is related to | 197 | * Sensor this reading is related to |
198 | */ | 198 | */ |
199 | struct SensorInfo *sensor; | 199 | struct GNUNET_SENSOR_SensorInfo *sensor; |
200 | 200 | ||
201 | /** | 201 | /** |
202 | * Timestamp of taking the reading | 202 | * Timestamp of taking the reading |
@@ -257,8 +257,10 @@ struct GNUNET_SENSOR_ReadingMessage | |||
257 | uint16_t value_size; | 257 | uint16_t value_size; |
258 | 258 | ||
259 | }; | 259 | }; |
260 | |||
260 | GNUNET_NETWORK_STRUCT_END | 261 | GNUNET_NETWORK_STRUCT_END |
261 | 262 | ||
263 | |||
262 | /** | 264 | /** |
263 | * Reads sensor definitions from local data files | 265 | * Reads sensor definitions from local data files |
264 | * | 266 | * |
@@ -267,6 +269,7 @@ GNUNET_NETWORK_STRUCT_END | |||
267 | struct GNUNET_CONTAINER_MultiHashMap * | 269 | struct GNUNET_CONTAINER_MultiHashMap * |
268 | GNUNET_SENSOR_load_all_sensors (); | 270 | GNUNET_SENSOR_load_all_sensors (); |
269 | 271 | ||
272 | |||
270 | /* | 273 | /* |
271 | * Get path to the directory containing the sensor definition files | 274 | * Get path to the directory containing the sensor definition files |
272 | * | 275 | * |
@@ -275,16 +278,6 @@ GNUNET_SENSOR_load_all_sensors (); | |||
275 | char * | 278 | char * |
276 | GNUNET_SENSOR_get_sensor_dir (); | 279 | GNUNET_SENSOR_get_sensor_dir (); |
277 | 280 | ||
278 | /** | ||
279 | * Parses a sensor reading message struct | ||
280 | * | ||
281 | * @param msg message header received | ||
282 | * @param sensors multihashmap of loaded sensors | ||
283 | * @return sensor reading struct or NULL if error | ||
284 | */ | ||
285 | struct GNUNET_SENSOR_Reading * | ||
286 | GNUNET_SENSOR_parse_reading_message (const struct GNUNET_MessageHeader *msg, | ||
287 | struct GNUNET_CONTAINER_MultiHashMap *sensors); | ||
288 | 281 | ||
289 | /** | 282 | /** |
290 | * Destroys a group of sensors in a hashmap and the hashmap itself | 283 | * Destroys a group of sensors in a hashmap and the hashmap itself |