osaf/libs/agents/saf/imma/imma_oi_api.c | 1 -
osaf/libs/agents/saf/imma/imma_om_api.c | 2 --
osaf/tools/safimm/src/immutil.c | 2 +-
samples/immsv/immutils/immutil.c | 2 +-
4 files changed, 2 insertions(+), 5 deletions(-)
Fix cppcheck uselessAssignmentPtrArg warnings.
diff --git a/osaf/libs/agents/saf/imma/imma_oi_api.c
b/osaf/libs/agents/saf/imma/imma_oi_api.c
--- a/osaf/libs/agents/saf/imma/imma_oi_api.c
+++ b/osaf/libs/agents/saf/imma/imma_oi_api.c
@@ -3380,7 +3380,6 @@ int imma_oi_resurrect(IMMA_CB *cb, IMMA_
m_NCS_UNLOCK(&cb->cb_lock, NCS_LOCK_WRITE);
*locked = false;
- cl_node = NULL;
/* Finalize the just resurrected handle ! */
memset(&finalize_evt, 0, sizeof(IMMSV_EVT));
diff --git a/osaf/libs/agents/saf/imma/imma_om_api.c
b/osaf/libs/agents/saf/imma/imma_om_api.c
--- a/osaf/libs/agents/saf/imma/imma_om_api.c
+++ b/osaf/libs/agents/saf/imma/imma_om_api.c
@@ -437,7 +437,6 @@ static SaAisErrorT initialize_common(SaI
}
free(cl_node);
- cl_node=NULL;
}
TRACE_LEAVE();
@@ -9297,7 +9296,6 @@ int imma_om_resurrect(IMMA_CB *cb, IMMA_
m_NCS_UNLOCK(&cb->cb_lock, NCS_LOCK_WRITE);
*locked = false;
- cl_node = NULL;
/* Finalize the just resurrected handle ! */
memset(&finalize_evt, 0, sizeof(IMMSV_EVT));
diff --git a/osaf/tools/safimm/src/immutil.c b/osaf/tools/safimm/src/immutil.c
--- a/osaf/tools/safimm/src/immutil.c
+++ b/osaf/tools/safimm/src/immutil.c
@@ -1637,7 +1637,7 @@ SaAisErrorT immutil_saImmOmSearchNext_o2
*objectName = (char*) malloc(strlen(obj) + 1);
strcpy(*objectName, obj);
} else
- objectName = NULL;
+ *objectName = NULL;
return rc;
}
diff --git a/samples/immsv/immutils/immutil.c b/samples/immsv/immutils/immutil.c
--- a/samples/immsv/immutils/immutil.c
+++ b/samples/immsv/immutils/immutil.c
@@ -1637,7 +1637,7 @@ SaAisErrorT immutil_saImmOmSearchNext_o2
*objectName = (char*) malloc(strlen(obj) + 1);
strcpy(*objectName, obj);
} else
- objectName = NULL;
+ *objectName = NULL;
return rc;
}
------------------------------------------------------------------------------
Attend Shape: An AT&T Tech Expo July 15-16. Meet us at AT&T Park in San
Francisco, CA to explore cutting-edge tech and listen to tech luminaries
present their vision of the future. This family event has something for
everyone, including kids. Get more information and register today.
http://sdm.link/attshape
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
