diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-11-22 13:04:53 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-11-22 13:04:53 +0000 |
commit | 35a02835a9502dc731dfb8fe2b5cbc4b1864ef0a (patch) | |
tree | 6b59004bde69528b2d46674870f42d4b34c6498c /src/util/test_bio.c | |
parent | 5f6cd649f27c5d6c676095734e0094b6d12ee69a (diff) | |
download | gnunet-35a02835a9502dc731dfb8fe2b5cbc4b1864ef0a.tar.gz gnunet-35a02835a9502dc731dfb8fe2b5cbc4b1864ef0a.zip |
fixing warnings, better structure
Diffstat (limited to 'src/util/test_bio.c')
-rw-r--r-- | src/util/test_bio.c | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/src/util/test_bio.c b/src/util/test_bio.c index 0dfa94144..a80d068c7 100644 --- a/src/util/test_bio.c +++ b/src/util/test_bio.c | |||
@@ -221,21 +221,12 @@ test_directory_r () | |||
221 | static int | 221 | static int |
222 | test_nullfile_rw () | 222 | test_nullfile_rw () |
223 | { | 223 | { |
224 | char *msg; | ||
225 | int64_t testNum; | ||
226 | char *readResultString; | ||
227 | static char fileNameNO[102401]; | 224 | static char fileNameNO[102401]; |
228 | char readResult[200]; | 225 | struct GNUNET_BIO_WriteHandle *fileWNO; |
229 | struct GNUNET_BIO_WriteHandle *fileW, *fileWNO; | 226 | struct GNUNET_BIO_ReadHandle *fileRNO; |
230 | struct GNUNET_BIO_ReadHandle *fileR, *fileRNO; | ||
231 | struct GNUNET_CONTAINER_MetaData *metaDataW; | ||
232 | struct GNUNET_CONTAINER_MetaData *metaDataR; | ||
233 | 227 | ||
234 | memset (fileNameNO, 'a', sizeof (fileNameNO)); | 228 | memset (fileNameNO, 'a', sizeof (fileNameNO)); |
235 | fileNameNO[sizeof (fileNameNO) - 1] = '\0'; | 229 | fileNameNO[sizeof (fileNameNO) - 1] = '\0'; |
236 | metaDataW = GNUNET_CONTAINER_meta_data_create (); | ||
237 | metaDataR = GNUNET_CONTAINER_meta_data_create (); | ||
238 | GNUNET_CONTAINER_meta_data_add_publication_date (metaDataW); | ||
239 | 230 | ||
240 | GNUNET_log_skip (1, GNUNET_NO); | 231 | GNUNET_log_skip (1, GNUNET_NO); |
241 | fileWNO = GNUNET_BIO_write_open (fileNameNO); | 232 | fileWNO = GNUNET_BIO_write_open (fileNameNO); |
@@ -246,18 +237,34 @@ test_nullfile_rw () | |||
246 | fileRNO = GNUNET_BIO_read_open (fileNameNO); | 237 | fileRNO = GNUNET_BIO_read_open (fileNameNO); |
247 | GNUNET_log_skip (0, GNUNET_YES); | 238 | GNUNET_log_skip (0, GNUNET_YES); |
248 | GNUNET_assert (NULL == fileRNO); | 239 | GNUNET_assert (NULL == fileRNO); |
240 | return 0; | ||
241 | } | ||
242 | |||
249 | 243 | ||
244 | static int | ||
245 | test_fullfile_rw () | ||
246 | { | ||
250 | #ifdef LINUX | 247 | #ifdef LINUX |
251 | /* /dev/full only seems to exist on Linux */ | 248 | /* /dev/full only seems to exist on Linux */ |
249 | char *msg; | ||
250 | int64_t testNum; | ||
251 | char *readResultString; | ||
252 | char readResult[200]; | ||
253 | struct GNUNET_BIO_WriteHandle *fileW; | ||
254 | struct GNUNET_BIO_ReadHandle *fileR; | ||
255 | struct GNUNET_CONTAINER_MetaData *metaDataW; | ||
256 | struct GNUNET_CONTAINER_MetaData *metaDataR; | ||
257 | |||
258 | metaDataW = GNUNET_CONTAINER_meta_data_create (); | ||
259 | GNUNET_CONTAINER_meta_data_add_publication_date (metaDataW); | ||
260 | |||
252 | fileW = GNUNET_BIO_write_open ("/dev/full"); | 261 | fileW = GNUNET_BIO_write_open ("/dev/full"); |
253 | GNUNET_assert (NULL != fileW); | 262 | GNUNET_assert (NULL != fileW); |
254 | GNUNET_assert (GNUNET_SYSERR == | 263 | GNUNET_BIO_write (fileW, TESTSTRING, strlen (TESTSTRING)); |
255 | GNUNET_BIO_write (fileW, fileNameNO, sizeof (fileNameNO))); | 264 | GNUNET_BIO_write_string (fileW, TESTSTRING); |
256 | GNUNET_assert (GNUNET_SYSERR == | 265 | GNUNET_BIO_write_meta_data (fileW, metaDataW); |
257 | GNUNET_BIO_write_string (fileW, TESTSTRING)); | ||
258 | GNUNET_assert (GNUNET_SYSERR == | ||
259 | GNUNET_BIO_write_meta_data (fileW, metaDataW)); | ||
260 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_write_close (fileW)); | 266 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_write_close (fileW)); |
267 | GNUNET_CONTAINER_meta_data_destroy (metaDataW); | ||
261 | 268 | ||
262 | fileW = GNUNET_BIO_write_open ("/dev/full"); | 269 | fileW = GNUNET_BIO_write_open ("/dev/full"); |
263 | GNUNET_assert (NULL != fileW); | 270 | GNUNET_assert (NULL != fileW); |
@@ -273,14 +280,14 @@ test_nullfile_rw () | |||
273 | &readResultString, 200)); | 280 | &readResultString, 200)); |
274 | GNUNET_assert (NULL == readResultString); | 281 | GNUNET_assert (NULL == readResultString); |
275 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_int64 (fileR, &testNum)); | 282 | GNUNET_assert (GNUNET_SYSERR == GNUNET_BIO_read_int64 (fileR, &testNum)); |
283 | metaDataR = NULL; | ||
276 | GNUNET_assert (GNUNET_SYSERR == | 284 | GNUNET_assert (GNUNET_SYSERR == |
277 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", | 285 | GNUNET_BIO_read_meta_data (fileR, "Read meta error", |
278 | &metaDataR)); | 286 | &metaDataR)); |
279 | msg = NULL; | 287 | msg = NULL; |
280 | GNUNET_BIO_read_close (fileR, &msg); | 288 | GNUNET_BIO_read_close (fileR, &msg); |
281 | GNUNET_free (msg); | 289 | GNUNET_free (msg); |
282 | GNUNET_CONTAINER_meta_data_destroy (metaDataR); | 290 | GNUNET_assert (NULL == metaDataR); |
283 | GNUNET_CONTAINER_meta_data_destroy (metaDataW); | ||
284 | #endif | 291 | #endif |
285 | return 0; | 292 | return 0; |
286 | } | 293 | } |
@@ -397,6 +404,7 @@ check_file_rw () | |||
397 | { | 404 | { |
398 | GNUNET_assert (0 == test_normal_rw ()); | 405 | GNUNET_assert (0 == test_normal_rw ()); |
399 | GNUNET_assert (0 == test_nullfile_rw ()); | 406 | GNUNET_assert (0 == test_nullfile_rw ()); |
407 | GNUNET_assert (0 == test_fullfile_rw ()); | ||
400 | GNUNET_assert (0 == test_directory_r ()); | 408 | GNUNET_assert (0 == test_directory_r ()); |
401 | return 0; | 409 | return 0; |
402 | } | 410 | } |