case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
consider_restart (event->status);
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,
#endif
break;
case GNUNET_FS_STATUS_PUBLISH_SUSPEND:
- if (event->value.publish.sc == publish)
+ if (event->value.publish.pc == publish)
publish = NULL;
break;
case GNUNET_FS_STATUS_PUBLISH_RESUME:
if (NULL == publish)
{
- publish = event->value.publish.sc;
+ publish = event->value.publish.pc;
return "publish-context-dir";
}
break;
break;
case GNUNET_FS_STATUS_PUBLISH_START:
consider_restart (event->status);
- publish = event->value.publish.sc;
+ publish = event->value.publish.pc;
ret = event->value.publish.cctx;
if (0 == strcmp ("publish-context1",
event->value.publish.cctx))
consider_restart (event->status);
if (0 == strcmp ("publish-context-dir",
event->value.publish.cctx))
- GNUNET_assert (publish == event->value.publish.sc);
+ GNUNET_assert (publish == event->value.publish.pc);
break;
default:
printf ("Unexpected event: %d\n",
"nohelp", options, &run, NULL);
stop_arm (&p1);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-publish/");
- 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;
}