Commit c38f032f authored by kfox's avatar kfox

merge - mismerged bits

parent 850f9ce4
......@@ -36,6 +36,7 @@
#include <sys/param.h>
#include <unistd.h>
#include <ccnx/forwarder/athena/athena.h>
#include <ccnx/forwarder/athena/athena_TransportLinkModule.h>
/**
......
......@@ -386,7 +386,7 @@ _athenactl_ListPIT(PARCIdentity *identity, int argc, char **argv)
CCNxInterest *interest = ccnxInterest_CreateSimple(name);
ccnxName_Release(&name);
const char *result = _athenactl_SendInterestControl(identity, interest);
const char *result = athenactl_SendInterestControl(identity, interest);
if (result) {
printf("%s\n", result);
parcMemory_Deallocate(&result);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment