Skip to content

Commit 13211ae

Browse files
Linus Arvergitster
authored andcommitted
trailer: separate public from internal portion of trailer_iterator
The fields here are not meant to be used by downstream callers, so put them behind an anonymous struct named as "internal" to warn against their use. This follows the pattern in 576de3d (unpack_trees: start splitting internal fields from public API, 2023-02-27). Signed-off-by: Linus Arver <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ac83bc5 commit 13211ae

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

trailer.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,14 +1220,14 @@ void trailer_iterator_init(struct trailer_iterator *iter, const char *msg)
12201220
strbuf_init(&iter->key, 0);
12211221
strbuf_init(&iter->val, 0);
12221222
opts.no_divider = 1;
1223-
trailer_info_get(&iter->info, msg, &opts);
1224-
iter->cur = 0;
1223+
trailer_info_get(&iter->internal.info, msg, &opts);
1224+
iter->internal.cur = 0;
12251225
}
12261226

12271227
int trailer_iterator_advance(struct trailer_iterator *iter)
12281228
{
1229-
while (iter->cur < iter->info.trailer_nr) {
1230-
char *trailer = iter->info.trailers[iter->cur++];
1229+
while (iter->internal.cur < iter->internal.info.trailer_nr) {
1230+
char *trailer = iter->internal.info.trailers[iter->internal.cur++];
12311231
int separator_pos = find_separator(trailer, separators);
12321232

12331233
if (separator_pos < 1)
@@ -1245,7 +1245,7 @@ int trailer_iterator_advance(struct trailer_iterator *iter)
12451245

12461246
void trailer_iterator_release(struct trailer_iterator *iter)
12471247
{
1248-
trailer_info_release(&iter->info);
1248+
trailer_info_release(&iter->internal.info);
12491249
strbuf_release(&iter->val);
12501250
strbuf_release(&iter->key);
12511251
}

trailer.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,10 @@ struct trailer_iterator {
119119
struct strbuf val;
120120

121121
/* private */
122-
struct trailer_info info;
123-
size_t cur;
122+
struct {
123+
struct trailer_info info;
124+
size_t cur;
125+
} internal;
124126
};
125127

126128
/*

0 commit comments

Comments
 (0)