From 5cc6c76ac1906d726834a9b35f87feba180cab0d Mon Sep 17 00:00:00 2001 From: Bill Rossi Date: Fri, 27 Dec 2024 05:38:45 -0500 Subject: [PATCH] -Wall fixes --- c/2024/10/hoof_it.c | 4 ++-- c/2024/12/garden_groups.c | 3 +-- c/2024/13/claw_contraption.c | 16 ++++++++-------- c/2024/14/restroom_redoubt.c | 4 ++-- c/2024/24/crossed_wires.c | 2 +- c/2024/3/mull_it_over.c | 4 +--- c/2024/4/ceres_search.c | 2 +- c/2024/5/print_queue.c | 1 - c/2024/7/bridge_repair.c | 4 ++-- c/2024/8/resonant_collinearity.c | 2 +- c/bin/run | 2 +- 11 files changed, 20 insertions(+), 24 deletions(-) diff --git a/c/2024/10/hoof_it.c b/c/2024/10/hoof_it.c index 993790f..1dae8f0 100644 --- a/c/2024/10/hoof_it.c +++ b/c/2024/10/hoof_it.c @@ -80,8 +80,8 @@ int main() { big_score += calculate_score(&m, i, false); } - printf("Part 1: %ld\n", score); - printf("Part 2: %ld\n", big_score); + printf("Part 1: %d\n", score); + printf("Part 2: %d\n", big_score); aoc_free(); return 0; diff --git a/c/2024/12/garden_groups.c b/c/2024/12/garden_groups.c index ad6df97..f426d8c 100644 --- a/c/2024/12/garden_groups.c +++ b/c/2024/12/garden_groups.c @@ -98,7 +98,6 @@ int region_outer_corner_count(Region *r) { int outer_corners = 0; for (int i = 0; i < r->positions_count; i++) { int position = r->positions[i]; - int fences = 0; bool top_fence = false, left_fence = false, right_fence = false, bottom_fence = false; if (position - r->map->width < 0 || r->map->data[position - r->map->width] != r->plant - 'A' + 'a') { top_fence = true; @@ -211,7 +210,7 @@ int main() { } printf("Part 1: %d\n", cost); - printf("Part 2: %lld\n", cost_2); + printf("Part 2: %d\n", cost_2); aoc_free(); return 0; diff --git a/c/2024/13/claw_contraption.c b/c/2024/13/claw_contraption.c index 30f6e80..2422386 100644 --- a/c/2024/13/claw_contraption.c +++ b/c/2024/13/claw_contraption.c @@ -37,12 +37,12 @@ Ratio intersect_x(Line l1, Line l2) { Ratio left_side = ratio_subtract(l1.slope, l2.slope); Ratio right_side = ratio_subtract(l2.offset, l1.offset); Ratio divided = ratio_divide(right_side, left_side); - printf("left: %lld/%lld, right: %lld/%lld, divided: %lld/%lld\n", left_side.num, left_side.denom, right_side.num, right_side.denom, divided.num, divided.denom); + // printf("left: %lld/%lld, right: %lld/%lld, divided: %lld/%lld\n", left_side.num, left_side.denom, right_side.num, right_side.denom, divided.num, divided.denom); return divided; } long long li_cost(int ax, int ay, int bx, int by, long long px, long long py) { - printf("prize at %lld, %lld\n", px, py); + // printf("prize at %lld, %lld\n", px, py); Line b_line; b_line.slope.num = by; b_line.slope.denom = bx; @@ -58,7 +58,7 @@ long long li_cost(int ax, int ay, int bx, int by, long long px, long long py) { Ratio r = intersect_x(b_line, a_line); if (!proper(r)) { - printf("bzzt\n"); + // printf("bzzt\n"); return 0; } @@ -68,16 +68,16 @@ long long li_cost(int ax, int ay, int bx, int by, long long px, long long py) { long long a_x_movement = px - b_x_movement; if (a_x_movement % ax != 0) return 0; // Fuuuuuuuuuuuuuuck this long long a_cost = (a_x_movement / ax) * 3; - printf("b: %lld, a: %lld\n", b_x_movement, a_x_movement); - printf("b presses: %lld, a presses: %lld\n", b_x_movement / bx, a_x_movement / ax); + // printf("b: %lld, a: %lld\n", b_x_movement, a_x_movement); + // printf("b presses: %lld, a presses: %lld\n", b_x_movement / bx, a_x_movement / ax); if (b_x_movement < 0 || a_x_movement < 0) return 0; - printf("cost: %lld\n", b_cost + a_cost); + // printf("cost: %lld\n", b_cost + a_cost); return b_cost + a_cost; } int main() { int ax, ay, bx, by; - long long px, py; + int px, py; char *line; long long cost = 0; @@ -90,7 +90,7 @@ int main() { cost += li_cost(ax, ay, bx, by, px, py); cost_2 += li_cost(ax, ay, bx, by, px + 10000000000000, py + 10000000000000); - printf("\n"); + // printf("\n"); } printf("Part 1: %lld\n", cost); diff --git a/c/2024/14/restroom_redoubt.c b/c/2024/14/restroom_redoubt.c index 37b1380..a0e4064 100644 --- a/c/2024/14/restroom_redoubt.c +++ b/c/2024/14/restroom_redoubt.c @@ -70,8 +70,8 @@ int main() { // Uncomment this to print the pretty christmas tree // printf("%s\n", map); - printf("Part 1: %lld\n", q1 * q2 * q3 * q4); - printf("Part 2: %lld\n", i); + printf("Part 1: %d\n", q1 * q2 * q3 * q4); + printf("Part 2: %d\n", i); aoc_free(); return 0; diff --git a/c/2024/24/crossed_wires.c b/c/2024/24/crossed_wires.c index 6d254cf..83eea0c 100644 --- a/c/2024/24/crossed_wires.c +++ b/c/2024/24/crossed_wires.c @@ -63,7 +63,7 @@ int main() { Grove g; char *line, *token; - char l[4], op[4], r[4], name[4]; + char name[4]; int value; bool done_with_init = false; diff --git a/c/2024/3/mull_it_over.c b/c/2024/3/mull_it_over.c index 3133497..99fd6d2 100644 --- a/c/2024/3/mull_it_over.c +++ b/c/2024/3/mull_it_over.c @@ -5,11 +5,9 @@ #include "../../lib/aoc.h" -enum State { M, U, L, OPEN, D1, COMMA, D2, CLOSE }; +enum State { M, U, L, OPEN, D1, D2 }; int main() { - char *line; - int sum = 0; int cond_sum = 0; diff --git a/c/2024/4/ceres_search.c b/c/2024/4/ceres_search.c index 6f68b1a..4fd561a 100644 --- a/c/2024/4/ceres_search.c +++ b/c/2024/4/ceres_search.c @@ -90,7 +90,7 @@ int target_string_count(Puzzle *puzzle, int index) { char mas[4]; int xmas_count(Puzzle *puzzle, int index) { if (puzzle->text[index] != 'A') return 0; - int count = 0; + int row = index / puzzle->width; int column = index % puzzle->width; if ( diff --git a/c/2024/5/print_queue.c b/c/2024/5/print_queue.c index 7382f5d..5834fb9 100644 --- a/c/2024/5/print_queue.c +++ b/c/2024/5/print_queue.c @@ -67,7 +67,6 @@ int main() { int reorder_sum = 0; Rules rules; - int rule_index = 0; int first, last; Update update; diff --git a/c/2024/7/bridge_repair.c b/c/2024/7/bridge_repair.c index 7c6a949..1eb1cc7 100644 --- a/c/2024/7/bridge_repair.c +++ b/c/2024/7/bridge_repair.c @@ -44,7 +44,7 @@ bool true_permutation_p2(Calibration *c, char *permutation) { value *= c->numbers[i]; } else { char concat[100]; - sprintf(concat, "%ld%ld", value, c->numbers[i]); + sprintf(concat, "%ld%d", value, c->numbers[i]); value = atol(concat); } } @@ -76,7 +76,7 @@ void calibration_from_line(Calibration *c, char *line) { c->number_count = 0; char *token = strtok(line, ":"); c->test_value = atol(token); - while(token = strtok(NULL, " ")) { + while((token = strtok(NULL, " "))) { c->numbers[c->number_count++] = atoi(token); } } diff --git a/c/2024/8/resonant_collinearity.c b/c/2024/8/resonant_collinearity.c index 2a4b457..da565c7 100644 --- a/c/2024/8/resonant_collinearity.c +++ b/c/2024/8/resonant_collinearity.c @@ -155,7 +155,7 @@ int main() { for (int i = 0; i < input_size; i++) { if (resonant_antinode_grid[i] == '#') resonant_antinode_count++; } - printf("Part 2: %lld\n", resonant_antinode_count); + printf("Part 2: %d\n", resonant_antinode_count); free(empty_grid); free(antinode_grid); diff --git a/c/bin/run b/c/bin/run index f0f273b..6e1de17 100755 --- a/c/bin/run +++ b/c/bin/run @@ -11,5 +11,5 @@ if [[ -z $source_file ]] ; then exit 1 fi -gcc -o $year/$day/problem $source_file lib/aoc.c -lm && +gcc -Wall -o $year/$day/problem $source_file lib/aoc.c -lm && time (cat ../data/$year/$day/input.txt | ./$year/$day/problem)