diff --git a/src/fvid2_graph.c b/src/fvid2_graph.c
index c5bb1b560370fc42755ca9ab04ed6920faed8ec3..9756435269fea28326819a819f68c84026e39b8b 100755 (executable)
--- a/src/fvid2_graph.c
+++ b/src/fvid2_graph.c
const Fvid2_GraphEdgeList *inEdgeList,
Fvid2_GraphInfo *graphHandle)
{
- GT_assert(Fvid2Trace, (graphHandle != NULL));
- GT_assert(Fvid2Trace, (graphHandle->nodeList != NULL));
- GT_assert(Fvid2Trace, (graphHandle->edgeList != NULL));
+ GT_assert(Fvid2Trace, (graphHandle != NULL_PTR));
+ GT_assert(Fvid2Trace, (graphHandle->nodeList != NULL_PTR));
+ GT_assert(Fvid2Trace, (graphHandle->edgeList != NULL_PTR));
- GT_assert(Fvid2Trace, (inNodeList != NULL));
- GT_assert(Fvid2Trace, (inEdgeList != NULL));
+ GT_assert(Fvid2Trace, (inNodeList != NULL_PTR));
+ GT_assert(Fvid2Trace, (inEdgeList != NULL_PTR));
graphHandle->nodeList->numNodes = inNodeList->numNodes;
graphHandle->edgeList->numEdges = inEdgeList->numEdges;
graphHandle->nodeList->list = inNodeList->list;
graphHandle->edgeList->list = inEdgeList->list;
- Fvid2_graphConnect(inNodeList, inEdgeList);
+ (void) Fvid2_graphConnect(inNodeList, inEdgeList);
return graphHandle;
}
{
Fvid2_GraphNodeInfo *startNode = Fvid2_graphGetNodeInfo(
nodeList, inputEdgeList[i].startNode);
- GT_assert(Fvid2Trace, (startNode != NULL));
+ GT_assert(Fvid2Trace, (startNode != NULL_PTR));
Fvid2_GraphNodeInfo *endNode = Fvid2_graphGetNodeInfo(
nodeList, inputEdgeList[i].endNode);
- GT_assert(Fvid2Trace, (endNode != NULL));
+ GT_assert(Fvid2Trace, (endNode != NULL_PTR));
if ((startNode->nodeId == FVID2_GRAPH_INVALID_NODE_ID) &&
(endNode->nodeId == FVID2_GRAPH_INVALID_NODE_ID))
{
GT_assert(Fvid2Trace, (pathNodeCount < maxOutNodeCnt));
outNodeList->numNodes = pathNodeCount;
- GT_assert(Fvid2Trace, (outNodeList->list != NULL));
+ GT_assert(Fvid2Trace, (outNodeList->list != NULL_PTR));
GT_assert(Fvid2Trace, (pathEdgeCount < maxOutEdgeCnt));
outEdgeList->numEdges = pathEdgeCount;
- GT_assert(Fvid2Trace, (outEdgeList->list != NULL));
+ GT_assert(Fvid2Trace, (outEdgeList->list != NULL_PTR));
for (i = 0U; i < pathEdgeCount; i++)
{