Merge pull request #589 from openweave/bug/fix_unused_variables

robszewczyk · web-flow · commit efbed8f77e8c · 2020-05-13T16:05:58.000-07:00
Removed unused variables/functions
diff --git a/src/device-manager/cocoa/NLWdmClientFlushUpdateDeviceStatusError.h b/src/device-manager/cocoa/NLWdmClientFlushUpdateDeviceStatusError.h
@@ -39,6 +39,5 @@
            statusReport:(NSString *)statusReport
                    path:(NSString *)path
                dataSink:(NLGenericTraitUpdatableDataSink *)dataSink;
-- (NSInteger)translateErrorCode;
 
 @end
diff --git a/src/lib/profiles/data-management/Current/TraitData.cpp b/src/lib/profiles/data-management/Current/TraitData.cpp
@@ -248,7 +248,6 @@ WEAVE_ERROR TraitSchemaEngine::MapHandleToPath(PropertyPathHandle aHandle, std::
     // Use the tree depth specified by the schema to correctly size our path walk store
     PropertyPathHandle pathWalkStore[mSchema.mTreeDepth];
     uint32_t pathWalkDepth         = 0;
-    WEAVE_ERROR err                = WEAVE_NO_ERROR;
     PropertyPathHandle curProperty = aHandle;
 
     // Walk up the path till root and keep track of the handles encountered along the way.
@@ -272,7 +271,6 @@ WEAVE_ERROR TraitSchemaEngine::MapHandleToPath(PropertyPathHandle aHandle, std::
         pathWalkDepth--;
     }
 
-exit:
     return WEAVE_NO_ERROR;
 }
 #endif // WEAVE_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,6 @@ WEAVE_ERROR TraitSchemaEngine::MapHandleToPath(PropertyPathHandle aHandle, std::`
`248`	`248`	`// Use the tree depth specified by the schema to correctly size our path walk store`
`249`	`249`	`PropertyPathHandle pathWalkStore[mSchema.mTreeDepth];`
`250`	`250`	`uint32_t pathWalkDepth = 0;`
`251`		`- WEAVE_ERROR err = WEAVE_NO_ERROR;`
`252`	`251`	`PropertyPathHandle curProperty = aHandle;`
`253`	`252`
`254`	`253`	`// Walk up the path till root and keep track of the handles encountered along the way.`
`@@ -272,7 +271,6 @@ WEAVE_ERROR TraitSchemaEngine::MapHandleToPath(PropertyPathHandle aHandle, std::`
`272`	`271`	`pathWalkDepth--;`
`273`	`272`	`}`
`274`	`273`
`275`		`-exit:`
`276`	`274`	`return WEAVE_NO_ERROR;`
`277`	`275`	`}`
`278`	`276`	`#endif // WEAVE_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL`