@@ -227,8 +227,8 @@ void Aggregator::publishData()
227
227
diag_toplevel_state.name = " toplevel_state" ;
228
228
diag_toplevel_state.level = -1 ;
229
229
int min_level = 255 ;
230
- uint non_ok_status_deepness = 0 ;
231
- uint deepness = 0 ;
230
+ uint non_ok_status_depth = 0 ;
231
+ uint depth = 0 ;
232
232
uint report_idx = 0 ;
233
233
234
234
vector<boost::shared_ptr<diagnostic_msgs::DiagnosticStatus> > processed;
@@ -240,17 +240,17 @@ void Aggregator::publishData()
240
240
{
241
241
diag_array.status .push_back (*processed[i]);
242
242
243
- deepness = static_cast <uint>(std::count (processed[i]->name .begin (), processed[i]->name .end (), ' /' ));
243
+ depth = static_cast <uint>(std::count (processed[i]->name .begin (), processed[i]->name .end (), ' /' ));
244
244
if (processed[i]->level > diag_toplevel_state.level )
245
245
{
246
246
diag_toplevel_state.level = processed[i]->level ;
247
- non_ok_status_deepness = deepness ;
247
+ non_ok_status_depth = depth ;
248
248
report_idx = i;
249
249
}
250
- if (processed[i]->level == diag_toplevel_state.level && deepness > non_ok_status_deepness )
250
+ if (processed[i]->level == diag_toplevel_state.level && depth > non_ok_status_depth )
251
251
{
252
252
// On non okay diagnostics also copy the deepest message to toplevel state
253
- non_ok_status_deepness = deepness ;
253
+ non_ok_status_depth = depth ;
254
254
report_idx = i;
255
255
}
256
256
if (processed[i]->level < min_level)
@@ -268,7 +268,7 @@ void Aggregator::publishData()
268
268
}
269
269
270
270
/* Process other category (unmapped items) */
271
- non_ok_status_deepness = 0 ;
271
+ non_ok_status_depth = 0 ;
272
272
report_idx = 0 ;
273
273
vector<boost::shared_ptr<diagnostic_msgs::DiagnosticStatus> > processed_other;
274
274
{
@@ -279,25 +279,25 @@ void Aggregator::publishData()
279
279
{
280
280
diag_array.status .push_back (*processed_other[i]);
281
281
282
- deepness = static_cast <uint>(std::count (processed[i]->name .begin (), processed[i]->name .end (), ' /' ));
282
+ depth = static_cast <uint>(std::count (processed[i]->name .begin (), processed[i]->name .end (), ' /' ));
283
283
if (processed_other[i]->level > diag_toplevel_state.level )
284
284
{
285
285
diag_toplevel_state.level = processed_other[i]->level ;
286
- non_ok_status_deepness = deepness ;
286
+ non_ok_status_depth = depth ;
287
287
report_idx = i;
288
288
}
289
- if (processed_other[i]->level == diag_toplevel_state.level && deepness > non_ok_status_deepness )
289
+ if (processed_other[i]->level == diag_toplevel_state.level && depth > non_ok_status_depth )
290
290
{
291
291
// On non okay diagnostics also copy the deepest message to toplevel state
292
- non_ok_status_deepness = deepness ;
292
+ non_ok_status_depth = depth ;
293
293
report_idx = i;
294
294
}
295
295
if (processed_other[i]->level < min_level)
296
296
{
297
297
min_level = processed_other[i]->level ;
298
298
}
299
299
// When a non-ok item was found AND it was reported in 'other' categpry, copy the complete status message once
300
- if (diag_toplevel_state.level > diagnostic_msgs::DiagnosticStatus::OK && non_ok_status_deepness > 0 )
300
+ if (diag_toplevel_state.level > diagnostic_msgs::DiagnosticStatus::OK && non_ok_status_depth > 0 )
301
301
{
302
302
diag_toplevel_state.name = processed_other[report_idx]->name ;
303
303
diag_toplevel_state.message = processed_other[report_idx]->message ;
0 commit comments