From 043db3400ce24335293d9424dc41c2457660c0c8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 11 Mar 2023 17:42:34 +0900 Subject: [PATCH] edit-util: make EditFile take reference of EditFileContext No functional change, just preparation for later commits. --- src/shared/edit-util.c | 1 + src/shared/edit-util.h | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/shared/edit-util.c b/src/shared/edit-util.c index 822175a472..212afb9fd5 100644 --- a/src/shared/edit-util.c +++ b/src/shared/edit-util.c @@ -95,6 +95,7 @@ int edit_files_add( } context->files[context->n_files] = (EditFile) { + .context = context, .path = TAKE_PTR(new_path), .original_path = TAKE_PTR(new_original_path), .comment_paths = TAKE_PTR(new_comment_paths), diff --git a/src/shared/edit-util.h b/src/shared/edit-util.h index 7b705060e4..8c838bcf95 100644 --- a/src/shared/edit-util.h +++ b/src/shared/edit-util.h @@ -3,21 +3,25 @@ #include "path-lookup.h" -typedef struct EditFile { +typedef struct EditFile EditFile; +typedef struct EditFileContext EditFileContext; + +struct EditFile { + EditFileContext *context; char *path; char *original_path; char **comment_paths; char *temp; unsigned line; -} EditFile; +}; -typedef struct EditFileContext { +struct EditFileContext { EditFile *files; size_t n_files; const char *marker_start; const char *marker_end; bool remove_parent; -} EditFileContext; +}; void edit_file_context_done(EditFileContext *context);