Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3f365ba

Browse files
committed
Inline memset() as MemSet().
1 parentc3072cb commit3f365ba

File tree

68 files changed

+218
-218
lines changed

Some content is hidden

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

68 files changed

+218
-218
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.25 1997/09/12 04:07:06 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.26 1997/09/18 20:19:36 momjian Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -853,7 +853,7 @@ heap_formtuple(TupleDesc tupleDescriptor,
853853
tp= (char*)palloc(len);
854854
tuple= (HeapTuple)tp;
855855

856-
memset(tp,0, (int)len);
856+
MemSet(tp,0, (int)len);
857857

858858
tuple->t_len=len;
859859
tuple->t_natts=numberOfAttributes;
@@ -1011,7 +1011,7 @@ heap_addheader(uint32 natts,/* max domain index */
10111011
len+=structlen;
10121012
tp= (char*)palloc(len);
10131013
tup= (HeapTuple)tp;
1014-
memset((char*)tup,0,len);
1014+
MemSet((char*)tup,0,len);
10151015

10161016
tup->t_len= (short)len;/* XXX */
10171017
tp+=tup->t_hoff=hoff;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.18 1997/09/08 21:40:24 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.19 1997/09/18 20:19:37 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -77,7 +77,7 @@ index_formtuple(TupleDesc tupleDescriptor,
7777

7878
tp= (char*)palloc(size);
7979
tuple= (IndexTuple)tp;
80-
memset(tp,0, (int)size);
80+
MemSet(tp,0, (int)size);
8181

8282
DataFill((char*)tp+hoff,
8383
tupleDescriptor,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.25 1997/09/10 23:57:49 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.26 1997/09/18 20:19:38 momjian Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -61,7 +61,7 @@ CreateTemplateTupleDesc(int natts)
6161
desc= (TupleDesc)palloc(sizeof(structtupleDesc));
6262
desc->attrs= (AttributeTupleForm*)palloc(size);
6363
desc->constr=NULL;
64-
memset(desc->attrs,0,size);
64+
MemSet(desc->attrs,0,size);
6565

6666
desc->natts=natts;
6767

@@ -296,7 +296,7 @@ TupleDescInitEntry(TupleDesc desc,
296296
if (attributeName!=NULL)
297297
namestrcpy(&(att->attname),attributeName);
298298
else
299-
memset(att->attname.data,0,NAMEDATALEN);
299+
MemSet(att->attname.data,0,NAMEDATALEN);
300300

301301

302302
att->attdisbursion=0;/* dummy value */

‎src/backend/access/gist/gist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ gistAdjustKeys(Relation r,
608608
/* generate and insert new tuple */
609609
tupDesc=r->rd_att;
610610
isnull= (char*)palloc(r->rd_rel->relnatts);
611-
memset(isnull,' ',r->rd_rel->relnatts);
611+
MemSet(isnull,' ',r->rd_rel->relnatts);
612612
newtup= (IndexTuple)index_formtuple(tupDesc,
613613
(Datum*)&centry.pred,isnull);
614614
pfree(isnull);
@@ -1029,7 +1029,7 @@ GISTInitBuffer(Buffer b, uint32 f)
10291029
pageSize=BufferGetPageSize(b);
10301030

10311031
page=BufferGetPage(b);
1032-
memset(page,0, (int)pageSize);
1032+
MemSet(page,0, (int)pageSize);
10331033
PageInit(page,pageSize,sizeof(GISTPageOpaqueData));
10341034

10351035
opaque= (GISTPageOpaque)PageGetSpecialPointer(page);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.12 1997/09/08 20:53:59 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.13 1997/09/18 20:19:43 momjian Exp $
1111
*
1212
* NOTES
1313
* Overflow pages look like ordinary relation pages.
@@ -334,7 +334,7 @@ _hash_freeovflpage(Relation rel, Buffer ovflbuf)
334334
nextblkno=ovflopaque->hasho_nextblkno;
335335
prevblkno=ovflopaque->hasho_prevblkno;
336336
bucket=ovflopaque->hasho_bucket;
337-
memset(ovflpage,0,BufferGetPageSize(ovflbuf));
337+
MemSet(ovflpage,0,BufferGetPageSize(ovflbuf));
338338
_hash_wrtbuf(rel,ovflbuf);
339339

340340
/*
@@ -460,8 +460,8 @@ _hash_initbitmap(Relation rel,
460460
/* set all of the bits above 'nbits' to 1 */
461461
clearints= ((nbits-1) >>INT_TO_BIT)+1;
462462
clearbytes=clearints <<INT_TO_BYTE;
463-
memset((char*)freep,0,clearbytes);
464-
memset(((char*)freep)+clearbytes,0xFF,
463+
MemSet((char*)freep,0,clearbytes);
464+
MemSet(((char*)freep)+clearbytes,0xFF,
465465
BMPGSZ_BYTE(metap)-clearbytes);
466466
freep[clearints-1]=ALL_SET << (nbits&INT_MASK);
467467

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.12 1997/09/08 20:54:03 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.13 1997/09/18 20:19:46 momjian Exp $
1111
*
1212
* NOTES
1313
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -122,8 +122,8 @@ _hash_metapinit(Relation rel)
122122
lg2nelem=1;/* _hash_log2(MAX(nelem, 2)) */
123123
nbuckets=2;/* 1 << lg2nelem */
124124

125-
memset((char*)metap->hashm_spares,0,sizeof(metap->hashm_spares));
126-
memset((char*)metap->hashm_mapp,0,sizeof(metap->hashm_mapp));
125+
MemSet((char*)metap->hashm_spares,0,sizeof(metap->hashm_spares));
126+
MemSet((char*)metap->hashm_mapp,0,sizeof(metap->hashm_mapp));
127127

128128
metap->hashm_spares[lg2nelem]=2;/* lg2nelem + 1 */
129129
metap->hashm_spares[lg2nelem+1]=2;/* lg2nelem + 1 */
@@ -310,7 +310,7 @@ _hash_pageinit(Page page, Size size)
310310
* creating new pages is an infrequent occurrence and it makes me feel
311311
* good when I know they're empty.
312312
*/
313-
memset(page,0,size);
313+
MemSet(page,0,size);
314314

315315
PageInit(page,size,sizeof(HashPageOpaqueData));
316316
}

‎src/backend/access/nbtree/nbtpage.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.12 1997/09/08 20:54:15 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.13 1997/09/18 20:19:49 momjian Exp $
1212
*
1313
*NOTES
1414
* Postgres btree pages look like ordinary relation pages.The opaque
@@ -418,7 +418,7 @@ _bt_pageinit(Page page, Size size)
418418
* good when I know they're empty.
419419
*/
420420

421-
memset(page,0,size);
421+
MemSet(page,0,size);
422422

423423
PageInit(page,size,sizeof(BTPageOpaqueData));
424424
}

‎src/backend/access/nbtree/nbtsort.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*
77
* IDENTIFICATION
8-
* $Id: nbtsort.c,v 1.23 1997/09/08 21:41:28 momjian Exp $
8+
* $Id: nbtsort.c,v 1.24 1997/09/18 20:19:53 momjian Exp $
99
*
1010
* NOTES
1111
*
@@ -565,7 +565,7 @@ _bt_spoolinit(Relation index, int ntapes, bool isunique)
565565
{
566566
elog(WARN,"_bt_spoolinit: out of memory");
567567
}
568-
memset((char*)btspool,0,sizeof(BTSpool));
568+
MemSet((char*)btspool,0,sizeof(BTSpool));
569569
btspool->bts_ntapes=ntapes;
570570
btspool->bts_tape=0;
571571
btspool->isunique=isunique;
@@ -852,7 +852,7 @@ _bt_pagestate(Relation index, int flags, int level, bool doupper)
852852
{
853853
BTPageState*state= (BTPageState*)palloc(sizeof(BTPageState));
854854

855-
memset((char*)state,0,sizeof(BTPageState));
855+
MemSet((char*)state,0,sizeof(BTPageState));
856856
_bt_blnewpage(index,&(state->btps_buf),&(state->btps_page),flags);
857857
state->btps_firstoff=InvalidOffsetNumber;
858858
state->btps_lastoff=P_HIKEY;
@@ -1216,7 +1216,7 @@ _bt_merge(Relation index, BTSpool *btspool)
12161216
* _bt_taperead will return 0 only if the tape is actually at
12171217
* EOF.
12181218
*/
1219-
memset((char*)&q,0,sizeof(BTPriQueue));
1219+
MemSet((char*)&q,0,sizeof(BTPriQueue));
12201220
goodtapes=0;
12211221
for (t=0;t<btspool->bts_ntapes;++t)
12221222
{

‎src/backend/access/nbtree/nbtutils.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.14 1997/09/08 21:41:31 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.15 1997/09/18 20:19:55 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -139,7 +139,7 @@ _bt_orderkeys(Relation relation, BTScanOpaque so)
139139
nbytes=BTMaxStrategyNumber*sizeof(ScanKeyData);
140140
xform= (ScanKey)palloc(nbytes);
141141

142-
memset(xform,0,nbytes);
142+
MemSet(xform,0,nbytes);
143143
map=IndexStrategyGetStrategyMap(RelationGetIndexStrategy(relation),
144144
BTMaxStrategyNumber,
145145
attno);
@@ -243,7 +243,7 @@ _bt_orderkeys(Relation relation, BTScanOpaque so)
243243

244244
/* initialization for new attno */
245245
attno=cur->sk_attno;
246-
memset(xform,0,nbytes);
246+
MemSet(xform,0,nbytes);
247247
map=IndexStrategyGetStrategyMap(RelationGetIndexStrategy(relation),
248248
BTMaxStrategyNumber,
249249
attno);

‎src/backend/access/rtree/rtproc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.11 1997/09/08 21:41:37 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.12 1997/09/18 20:19:56 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -96,7 +96,7 @@ rt_poly_union(POLYGON *a, POLYGON *b)
9696
if (!PointerIsValid(p))
9797
elog(WARN,"Cannot allocate polygon for union");
9898

99-
memset((char*)p,0,sizeof(POLYGON));/* zero any holes */
99+
MemSet((char*)p,0,sizeof(POLYGON));/* zero any holes */
100100
p->size=sizeof(POLYGON);
101101
p->npts=0;
102102
p->boundbox.high.x=Max(a->boundbox.high.x,b->boundbox.high.x);
@@ -138,7 +138,7 @@ rt_poly_inter(POLYGON *a, POLYGON *b)
138138
if (!PointerIsValid(p))
139139
elog(WARN,"Cannot allocate polygon for intersection");
140140

141-
memset((char*)p,0,sizeof(POLYGON));/* zero any holes */
141+
MemSet((char*)p,0,sizeof(POLYGON));/* zero any holes */
142142
p->size=sizeof(POLYGON);
143143
p->npts=0;
144144
p->boundbox.high.x=Min(a->boundbox.high.x,b->boundbox.high.x);

‎src/backend/access/rtree/rtree.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.17 1997/09/08 21:41:39 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.18 1997/09/18 20:19:59 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -892,7 +892,7 @@ RTInitBuffer(Buffer b, uint32 f)
892892
pageSize=BufferGetPageSize(b);
893893

894894
page=BufferGetPage(b);
895-
memset(page,0, (int)pageSize);
895+
MemSet(page,0, (int)pageSize);
896896
PageInit(page,pageSize,sizeof(RTreePageOpaqueData));
897897

898898
opaque= (RTreePageOpaque)PageGetSpecialPointer(page);

‎src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.25 1997/09/08 21:42:01 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.26 1997/09/18 20:20:04 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -894,7 +894,7 @@ AllocateAttribute()
894894
{
895895
elog(FATAL,"AllocateAttribute: malloc failed");
896896
}
897-
memset(attribute,0,ATTRIBUTE_TUPLE_SIZE);
897+
MemSet(attribute,0,ATTRIBUTE_TUPLE_SIZE);
898898

899899
return (attribute);
900900
}

‎src/backend/catalog/heap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.28 1997/09/08 21:42:16 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.29 1997/09/18 20:20:11 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
*heap_creatr()- Create an uncataloged heap relation
@@ -278,7 +278,7 @@ heap_creatr(char *name,
278278
len=sizeof(RelationData);
279279

280280
rdesc= (Relation)palloc(len);
281-
memset((char*)rdesc,0,len);
281+
MemSet((char*)rdesc,0,len);
282282

283283
/* ----------
284284
create a new tuple descriptor from the one passed in
@@ -303,7 +303,7 @@ heap_creatr(char *name,
303303

304304
rdesc->rd_rel= (Form_pg_class)palloc(sizeof*rdesc->rd_rel);
305305

306-
memset((char*)rdesc->rd_rel,0,
306+
MemSet((char*)rdesc->rd_rel,0,
307307
sizeof*rdesc->rd_rel);
308308
namestrcpy(&(rdesc->rd_rel->relname),relname);
309309
rdesc->rd_rel->relkind=RELKIND_UNCATALOGED;
@@ -1444,7 +1444,7 @@ InitTempRelList(void)
14441444
tempRels= (TempRelList*)malloc(sizeof(TempRelList));
14451445
tempRels->size=TEMP_REL_LIST_SIZE;
14461446
tempRels->rels= (Relation*)malloc(sizeof(Relation)*tempRels->size);
1447-
memset(tempRels->rels,0,sizeof(Relation)*tempRels->size);
1447+
MemSet(tempRels->rels,0,sizeof(Relation)*tempRels->size);
14481448
tempRels->num=0;
14491449
}
14501450

‎src/backend/catalog/index.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.22 1997/09/08 21:42:18 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.23 1997/09/18 20:20:14 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -283,7 +283,7 @@ BuildFuncTupleDesc(FuncIndexInfo *funcInfo)
283283
*/
284284
funcTupDesc=CreateTemplateTupleDesc(1);
285285
funcTupDesc->attrs[0]= (AttributeTupleForm)palloc(ATTRIBUTE_TUPLE_SIZE);
286-
memset(funcTupDesc->attrs[0],0,ATTRIBUTE_TUPLE_SIZE);
286+
MemSet(funcTupDesc->attrs[0],0,ATTRIBUTE_TUPLE_SIZE);
287287

288288
/*
289289
* Lookup the function for the return type.
@@ -679,8 +679,8 @@ AppendAttributeTuples(Relation indexRelation, int numatts)
679679
*initialize null[], replace[] and value[]
680680
* ----------------
681681
*/
682-
memset(nullv,' ',Natts_pg_attribute);
683-
memset(replace,' ',Natts_pg_attribute);
682+
MemSet(nullv,' ',Natts_pg_attribute);
683+
MemSet(replace,' ',Natts_pg_attribute);
684684

685685
/* ----------------
686686
*create the first attribute tuple.
@@ -840,8 +840,8 @@ UpdateIndexRelation(Oid indexoid,
840840
attributeList=lnext(attributeList);
841841
}
842842

843-
memset((char*)&indexForm->indkey[0],0,sizeofindexForm->indkey);
844-
memset((char*)&indexForm->indclass[0],0,sizeofindexForm->indclass);
843+
MemSet((char*)&indexForm->indkey[0],0,sizeofindexForm->indkey);
844+
MemSet((char*)&indexForm->indclass[0],0,sizeofindexForm->indclass);
845845

846846
/* ----------------
847847
*copy index key and op class information

‎src/backend/catalog/pg_aggregate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.8 1997/09/08 21:42:22 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.9 1997/09/18 20:20:15 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -80,7 +80,7 @@ AggregateCreate(char *aggName,
8080
OidfnArgs[8];
8181
TupleDesctupDesc;
8282

83-
memset(fnArgs,0,8*sizeof(Oid));
83+
MemSet(fnArgs,0,8*sizeof(Oid));
8484

8585
/* sanity checks */
8686
if (!aggName)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp