X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fdeque.c;h=a511cf3ad0e2a10b860dfe65896dc03ef6ab7418;hb=339f1956cc727eda788638644ef93ab7852b31cd;hp=732f09da82d371735340580e79b39bf216793a2c;hpb=ff7ae14592cbdbebc4e4322424db95663ea7e166;p=pspp diff --git a/src/libpspp/deque.c b/src/libpspp/deque.c index 732f09da82..a511cf3ad0 100644 --- a/src/libpspp/deque.c +++ b/src/libpspp/deque.c @@ -60,15 +60,15 @@ deque_expand (struct deque *deque, void *old_data_, size_t elem_size) size_t new_capacity = MAX (4, old_capacity * 2); char *old_data = old_data_; char *new_data = xnmalloc (new_capacity, elem_size); - size_t idx, copy_cnt; - for (idx = deque->back; idx != deque->front; idx += copy_cnt) + size_t idx, n_copy; + for (idx = deque->back; idx != deque->front; idx += n_copy) { size_t can_copy = old_capacity - (idx & (old_capacity - 1)); size_t want_copy = deque->front - idx; - copy_cnt = MIN (can_copy, want_copy); + n_copy = MIN (can_copy, want_copy); memcpy (new_data + (idx & (new_capacity - 1)) * elem_size, old_data + (idx & (old_capacity - 1)) * elem_size, - copy_cnt * elem_size); + n_copy * elem_size); } deque->capacity = new_capacity; free (old_data);