GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
break;
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
ret = event->value.publish.cctx;
- GNUNET_assert (publish == event->value.publish.sc);
+ GNUNET_assert (publish == event->value.publish.pc);
#if VERBOSE
printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
(unsigned long long) event->value.publish.completed,
if (0 == strcmp ("list_indexed-context-dir",
event->value.publish.cctx))
{
- GNUNET_assert (publish == event->value.publish.sc);
+ GNUNET_assert (publish == event->value.publish.pc);
publish = NULL;
}
break;
meta = GNUNET_CONTAINER_meta_data_create ();
kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
- fi1 = GNUNET_FS_file_information_create_from_file ("list_indexed-context1",
+ fi1 = GNUNET_FS_file_information_create_from_file (fs,
+ "list_indexed-context1",
fn1,
kuri,
meta,
1,
42,
GNUNET_TIME_relative_to_absolute (LIFETIME));
- fi2 = GNUNET_FS_file_information_create_from_file ("list_indexed-context2",
+ GNUNET_assert (NULL != fi1);
+ fi2 = GNUNET_FS_file_information_create_from_file (fs,
+ "list_indexed-context2",
fn2,
kuri,
meta,
2,
42,
GNUNET_TIME_relative_to_absolute (LIFETIME));
- fidir = GNUNET_FS_file_information_create_empty_directory ("list_indexed-context-dir",
+ GNUNET_assert (NULL != fi2);
+ fidir = GNUNET_FS_file_information_create_empty_directory (fs,
+ "list_indexed-context-dir",
kuri,
meta,
3,
"nohelp", options, &run, NULL);
stop_arm (&p1);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-list-indexed/");
- GNUNET_DISK_directory_remove (fn1);
- GNUNET_free_non_null (fn1);
- GNUNET_DISK_directory_remove (fn2);
- GNUNET_free_non_null (fn2);
+ if (fn1 != NULL)
+ {
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_free (fn1);
+ }
+ if (fn2 != NULL)
+ {
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free (fn2);
+ }
return err;
}