Skip to content

Commit 838e67f

Browse files
author
Commitfest Bot
committed
[CF 6249] v1 - Remove useless casting to the same type
This branch was automatically generated by a robot using patches from an email thread registered at: https://commitfest.postgresql.org/patch/6249 The branch will be overwritten each time a new patch version is posted to the thread, and also periodically to check for bitrot caused by changes on the master branch. Patch(es): https://www.postgresql.org/message-id/aSQy2JawavlVlEB0@ip-10-97-1-34.eu-west-3.compute.internal Author(s): Bertrand Drouvot
2 parents 5424f4d + 4673164 commit 838e67f

File tree

41 files changed

+80
-80
lines changed

Some content is hidden

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

41 files changed

+80
-80
lines changed

‎contrib/btree_gist/btree_utils_num.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin
181181
cur = (GBT_NUMKEY *) DatumGetPointer((entryvec->vector[0].key));
182182

183183

184-
o.lower = &((GBT_NUMKEY *) out)[0];
185-
o.upper = &((GBT_NUMKEY *) out)[tinfo->size];
184+
o.lower = out;
185+
o.upper = &out[tinfo->size];
186186

187187
memcpy(out, cur, 2 * tinfo->size);
188188

‎contrib/cube/cube.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -718,16 +718,16 @@ g_cube_internal_consistent(NDBOX *key,
718718
switch (strategy)
719719
{
720720
case RTOverlapStrategyNumber:
721-
retval = (bool) cube_overlap_v0(key, query);
721+
retval = cube_overlap_v0(key, query);
722722
break;
723723
case RTSameStrategyNumber:
724724
case RTContainsStrategyNumber:
725725
case RTOldContainsStrategyNumber:
726-
retval = (bool) cube_contains_v0(key, query);
726+
retval = cube_contains_v0(key, query);
727727
break;
728728
case RTContainedByStrategyNumber:
729729
case RTOldContainedByStrategyNumber:
730-
retval = (bool) cube_overlap_v0(key, query);
730+
retval = cube_overlap_v0(key, query);
731731
break;
732732
default:
733733
retval = false;

‎contrib/fuzzystrmatch/dmetaphone.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ GetAt(metastring *s, int pos)
327327
if ((pos < 0) || (pos >= s->length))
328328
return '\0';
329329

330-
return ((char) *(s->str + pos));
330+
return *(s->str + pos);
331331
}
332332

333333

‎contrib/pgcrypto/mbuf.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ mbuf_create_from_data(uint8 *data, int len)
133133
MBuf *mbuf;
134134

135135
mbuf = palloc(sizeof *mbuf);
136-
mbuf->data = (uint8 *) data;
136+
mbuf->data = data;
137137
mbuf->buf_end = mbuf->data + len;
138138
mbuf->data_end = mbuf->data + len;
139139
mbuf->read_pos = mbuf->data;

‎src/backend/access/common/indextuple.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ index_form_tuple_context(TupleDesc tupleDescriptor,
172172
values,
173173
#endif
174174
isnull,
175-
(char *) tp + hoff,
175+
tp + hoff,
176176
data_size,
177177
&tupmask,
178178
(hasnull ? (bits8 *) tp + sizeof(IndexTupleData) : NULL));

‎src/backend/access/gin/gindatapage.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -607,11 +607,11 @@ dataBeginPlaceToPageLeaf(GinBtree btree, Buffer buf, GinBtreeStack *stack,
607607

608608
if (append)
609609
elog(DEBUG2, "appended %d new items to block %u; %d bytes (%d to go)",
610-
maxitems, BufferGetBlockNumber(buf), (int) leaf->lsize,
610+
maxitems, BufferGetBlockNumber(buf), leaf->lsize,
611611
items->nitem - items->curitem - maxitems);
612612
else
613613
elog(DEBUG2, "inserted %d new items to block %u; %d bytes (%d to go)",
614-
maxitems, BufferGetBlockNumber(buf), (int) leaf->lsize,
614+
maxitems, BufferGetBlockNumber(buf), leaf->lsize,
615615
items->nitem - items->curitem - maxitems);
616616
}
617617
else
@@ -693,11 +693,11 @@ dataBeginPlaceToPageLeaf(GinBtree btree, Buffer buf, GinBtreeStack *stack,
693693

694694
if (append)
695695
elog(DEBUG2, "appended %d items to block %u; split %d/%d (%d to go)",
696-
maxitems, BufferGetBlockNumber(buf), (int) leaf->lsize, (int) leaf->rsize,
696+
maxitems, BufferGetBlockNumber(buf), leaf->lsize, leaf->rsize,
697697
items->nitem - items->curitem - maxitems);
698698
else
699699
elog(DEBUG2, "inserted %d items to block %u; split %d/%d (%d to go)",
700-
maxitems, BufferGetBlockNumber(buf), (int) leaf->lsize, (int) leaf->rsize,
700+
maxitems, BufferGetBlockNumber(buf), leaf->lsize, leaf->rsize,
701701
items->nitem - items->curitem - maxitems);
702702
}
703703

‎src/backend/access/gin/gininsert.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2412,7 +2412,7 @@ _gin_parse_tuple_items(GinTuple *a)
24122412

24132413
Assert(ndecoded == a->nitems);
24142414

2415-
return (ItemPointer) items;
2415+
return items;
24162416
}
24172417

