Skip to content

Commit c37dcbe

Browse files
committed
Change pos to pos_ in the block to avoid conflicts
1 parent b118961 commit c37dcbe

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

flash/partition_info/partition_info.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ bool read_next_partition(pico_partition_table_t *pt, pico_partition_t *p) {
118118
pt->status = rc;
119119
return false;
120120
}
121-
size_t pos = 0;
122-
uint32_t __attribute__((unused)) fields = extra_family_id_and_name[pos++];
121+
size_t pos_ = 0;
122+
uint32_t __attribute__((unused)) fields = extra_family_id_and_name[pos_++];
123123
assert(fields == flags);
124-
for (size_t i = 0; i < p->extra_family_id_count; i++, pos++) {
125-
p->extra_family_ids[i] = extra_family_id_and_name[pos];
124+
for (size_t i = 0; i < p->extra_family_id_count; i++, pos_++) {
125+
p->extra_family_ids[i] = extra_family_id_and_name[pos_];
126126
}
127127

128128
if (p->has_name) {
129-
uint8_t *name_buf = (uint8_t *)&extra_family_id_and_name[pos];
129+
uint8_t *name_buf = (uint8_t *)&extra_family_id_and_name[pos_];
130130
uint8_t name_length = *name_buf++ & 0x7F;
131131
memcpy(p->name, name_buf, name_length);
132132
p->name[name_length] = '\0';

0 commit comments

Comments
 (0)