encode_u64_le(buffer, &offset, sil->sub_index.start_block);
encode_u16_le(buffer, &offset, 0);
sil->nonce = generate_secondary_nonce(primary_nonce, buffer, sizeof(buffer));
- if (sil->nonce == 0)
+ if (sil->nonce == 0) {
sil->nonce = generate_secondary_nonce(~primary_nonce + 1, buffer,
sizeof(buffer));
+ }
}
static void setup_sub_index(struct index_layout *layout, u64 start_block,
saved_result = result;
}
- if (saved_result != UDS_SUCCESS)
+ if (saved_result != UDS_SUCCESS) {
return uds_log_error_strerror(result,
"%s: cannot destroy all index saves",
__func__);
+ }
return UDS_SUCCESS;
}
"unknown superblock magic label");
if ((super->version < SUPER_VERSION_MINIMUM) ||
- (super->version == 4) ||
- (super->version == 5) ||
- (super->version == 6) ||
+ (super->version == 4) || (super->version == 5) || (super->version == 6) ||
(super->version > SUPER_VERSION_MAXIMUM)) {
return uds_log_error_strerror(UDS_UNSUPPORTED_VERSION,
"unknown superblock version number %u",
u32 slot = chapter_number * map->entries_per_chapter;
*lowest_list = ((index_page_number == 0) ?
- 0 :
- map->entries[slot + index_page_number - 1] + 1);
+ 0 : map->entries[slot + index_page_number - 1] + 1);
*highest_list = ((index_page_number < map->entries_per_chapter) ?
map->entries[slot + index_page_number] :
map->geometry->delta_lists_per_chapter - 1);
static void wait_for_no_requests_in_progress(struct uds_index_session *index_session)
{
uds_lock_mutex(&index_session->request_mutex);
- while (index_session->request_count > 0)
+ while (index_session->request_count > 0) {
uds_wait_cond(&index_session->request_cond,
&index_session->request_mutex);
+ }
uds_unlock_mutex(&index_session->request_mutex);
}
/* Wait for any current index state change to complete. */
uds_lock_mutex(&index_session->request_mutex);
while ((index_session->state & IS_FLAG_WAITING) ||
- (index_session->state & IS_FLAG_CLOSING))
+ (index_session->state & IS_FLAG_CLOSING)) {
uds_wait_cond(&index_session->request_cond,
&index_session->request_mutex);
+ }
if (index_session->state & IS_FLAG_SUSPENDED) {
uds_log_info("Index session is suspended");
/* Wait for any current index state change to complete. */
uds_lock_mutex(&index_session->request_mutex);
while ((index_session->state & IS_FLAG_WAITING) ||
- (index_session->state & IS_FLAG_CLOSING))
+ (index_session->state & IS_FLAG_CLOSING)) {
uds_wait_cond(&index_session->request_cond,
&index_session->request_mutex);
+ }
if (index_session->state & IS_FLAG_DESTROYING) {
uds_unlock_mutex(&index_session->request_mutex);
/* Wait until the load exits before proceeding. */
uds_lock_mutex(&index_session->request_mutex);
- while (index_session->state & IS_FLAG_LOADING)
+ while (index_session->state & IS_FLAG_LOADING) {
uds_wait_cond(&index_session->request_cond,
&index_session->request_mutex);
+ }
uds_unlock_mutex(&index_session->request_mutex);
}
uds_wait_for_idle_index(index);
index->prev_save = index->last_save;
index->last_save = ((index->newest_virtual_chapter == 0) ?
- NO_LAST_SAVE :
- index->newest_virtual_chapter - 1);
+ NO_LAST_SAVE : index->newest_virtual_chapter - 1);
uds_log_info("beginning save (vcn %llu)", (unsigned long long) index->last_save);
result = uds_save_index_state(index->layout, index);