[pull] master from begeekmyfriend:master

0015_three_sum/three_sum.c

@@ -43,7 +43,7 @@ int** threeSum(int* nums, int numsSize, int* returnSize, int** returnColumnSizes
     int i, j, capacity = 50000;
     int **results = malloc(capacity * sizeof(int *));
     for (i = 0; i < numsSize - 2; i++) {
-        if (i == 0 || i > 0 && nums[i] != nums[i - 1]) {
+        if (i == 0 || (i > 0 && nums[i] != nums[i - 1])) {
             two_sum(nums, i + 1, numsSize - 1, -nums[i], results, returnSize);
         }
     }
@@ -58,14 +58,18 @@ int** threeSum(int* nums, int numsSize, int* returnSize, int** returnColumnSizes
 
 int main(void)
 {
-    int i, count;
+    int i, j, count;
     //int nums[] = { -1, 0, 1, 2, -1, -4 };
     //int nums[] = { 0, 0, 0 };
     //int nums[] = { -1, 0, 1, 0 };
     int nums[] = {-2,0,0,2,2};
-    int **triplets = threeSum(nums, sizeof(nums) / sizeof(*nums), &count);
+    int *col_sizes;
+    int **triplets = threeSum(nums, sizeof(nums) / sizeof(*nums), &count, &col_sizes);
     for (i = 0; i < count; i++) {
-        printf("%d %d %d\n", triplets[i][0], triplets[i][1], triplets[i][2]);
+        for (j = 0; j < col_sizes[i]; j++) {
+            printf("%d \n", triplets[i][j]);
+        }
+        printf("\n");
     }
 
     return 0;

0018_four_sum/four_sum.c

@@ -68,13 +68,16 @@ int** fourSum(int* nums, int numsSize, int target, int* returnSize, int** return
 
 int main(void)
 {
-    int i, count, target = 11, *col_sizes;
+    int i, j, count, target = 11, *col_sizes;
     //int nums[] = { 1, 0, -1, 0, -2, 2 };
     //int nums[] = { -3, -2, -1, 0, 0, 1, 2, 3 };
     int nums[] = { 0, 1, 5, 0, 1, 5, 5, -4 };
     int **quadruplets = fourSum(nums, sizeof(nums) / sizeof(*nums), target, &count, &col_sizes);
     for (i = 0; i < count; i++) {
-        printf("%d %d %d %d\n", quadruplets[i][0], quadruplets[i][1], quadruplets[i][2], quadruplets[i][3]);
+        for (j = 0; j < col_sizes[i]; j++) {
+            printf("%d ", quadruplets[i][j]);
+        }
+        printf("\n");
     }
 
     return 0;

0046_permutations/permutations.c

@@ -88,10 +88,10 @@ int main(int argc, char **argv)
         nums[i] = atoi(argv[i + 1]);
     }
 
-    int *size;
-    int **lists = permute(nums, argc - 1, &count, &size);
+    int *col_sizes;
+    int **lists = permute(nums, argc - 1, &count, &col_sizes);
     for (i = 0; i < count; i++) {
-        for (j = 0; j < argc - 1; j++) {
+        for (j = 0; j < col_sizes[i]; j++) {
             printf("%d", lists[i][j]);
         }
         putchar('\n');

0047_permutations_ii/permutations.c

@@ -72,10 +72,10 @@ int main(int argc, char **argv)
         nums[i] = atoi(argv[i + 1]);
     }
 
-    int *size;
-    int **lists = permute(nums, argc - 1, &count, &size);
+    int *col_sizes;
+    int **lists = permute(nums, argc - 1, &count, &col_sizes);
     for (i = 0; i < count; i++) {
-        for (j = 0; j < argc - 1; j++) {
+        for (j = 0; j < col_sizes[i]; j++) {
             printf("%d", lists[i][j]);
         }
         putchar('\n');

0199_binary_tree_right_side_view/bst_right.c

@@ -90,9 +90,7 @@ static void node_free(struct queue_node *qn, struct list_head *free_list)
 }
 
 /**
- ** Return an array of arrays of size *returnSize.
- ** The sizes of the arrays are returned as *returnColumnSizes array.
- ** Note: Both returned array and *returnColumnSizes array must be malloced, assume caller calls free().
+ ** The returned array must be malloced, assume caller calls free().
  **/
 static int* rightSideView(struct TreeNode* root, int* returnSize)
 {