From 657febec97a2897a329b074fb1a51ae0e9484461 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Thu, 4 Jan 2024 23:30:53 +0800 Subject: [PATCH 1/2] vpick-tool: sort includes --- src/vpick/vpick-tool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vpick/vpick-tool.c b/src/vpick/vpick-tool.c index 0ae8fe322d..f3afc33a58 100644 --- a/src/vpick/vpick-tool.c +++ b/src/vpick/vpick-tool.c @@ -7,8 +7,8 @@ #include "format-table.h" #include "fs-util.h" #include "main-func.h" -#include "path-util.h" #include "parse-util.h" +#include "path-util.h" #include "pretty-print.h" #include "stat-util.h" #include "string-util.h" From 1f233020dc0ea1fa75bb70544f65f72969c78e8e Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Thu, 4 Jan 2024 23:31:37 +0800 Subject: [PATCH 2/2] shared/vpick: don't say "ptr" for TAKE_PICK_RESULT (struct) --- src/shared/vpick.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/vpick.h b/src/shared/vpick.h index 0e0d41e5db..fec7ca4cf2 100644 --- a/src/shared/vpick.h +++ b/src/shared/vpick.h @@ -38,7 +38,7 @@ typedef struct PickResult { .tries_done = UINT_MAX, \ } -#define TAKE_PICK_RESULT(ptr) TAKE_GENERIC(ptr, PickResult, PICK_RESULT_NULL) +#define TAKE_PICK_RESULT(pick) TAKE_GENERIC(pick, PickResult, PICK_RESULT_NULL) void pick_result_done(PickResult *p);