24182418
/*

‎src/backend/access/hash/hash_xlog.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ hash_xlog_split_allocate_page(XLogReaderState *record)
389389

390390
/* extract low and high masks. */
391391
memcpy(&lowmask, data, sizeof(uint32));
392-
highmask = (uint32 *) ((char *) data + sizeof(uint32));
392+
highmask = (uint32 *) (data + sizeof(uint32));
393393

394394
/* update metapage */
395395
metap->hashm_lowmask = lowmask;
@@ -405,7 +405,7 @@ hash_xlog_split_allocate_page(XLogReaderState *record)
405405

406406
/* extract information of overflow pages. */
407407
memcpy(&ovflpoint, data, sizeof(uint32));
408-
ovflpages = (uint32 *) ((char *) data + sizeof(uint32));
408+
ovflpages = (uint32 *) (data + sizeof(uint32));
409409

410410
/* update metapage */
411411
metap->hashm_spares[ovflpoint] = *ovflpages;
@@ -591,7 +591,7 @@ hash_xlog_move_page_contents(XLogReaderState *record)
591591
OffsetNumber *unend;
592592

593593
unused = (OffsetNumber *) ptr;
594-
unend = (OffsetNumber *) ((char *) ptr + len);
594+
unend = (OffsetNumber *) (ptr + len);
595595

596596
if ((unend - unused) > 0)
597597
PageIndexMultiDelete(page, unused, unend - unused);
@@ -902,7 +902,7 @@ hash_xlog_delete(XLogReaderState *record)
902902
OffsetNumber *unend;
903903

904904
unused = (OffsetNumber *) ptr;
905-
unend = (OffsetNumber *) ((char *) ptr + len);
905+
unend = (OffsetNumber *) (ptr + len);
906906

907907
if ((unend - unused) > 0)
908908
PageIndexMultiDelete(page, unused, unend - unused);

‎src/backend/access/transam/twophase.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ save_state_data(const void *data, uint32 len)
10371037
records.tail->data = palloc(records.bytes_free);
10381038
}
10391039

1040-
memcpy(((char *) records.tail->data) + records.tail->len, data, len);
1040+
memcpy(records.tail->data + records.tail->len, data, len);
10411041
records.tail->len += padlen;
10421042
records.bytes_free -= padlen;
10431043
records.total_len += padlen;

‎src/backend/catalog/aclchk.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ ExecuteGrantStmt(GrantStmt *stmt)
580580
elog(ERROR, "AccessPriv node must specify privilege or columns");
581581
priv = string_to_privilege(privnode->priv_name);
582582

583-
if (priv & ~((AclMode) all_privileges))
583+
if (priv & ~all_privileges)
584584
ereport(ERROR,
585585
(errcode(ERRCODE_INVALID_GRANT_OPERATION),
586586
errmsg(errormsg, privilege_to_string(priv))));
@@ -1059,7 +1059,7 @@ ExecAlterDefaultPrivilegesStmt(ParseState *pstate, AlterDefaultPrivilegesStmt *s
10591059
elog(ERROR, "AccessPriv node must specify privilege");
10601060
priv = string_to_privilege(privnode->priv_name);
10611061

1062-
if (priv & ~((AclMode) all_privileges))
1062+
if (priv & ~all_privileges)
10631063
ereport(ERROR,
10641064
(errcode(ERRCODE_INVALID_GRANT_OPERATION),
10651065
errmsg(errormsg, privilege_to_string(priv))));

0 commit comments

Comments
 (0)