d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix individual_element_index when some type has 0 elements.

Browse Source 
When some type has 0 elements, saved_individual_element_index was set
to -1 on second type bump, since individual_element_index was not
restored after the first.  To me it looks easier just to increment
saved_individual_element_index separately than think when to save it.

MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2019-06-21 23:29:16 +00:00
parent 1bb957296b
commit 7318fcb51d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=349281
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/cam/scsi/scsi_enc_ses.c
View File

@ -444,6 +444,7 @@ ses_iter_next(struct ses_iterator *iter)
iter->type_element_index = ITERATOR_INDEX_END;
iter->global_element_index = ITERATOR_INDEX_END;
iter->individual_element_index = ITERATOR_INDEX_END;
iter->saved_individual_element_index = ITERATOR_INDEX_END;
return (NULL);
}
@ -468,17 +469,12 @@ ses_iter_next(struct ses_iterator *iter)
*/
iter->type_index++;
iter->type_element_index = 0;
iter->saved_individual_element_index
= iter->individual_element_index;
iter->individual_element_index = ITERATOR_INDEX_INVALID;
}
if (iter->type_element_index > 0) {
if (iter->type_element_index == 1) {
iter->individual_element_index
= iter->saved_individual_element_index;
}
iter->individual_element_index++;
iter->individual_element_index =
++iter->saved_individual_element_index;
}
return (&iter->cache->elm_map[iter->global_element_index]);