Skip to content

Commit fc827c1

Browse files
akuzmakuzm
authored
Prepare for clang-tidy-18 (#7213)
Mostly the complaints about implicit casts of multi-level pointers. Not enabling it yet in the CI because there are some complicated warnings left. Loader changes are cosmetic.
1 parent 8f2382e commit fc827c1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+211
-151
lines changed

‎.clang-tidy

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/bgw/job_stat.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ bgw_job_stat_next_start_was_set(FormData_bgw_job_stat *fd)
3434
static ScanTupleResult
3535
bgw_job_stat_tuple_found(TupleInfo *ti, void *const data)
3636
{
37-
BgwJobStat **job_stat_pp = data;
37+
BgwJobStat **job_stat_pp = (BgwJobStat **) data;
3838

3939
*job_stat_pp = STRUCT_FROM_SLOT(ti->slot, ti->mctx, BgwJobStat, FormData_bgw_job_stat);
4040

@@ -94,7 +94,7 @@ ts_bgw_job_stat_find(int32 bgw_job_id)
9494
bgw_job_stat_scan_job_id(bgw_job_id,
9595
bgw_job_stat_tuple_found,
9696
NULL,
97-
&job_stat,
97+
(void *) &job_stat,
9898
AccessShareLock);
9999

100100
return job_stat;
@@ -235,8 +235,8 @@ ts_get_next_scheduled_execution_slot(BgwJob *job, TimestampTz finish_time)
235235
DirectFunctionCall2(timestamptz_part, CStringGetTextDatum("month"), timebucket_fini);
236236

237237
/* convert everything to months */
238-
float8 month_diff = DatumGetFloat8(year_fini) * 12 + DatumGetFloat8(month_fini) -
239-
(DatumGetFloat8(year_init) * 12 + DatumGetFloat8(month_init));
238+
float8 month_diff = (DatumGetFloat8(year_fini) * 12) + DatumGetFloat8(month_fini) -
239+
((DatumGetFloat8(year_init) * 12) + DatumGetFloat8(month_init));
240240

241241
Datum months_to_add = DirectFunctionCall2(interval_mul,
242242
IntervalPGetDatum(&one_month),

‎src/bgw/timer.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ get_timeout_millisec(TimestampTz by_time)
5757
if (timeout_sec < 0 || timeout_usec < 0)
5858
return 0;
5959

60-
return (int64) (timeout_sec * MILLISECS_PER_SEC + ((int64) timeout_usec) / USECS_PER_MILLISEC);
60+
return (int64) ((timeout_sec * MILLISECS_PER_SEC) +
61+
(((int64) timeout_usec) / USECS_PER_MILLISEC));
6162
}
6263

6364
static bool
@@ -73,7 +74,7 @@ wait_using_wait_latch(TimestampTz until)
7374
timeout = MAX_TIMEOUT;
7475

7576
/* Wait latch requires timeout to be <= INT_MAX */
76-
if ((int64) timeout > (int64) INT_MAX)
77+
if (timeout > (int64) INT_MAX)
7778
timeout = INT_MAX;
7879

7980
wl_rc = WaitLatch(MyLatch,

‎src/bgw_policy/chunk_stats.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
static ScanTupleResult
1919
bgw_policy_chunk_stats_tuple_found(TupleInfo *ti, void *const data)
2020
{
21-
BgwPolicyChunkStats **chunk_stats = data;
21+
BgwPolicyChunkStats **chunk_stats = (BgwPolicyChunkStats **) data;
2222

2323
*chunk_stats =
2424
STRUCT_FROM_SLOT(ti->slot, ti->mctx, BgwPolicyChunkStats, FormData_bgw_policy_chunk_stats);
@@ -148,7 +148,7 @@ ts_bgw_policy_chunk_stats_find(int32 job_id, int32 chunk_id)
148148
bgw_policy_chunk_stats_tuple_found,
149149
AccessShareLock,
150150
BGW_POLICY_CHUNK_STATS_TABLE_NAME,
151-
&stats);
151+
(void *) &stats);
152152
return stats;
153153
}
154154

‎src/chunk.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ extern ChunkVec *ts_chunk_vec_create(int32 capacity);
152152
extern ChunkVec *ts_chunk_vec_sort(ChunkVec **chunks);
153153
extern ChunkVec *ts_chunk_vec_add_from_tuple(ChunkVec **chunks, TupleInfo *ti);
154154

155-
#define CHUNK_VEC_SIZE(num_chunks) (sizeof(ChunkVec) + sizeof(Chunk) * num_chunks)
155+
#define CHUNK_VEC_SIZE(num_chunks) (sizeof(ChunkVec) + (sizeof(Chunk) * num_chunks))
156156
#define DEFAULT_CHUNK_VEC_SIZE 10
157157

158158
extern void ts_chunk_formdata_fill(FormData_chunk *fd, const TupleInfo *ti);

‎src/chunk_index.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ chunk_index_mapping_from_tuple(TupleInfo *ti, ChunkIndexMapping *cim)
525525
static ScanTupleResult
526526
chunk_index_collect(TupleInfo *ti, void *data)
527527
{
528-
List **mappings = data;
528+
List **mappings = (List **) data;
529529
ChunkIndexMapping *cim;
530530
MemoryContext oldmctx;
531531

@@ -560,7 +560,7 @@ ts_chunk_index_get_mappings(Hypertable *ht, Oid hypertable_indexrelid)
560560
2,
561561
chunk_index_collect,
562562
NULL,
563-
&mappings,
563+
(void *) &mappings,
564564
AccessShareLock);
565565

566566
return mappings;

‎src/chunk_scan.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ ts_chunk_scan_by_chunk_ids(const Hyperspace *hs, const List *chunk_ids, unsigned
5454
* Make sure to filter out "dropped" chunks.
5555
*/
5656
ScanIterator chunk_it = ts_chunk_scan_iterator_create(orig_mcxt);
57-
locked_chunks = MemoryContextAlloc(orig_mcxt, sizeof(Chunk *) * list_length(chunk_ids));
57+
locked_chunks =
58+
(Chunk **) MemoryContextAlloc(orig_mcxt, sizeof(Chunk *) * list_length(chunk_ids));
5859
foreach (lc, chunk_ids)
5960
{
6061
int chunk_id = lfirst_int(lc);

‎src/copy.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ TSCopyMultiInsertBufferInit(ChunkInsertState *cis, Point *point)
184184
TSCopyMultiInsertBuffer *buffer;
185185

186186
buffer = (TSCopyMultiInsertBuffer *) palloc(sizeof(TSCopyMultiInsertBuffer));
187-
memset(buffer->slots, 0, sizeof(TupleTableSlot *) * MAX_BUFFERED_TUPLES);
187+
memset((void *) buffer->slots, 0, sizeof(TupleTableSlot *) * MAX_BUFFERED_TUPLES);
188188
buffer->bistate = GetBulkInsertState();
189189
buffer->nused = 0;
190190

@@ -447,7 +447,17 @@ TSCmpBuffersByUsage(const ListCell *a, const ListCell *b)
447447
Assert(b1 >= 0);
448448
Assert(b2 >= 0);
449449

450-
return (b1 > b2) ? 1 : (b1 == b2) ? 0 : -1;
450+
if (b1 > b2)
451+
{
452+
return 1;
453+
}
454+
455+
if (b1 == b2)
456+
{
457+
return 0;
458+
}
459+
460+
return -1;
451461
}
452462

453463
/*

‎src/dimension.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@ ts_dimensions_rename_schema_name(const char *old_name, const char *new_name)
18861886
.nkeys = 1,
18871887
.scankey = scankey,
18881888
.tuple_found = dimension_rename_schema_name,
1889-
.data = names,
1889+
.data = (void *) names,
18901890
.lockmode = RowExclusiveLock,
18911891
.scandirection = ForwardScanDirection,
18921892
};

‎src/dimension_slice.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ lock_result_ok_or_abort(TupleInfo *ti)
308308
static ScanTupleResult
309309
dimension_vec_tuple_found_list(TupleInfo *ti, void *data)
310310
{
311-
List **slices = data;
311+
List **slices = (List **) data;
312312
DimensionSlice *slice;
313313
MemoryContext old;
314314

@@ -339,7 +339,7 @@ dimension_vec_tuple_found_list(TupleInfo *ti, void *data)
339339
static ScanTupleResult
340340
dimension_vec_tuple_found(TupleInfo *ti, void *data)
341341
{
342-
DimensionVec **slices = data;
342+
DimensionVec **slices = (DimensionVec **) data;
343343
DimensionSlice *slice;
344344
MemoryContext old;
345345

@@ -455,7 +455,7 @@ ts_dimension_slice_scan_limit(int32 dimension_id, int64 coordinate, int limit,
455455
scankey,
456456
3,
457457
dimension_vec_tuple_found,
458-
&slices,
458+
(void *) &slices,
459459
limit,
460460
AccessShareLock,
461461
tuplock,
@@ -499,7 +499,7 @@ ts_dimension_slice_scan_list(int32 dimension_id, int64 coordinate, List **matchi
499499
scankey,
500500
3,
501501
dimension_vec_tuple_found_list,
502-
matching_dimension_slices,
502+
(void *) matching_dimension_slices,
503503
/* limit = */ 0,
504504
AccessShareLock,
505505
&tuplock,
@@ -669,7 +669,7 @@ ts_dimension_slice_collision_scan_limit(int32 dimension_id, int64 range_start, i
669669
scankey,
670670
3,
671671
dimension_vec_tuple_found,
672-
&slices,
672+
(void *) &slices,
673673
limit,
674674
AccessShareLock,
675675
NULL,
@@ -694,7 +694,7 @@ ts_dimension_slice_scan_by_dimension(int32 dimension_id, int limit)
694694
scankey,
695695
1,
696696
dimension_vec_tuple_found,
697-
&slices,
697+
(void *) &slices,
698698
limit,
699699
AccessShareLock,
700700
NULL,
@@ -737,7 +737,7 @@ ts_dimension_slice_scan_by_dimension_before_point(int32 dimension_id, int64 poin
737737
scankey,
738738
3,
739739
dimension_vec_tuple_found,
740-
&slices,
740+
(void *) &slices,
741741
limit,
742742
scandir,
743743
AccessShareLock,
@@ -813,7 +813,7 @@ ts_dimension_slice_delete_by_dimension_id(int32 dimension_id, bool delete_constr
813813
scankey,
814814
1,
815815
dimension_slice_tuple_delete,
816-
&delete_constraints,
816+
(void *) &delete_constraints,
817817
0,
818818
RowExclusiveLock,
819819
&scantuplock,
@@ -841,7 +841,7 @@ dimension_slice_fill(TupleInfo *ti, void *data)
841841
case TM_SelfModified:
842842
case TM_Ok:
843843
{
844-
DimensionSlice **slice = data;
844+
DimensionSlice **slice = (DimensionSlice **) data;
845845
bool should_free;
846846
HeapTuple tuple = ts_scanner_fetch_heap_tuple(ti, false, &should_free);
847847

@@ -898,7 +898,7 @@ ts_dimension_slice_scan_for_existing(const DimensionSlice *slice, const ScanTupL
898898
scankey,
899899
3,
900900
dimension_slice_fill,
901-
(DimensionSlice **) &slice,
901+
(void *) &slice,
902902
1,
903903
AccessShareLock,
904904
tuplock,
@@ -922,7 +922,7 @@ ts_dimension_slice_from_tuple(TupleInfo *ti)
922922
static ScanTupleResult
923923
dimension_slice_tuple_found(TupleInfo *ti, void *data)
924924
{
925-
DimensionSlice **slice = data;
925+
DimensionSlice **slice = (DimensionSlice **) data;
926926
*slice = ts_dimension_slice_from_tuple(ti);
927927
return SCAN_DONE;
928928
}
@@ -949,7 +949,7 @@ ts_dimension_slice_scan_by_id_and_lock(int32 dimension_slice_id, const ScanTupLo
949949
scankey,
950950
1,
951951
dimension_slice_tuple_found,
952-
&slice,
952+
(void *) &slice,
953953
1,
954954
lockmode,
955955
tuplock,
@@ -1178,7 +1178,7 @@ ts_dimension_slice_insert(DimensionSlice *slice)
11781178
static ScanTupleResult
11791179
dimension_slice_nth_tuple_found(TupleInfo *ti, void *data)
11801180
{
1181-
DimensionSlice **slice = data;
1181+
DimensionSlice **slice = (DimensionSlice **) data;
11821182
MemoryContext old = MemoryContextSwitchTo(ti->mctx);
11831183

11841184
*slice = dimension_slice_from_slot(ti->slot);
@@ -1204,7 +1204,7 @@ ts_dimension_slice_nth_latest_slice(int32 dimension_id, int n)
12041204
scankey,
12051205
1,
12061206
dimension_slice_nth_tuple_found,
1207-
&ret,
1207+
(void *) &ret,
12081208
n,
12091209
BackwardScanDirection,
12101210
AccessShareLock,

‎src/dimension_vector.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ts_dimension_vec_sort(DimensionVec **vecptr)
5656
DimensionVec *vec = *vecptr;
5757

5858
if (vec->num_slices > 1)
59-
qsort(vec->slices, vec->num_slices, sizeof(DimensionSlice *), cmp_slices);
59+
qsort((void *) vec->slices, vec->num_slices, sizeof(DimensionSlice *), cmp_slices);
6060

6161
return vec;
6262
}
@@ -102,8 +102,8 @@ ts_dimension_vec_remove_slice(DimensionVec **vecptr, int32 index)
102102
DimensionVec *vec = *vecptr;
103103

104104
ts_dimension_slice_free(vec->slices[index]);
105-
memmove(vec->slices + index,
106-
vec->slices + (index + 1),
105+
memmove((void *) &vec->slices[index],
106+
(void *) &vec->slices[index + 1],
107107
sizeof(DimensionSlice *) * (vec->num_slices - index - 1));
108108
vec->num_slices--;
109109
}
@@ -118,7 +118,7 @@ dimension_vec_is_sorted(const DimensionVec *vec)
118118
return true;
119119

120120
for (i = 1; i < vec->num_slices; i++)
121-
if (cmp_slices(&vec->slices[i - 1], &vec->slices[i]) > 0)
121+
if (cmp_slices((void *) &vec->slices[i - 1], (void *) &vec->slices[i]) > 0)
122122
return false;
123123

124124
return true;
@@ -135,11 +135,11 @@ ts_dimension_vec_find_slice(const DimensionVec *vec, int64 coordinate)
135135

136136
Assert(dimension_vec_is_sorted(vec));
137137

138-
res = bsearch(&coordinate,
139-
vec->slices,
140-
vec->num_slices,
141-
sizeof(DimensionSlice *),
142-
cmp_coordinate_and_slice);
138+
res = (DimensionSlice **) bsearch(&coordinate,
139+
(void *) vec->slices,
140+
vec->num_slices,
141+
sizeof(DimensionSlice *),
142+
cmp_coordinate_and_slice);
143143

144144
if (res == NULL)
145145
return NULL;

‎src/dimension_vector.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ typedef struct DimensionVec
2424
} DimensionVec;
2525

2626
#define DIMENSION_VEC_SIZE(num_slices) \
27-
(sizeof(DimensionVec) + sizeof(DimensionSlice *) * num_slices)
27+
(sizeof(DimensionVec) + (sizeof(DimensionSlice *) * num_slices))
2828

2929
#define DIMENSION_VEC_DEFAULT_SIZE 10
3030

‎src/foreign_key.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@ relation_get_fk_constraint(Oid conrelid, Oid confrelid)
466466
Relation conrel;
467467
SysScanDesc conscan;
468468
ScanKeyData skey[3];
469-
HeapTuple htup = NULL;
470469

471470
/* Prepare to scan pg_constraint for entries having confrelid = this rel. */
472471
ScanKeyInit(&skey[0],
@@ -490,7 +489,8 @@ relation_get_fk_constraint(Oid conrelid, Oid confrelid)
490489
conrel = table_open(ConstraintRelationId, AccessShareLock);
491490
conscan = systable_beginscan(conrel, InvalidOid, false, NULL, 3, skey);
492491

493-
if (HeapTupleIsValid(htup = systable_getnext(conscan)))
492+
HeapTuple htup = systable_getnext(conscan);
493+
if (HeapTupleIsValid(htup))
494494
{
495495
htup = heap_copytuple(htup);
496496
}

‎src/histogram.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ TS_FUNCTION_INFO_V1(ts_hist_serializefunc);
3636
TS_FUNCTION_INFO_V1(ts_hist_deserializefunc);
3737
TS_FUNCTION_INFO_V1(ts_hist_finalfunc);
3838

39-
#define HISTOGRAM_SIZE(state, nbuckets) (sizeof(*(state)) + (nbuckets) * sizeof(*(state)->buckets))
39+
#define HISTOGRAM_SIZE(state, nbuckets) \
40+
(sizeof(*(state)) + ((nbuckets) * sizeof(*(state)->buckets)))
4041

4142
typedef struct Histogram
4243
{

‎src/hypercube.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,10 @@ ts_hypercube_add_slice(Hypercube *hc, const DimensionSlice *slice)
146146
void
147147
ts_hypercube_slice_sort(Hypercube *hc)
148148
{
149-
qsort(hc->slices, hc->num_slices, sizeof(DimensionSlice *), cmp_slices_by_dimension_id);
149+
qsort((void *) hc->slices,
150+
hc->num_slices,
151+
sizeof(DimensionSlice *),
152+
cmp_slices_by_dimension_id);
150153
}
151154

152155
const DimensionSlice *
@@ -162,8 +165,8 @@ ts_hypercube_get_slice_by_dimension_id(const Hypercube *hc, int32 dimension_id)
162165

163166
Assert(hypercube_is_sorted(hc));
164167

165-
ptr = bsearch(&ptr,
166-
hc->slices,
168+
ptr = bsearch((void *) &ptr,
169+
(void *) hc->slices,
167170
hc->num_slices,
168171
sizeof(DimensionSlice *),
169172
cmp_slices_by_dimension_id);

‎src/hypercube.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ typedef struct Hypercube
2424
} Hypercube;
2525

2626
#define HYPERCUBE_SIZE(num_dimensions) \
27-
(sizeof(Hypercube) + sizeof(DimensionSlice *) * (num_dimensions))
27+
(sizeof(Hypercube) + (sizeof(DimensionSlice *) * (num_dimensions)))
2828

2929
extern TSDLLEXPORT Hypercube *ts_hypercube_alloc(int16 num_dimensions);
3030
extern void ts_hypercube_free(Hypercube *hc);

0 commit comments

Comments
 (0)