summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Desneux <stephane.desneux@iot.bzh>2019-10-17 13:41:13 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2019-10-17 13:41:13 +0000
commitbb6918e8fc841d9aee6879091637c8700b7b3b93 (patch)
treee1cbdebb9d0539b50d0e2b8492fa38037cf560e3
parent48104b252485f665fdcc7eb19d16673d027ea43f (diff)
parent9c37970c9ac5037235d0c6123fb2b3ece0b493d0 (diff)
Merge "Remove an unnecessary double pointer"
-rw-r--r--src/4a-internals-hal/4a-internals-hal-cb.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/4a-internals-hal/4a-internals-hal-cb.c b/src/4a-internals-hal/4a-internals-hal-cb.c
index a81871c..bab3c8c 100644
--- a/src/4a-internals-hal/4a-internals-hal-cb.c
+++ b/src/4a-internals-hal/4a-internals-hal-cb.c
@@ -1084,21 +1084,17 @@ int InternalHalHandleInfoGetResponse(afb_api_t apiHandle, json_object *currentRe
return ret;
}
-int InternalHalHandleOneHalDependencies(afb_api_t apiHandle, struct InternalHalProbedDevice **halDeviceToProbe)
+int InternalHalHandleOneHalDependencies(afb_api_t apiHandle, struct InternalHalProbedDevice *currentDeviceToProbe)
{
int ret, toReturn = 0;
- struct InternalHalProbedDevice *currentDeviceToProbe;
-
json_object *probedDeviceGetInfoResponseJ = NULL;
- if(! apiHandle || ! halDeviceToProbe || ! *halDeviceToProbe) {
+ if(! apiHandle || ! currentDeviceToProbe) {
AFB_API_ERROR(apiHandle, "Invalid argument(s)");
return -1;
}
- currentDeviceToProbe = *halDeviceToProbe;
-
if(! currentDeviceToProbe->uid ||
! currentDeviceToProbe->requestedDeviceJ) {
AFB_API_ERROR(apiHandle, "Specified device to probe is not valid (uid or request is not specified)");
@@ -1197,7 +1193,7 @@ int InternalHalHandleHalDependencies(afb_api_t apiHandle,
}
if(validatedDepedency) {
- ret = InternalHalHandleOneHalDependencies(apiHandle, &halCurrentDeviceToProbe);
+ ret = InternalHalHandleOneHalDependencies(apiHandle, halCurrentDeviceToProbe);
if(ret < 0) {
AFB_API_ERROR(apiHandle,
"Error %i happened when tried to handle device to probe with uid:'%s' and request:'%s'",