summaryrefslogtreecommitdiff
path: root/src/03/sort.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/03/sort.c')
-rw-r--r--src/03/sort.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/03/sort.c b/src/03/sort.c
index 3391513..e0eb9b6 100644
--- a/src/03/sort.c
+++ b/src/03/sort.c
@@ -4,16 +4,19 @@ void _merge(int *items, int min, int mid, int max)
{
int length = (max-min) + 1;
int tmp[length];
+ int j = min, k = mid;
- int j = 0, k = 0;
for (int i = 0; i < length; i++) {
- if (items[min+j] < items[mid+k]) {
- tmp[i] = items[min+j];
- j++;
- } else {
- tmp[i] = items[mid+k];
- k++;
- }
+ if (j < mid && k <= max)
+ if (items[j] < items[k])
+ tmp[i] = items[j++];
+ else
+ tmp[i] = items[k++];
+ else
+ if (j >= mid)
+ tmp[i] = items[k++];
+ else
+ tmp[i] = items[j++];
}
for (int i = 0; i < length; i++)