mirror of
https://github.com/postgres/postgres.git
synced 2025-11-10 17:42:29 +03:00
Inline memset() as MemSet().
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.17 1997/09/08 21:48:05 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.18 1997/09/18 20:22:08 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -192,7 +192,7 @@ makeacl(int n)
|
||||
size = ACL_N_SIZE(n);
|
||||
if (!(new_acl = (Acl *) palloc(size)))
|
||||
elog(WARN, "makeacl: palloc failed on %d\n", size);
|
||||
memset((char *) new_acl, 0, size);
|
||||
MemSet((char *) new_acl, 0, size);
|
||||
new_acl->size = size;
|
||||
new_acl->ndim = 1;
|
||||
new_acl->flags = 0;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.19 1997/09/08 21:48:09 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.20 1997/09/18 20:22:10 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -199,7 +199,7 @@ array_in(char *string, /* input array in external form */
|
||||
{
|
||||
char *emptyArray = palloc(sizeof(ArrayType));
|
||||
|
||||
memset(emptyArray, 0, sizeof(ArrayType));
|
||||
MemSet(emptyArray, 0, sizeof(ArrayType));
|
||||
*(int32 *) emptyArray = sizeof(ArrayType);
|
||||
return emptyArray;
|
||||
}
|
||||
@@ -213,7 +213,7 @@ array_in(char *string, /* input array in external form */
|
||||
&nbytes);
|
||||
nbytes += ARR_OVERHEAD(ndim);
|
||||
retval = (ArrayType *) palloc(nbytes);
|
||||
memset(retval, 0, nbytes);
|
||||
MemSet(retval, 0, nbytes);
|
||||
memmove(retval, (char *) &nbytes, sizeof(int));
|
||||
memmove((char *) ARR_NDIM_PTR(retval), (char *) &ndim, sizeof(int));
|
||||
SET_LO_FLAG(false, retval);
|
||||
@@ -240,7 +240,7 @@ array_in(char *string, /* input array in external form */
|
||||
dim, typlen);
|
||||
nbytes = bytes + ARR_OVERHEAD(ndim);
|
||||
retval = (ArrayType *) palloc(nbytes);
|
||||
memset(retval, 0, nbytes);
|
||||
MemSet(retval, 0, nbytes);
|
||||
memmove(retval, (char *) &nbytes, sizeof(int));
|
||||
memmove((char *) ARR_NDIM_PTR(retval), (char *) &ndim, sizeof(int));
|
||||
SET_LO_FLAG(true, retval);
|
||||
@@ -391,7 +391,7 @@ _ReadArrayStr(char *arrayStr,
|
||||
for (i = 0; i < ndim; indx[i++] = 0);
|
||||
/* read array enclosed within {} */
|
||||
values = (char **) palloc(nitems * sizeof(char *));
|
||||
memset(values, 0, nitems * sizeof(char *));
|
||||
MemSet(values, 0, nitems * sizeof(char *));
|
||||
q = p = arrayStr;
|
||||
|
||||
while (!eoArray)
|
||||
@@ -482,7 +482,7 @@ _ReadArrayStr(char *arrayStr,
|
||||
if (!values[i])
|
||||
{
|
||||
values[i] = palloc(typlen);
|
||||
memset(values[i], 0, typlen);
|
||||
MemSet(values[i], 0, typlen);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -788,7 +788,7 @@ array_dims(ArrayType *v, bool *isNull)
|
||||
* 33 since we assume 15 digits per number + ':' +'[]'
|
||||
*/
|
||||
save_p = p = (char *) palloc(nbytes + 4);
|
||||
memset(save_p, 0, nbytes + 4);
|
||||
MemSet(save_p, 0, nbytes + 4);
|
||||
dimv = ARR_DIMS(v);
|
||||
lb = ARR_LBOUND(v);
|
||||
p += 4;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* workings can be found in the book "Software Solutions in C" by
|
||||
* Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
|
||||
*
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.14 1997/09/13 12:05:32 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.15 1997/09/18 20:22:12 momjian Exp $
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
@@ -226,7 +226,7 @@ cash_out(Cash *in_value)
|
||||
}
|
||||
|
||||
/* allow for trailing negative strings */
|
||||
memset(buf, ' ', CASH_BUFSZ);
|
||||
MemSet(buf, ' ', CASH_BUFSZ);
|
||||
buf[TERMINATOR] = buf[LAST_PAREN] = '\0';
|
||||
|
||||
while (value || count > (point_pos - 2))
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.23 1997/09/08 21:48:27 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.24 1997/09/18 20:22:13 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -2549,7 +2549,7 @@ poly_in(char *str)
|
||||
size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * npts);
|
||||
poly = PALLOC(size);
|
||||
|
||||
memset((char *) poly, 0, size); /* zero any holes */
|
||||
MemSet((char *) poly, 0, size); /* zero any holes */
|
||||
poly->size = size;
|
||||
poly->npts = npts;
|
||||
|
||||
@@ -3191,7 +3191,7 @@ upgradepath(PATH *path)
|
||||
npts = (path->npts - 1);
|
||||
size = offsetof(PATH, p[0]) +(sizeof(path->p[0]) * npts);
|
||||
result = PALLOC(size);
|
||||
memset((char *) result, 0, size);
|
||||
MemSet((char *) result, 0, size);
|
||||
|
||||
result->size = size;
|
||||
result->npts = npts;
|
||||
@@ -3351,7 +3351,7 @@ upgradepoly(POLYGON *poly)
|
||||
|
||||
size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * poly->npts);
|
||||
result = PALLOC(size);
|
||||
memset((char *) result, 0, size);
|
||||
MemSet((char *) result, 0, size);
|
||||
|
||||
result->size = size;
|
||||
result->npts = poly->npts;
|
||||
@@ -3398,7 +3398,7 @@ revertpoly(POLYGON *poly)
|
||||
|
||||
size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * poly->npts);
|
||||
result = PALLOC(size);
|
||||
memset((char *) result, 0, size);
|
||||
MemSet((char *) result, 0, size);
|
||||
|
||||
result->size = size;
|
||||
result->npts = poly->npts;
|
||||
@@ -3996,7 +3996,7 @@ circle_poly(int npts, CIRCLE *circle)
|
||||
size = offsetof(POLYGON, p[0]) +(sizeof(poly->p[0]) * npts);
|
||||
poly = PALLOC(size);
|
||||
|
||||
memset((char *) poly, 0, size); /* zero any holes */
|
||||
MemSet((char *) poly, 0, size); /* zero any holes */
|
||||
poly->size = size;
|
||||
poly->npts = npts;
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.15 1997/09/08 02:30:53 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.16 1997/09/18 20:22:15 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -154,7 +154,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
|
||||
sprintf(out, fmt, value);
|
||||
if ((ret = strlen(out)) > width)
|
||||
{
|
||||
memset(ascii, '*', width - 2);
|
||||
MemSet(ascii, '*', width - 2);
|
||||
ascii[width] = 0;
|
||||
return (0);
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.7 1997/09/08 21:48:37 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.8 1997/09/18 20:22:16 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -28,7 +28,7 @@ oidnamein(char *inStr)
|
||||
|
||||
oc = (OidName) palloc(sizeof(OidNameData));
|
||||
|
||||
memset(oc, 0, sizeof(OidNameData));
|
||||
MemSet(oc, 0, sizeof(OidNameData));
|
||||
for (inptr = inStr; *inptr && *inptr != ','; inptr++)
|
||||
;
|
||||
|
||||
|
||||
4
src/backend/utils/cache/catcache.c
vendored
4
src/backend/utils/cache/catcache.c
vendored
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.15 1997/09/18 14:20:29 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.16 1997/09/18 20:22:18 momjian Exp $
|
||||
*
|
||||
* Notes:
|
||||
* XXX This needs to use exception.h to handle recovery when
|
||||
@@ -676,7 +676,7 @@ InitSysCache(char *relname,
|
||||
* ----------------
|
||||
*/
|
||||
cp = (CatCache *) palloc(sizeof(CatCache));
|
||||
memset((char *) cp, 0, sizeof(CatCache));
|
||||
MemSet((char *) cp, 0, sizeof(CatCache));
|
||||
|
||||
/* ----------------
|
||||
* initialize the cache buckets (each bucket is a list header)
|
||||
|
||||
18
src/backend/utils/cache/relcache.c
vendored
18
src/backend/utils/cache/relcache.c
vendored
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.24 1997/09/12 06:57:04 vadim Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.25 1997/09/18 20:22:24 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -302,7 +302,7 @@ BuildDescInfoError(RelationBuildDescInfo buildinfo)
|
||||
{
|
||||
static char errBuf[64];
|
||||
|
||||
memset(errBuf, 0, (int) sizeof(errBuf));
|
||||
MemSet(errBuf, 0, (int) sizeof(errBuf));
|
||||
switch (buildinfo.infotype)
|
||||
{
|
||||
case INFO_RELID:
|
||||
@@ -494,7 +494,7 @@ AllocateRelationDesc(u_int natts, Form_pg_class relp)
|
||||
* clear new reldesc
|
||||
* ----------------
|
||||
*/
|
||||
memset((char *) relation, 0, len);
|
||||
MemSet((char *) relation, 0, len);
|
||||
|
||||
/* initialize attribute tuple form */
|
||||
relation->rd_att = CreateTemplateTupleDesc(natts);
|
||||
@@ -670,7 +670,7 @@ build_tupdesc_ind(RelationBuildDescInfo buildinfo,
|
||||
constr->num_check = relation->rd_rel->relchecks;
|
||||
constr->check = (ConstrCheck *) palloc(constr->num_check *
|
||||
sizeof(ConstrCheck));
|
||||
memset(constr->check, 0, constr->num_check * sizeof(ConstrCheck));
|
||||
MemSet(constr->check, 0, constr->num_check * sizeof(ConstrCheck));
|
||||
RelCheckFetch(relation);
|
||||
}
|
||||
else
|
||||
@@ -1043,7 +1043,7 @@ formrdesc(char *relationName,
|
||||
*/
|
||||
len = sizeof(RelationData);
|
||||
relation = (Relation) palloc(len);
|
||||
memset((char *) relation, 0, len);
|
||||
MemSet((char *) relation, 0, len);
|
||||
|
||||
/* ----------------
|
||||
* don't open the unix file yet..
|
||||
@@ -1063,7 +1063,7 @@ formrdesc(char *relationName,
|
||||
*/
|
||||
relation->rd_rel = (Form_pg_class)
|
||||
palloc((Size) (sizeof(*relation->rd_rel)));
|
||||
memset(relation->rd_rel, 0, sizeof(FormData_pg_class));
|
||||
MemSet(relation->rd_rel, 0, sizeof(FormData_pg_class));
|
||||
namestrcpy(&relation->rd_rel->relname, relationName);
|
||||
|
||||
/* ----------------
|
||||
@@ -1106,7 +1106,7 @@ formrdesc(char *relationName,
|
||||
relation->rd_att->attrs[i] =
|
||||
(AttributeTupleForm) palloc(ATTRIBUTE_TUPLE_SIZE);
|
||||
|
||||
memset((char *) relation->rd_att->attrs[i], 0,
|
||||
MemSet((char *) relation->rd_att->attrs[i], 0,
|
||||
ATTRIBUTE_TUPLE_SIZE);
|
||||
memmove((char *) relation->rd_att->attrs[i],
|
||||
(char *) &att[i],
|
||||
@@ -1657,7 +1657,7 @@ RelationInitialize(void)
|
||||
* create global caches
|
||||
* ----------------
|
||||
*/
|
||||
memset(&ctl, 0, (int) sizeof(ctl));
|
||||
MemSet(&ctl, 0, (int) sizeof(ctl));
|
||||
ctl.keysize = sizeof(NameData);
|
||||
ctl.datasize = sizeof(Relation);
|
||||
RelationNameCache = hash_create(INITRELCACHESIZE, &ctl, HASH_ELEM);
|
||||
@@ -1932,7 +1932,7 @@ init_irels(void)
|
||||
}
|
||||
|
||||
ird = irel[relno] = (Relation) palloc(len);
|
||||
memset(ird, 0, len);
|
||||
MemSet(ird, 0, len);
|
||||
|
||||
/* then, read the Relation structure */
|
||||
if ((nread = FileRead(fd, (char *) ird, len)) != len)
|
||||
|
||||
4
src/backend/utils/cache/syscache.c
vendored
4
src/backend/utils/cache/syscache.c
vendored
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.8 1997/09/12 04:08:35 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.9 1997/09/18 20:22:25 momjian Exp $
|
||||
*
|
||||
* NOTES
|
||||
* These routines allow the parser/planner/executor to perform
|
||||
@@ -332,7 +332,7 @@ static int32 SysCacheSize = lengthof(cacheinfo);
|
||||
void
|
||||
zerocaches()
|
||||
{
|
||||
memset((char *) SysCache, 0, SysCacheSize * sizeof(struct catcache *));
|
||||
MemSet((char *) SysCache, 0, SysCacheSize * sizeof(struct catcache *));
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.12 1997/09/12 04:08:39 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.13 1997/09/18 20:22:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -189,7 +189,7 @@ handle_load(char *filename, char *funcname)
|
||||
malloc(sizeof(DynamicFileList));
|
||||
file_scanner = file_tail->next;
|
||||
}
|
||||
memset((char *) file_scanner, 0, sizeof(DynamicFileList));
|
||||
MemSet((char *) file_scanner, 0, sizeof(DynamicFileList));
|
||||
|
||||
strcpy(file_scanner->filename, filename);
|
||||
file_scanner->device = stat_buf.st_dev;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.10 1997/09/08 21:49:13 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.11 1997/09/18 20:22:30 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -162,7 +162,7 @@ hash_create(int nelem, HASHCTL *info, int flags)
|
||||
|
||||
|
||||
hashp = (HTAB *) MEM_ALLOC((unsigned long) sizeof(HTAB));
|
||||
memset(hashp, 0, sizeof(HTAB));
|
||||
MemSet(hashp, 0, sizeof(HTAB));
|
||||
|
||||
if (flags & HASH_FUNCTION)
|
||||
{
|
||||
@@ -271,7 +271,7 @@ hdefault(HTAB *hashp)
|
||||
{
|
||||
HHDR *hctl;
|
||||
|
||||
memset(hashp->hctl, 0, sizeof(HHDR));
|
||||
MemSet(hashp->hctl, 0, sizeof(HHDR));
|
||||
|
||||
hctl = hashp->hctl;
|
||||
hctl->bsize = DEF_BUCKET_SIZE;
|
||||
@@ -829,7 +829,7 @@ dir_realloc(HTAB *hashp)
|
||||
if (p != NULL)
|
||||
{
|
||||
memmove(p, *p_ptr, old_dirsize);
|
||||
memset(*p_ptr + old_dirsize, 0, new_dirsize - old_dirsize);
|
||||
MemSet(*p_ptr + old_dirsize, 0, new_dirsize - old_dirsize);
|
||||
free((char *) *p_ptr);
|
||||
*p_ptr = p;
|
||||
hashp->hctl->dsize = new_dirsize;
|
||||
@@ -855,7 +855,7 @@ seg_alloc(HTAB *hashp)
|
||||
return (0);
|
||||
}
|
||||
|
||||
memset((char *) segp, 0,
|
||||
MemSet((char *) segp, 0,
|
||||
(long) sizeof(SEGMENT) * hashp->hctl->ssize);
|
||||
|
||||
segOffset = MAKE_HASHOFFSET(hashp, segp);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.8 1997/09/08 21:49:31 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.9 1997/09/18 20:22:36 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -126,7 +126,7 @@ static HTAB *PortalHashTable = NULL;
|
||||
|
||||
#define PortalHashTableLookup(NAME, PORTAL) \
|
||||
{ PortalHashEnt *hentry; bool found; char key[MAX_PORTALNAME_LEN]; \
|
||||
memset(key, 0, MAX_PORTALNAME_LEN); \
|
||||
MemSet(key, 0, MAX_PORTALNAME_LEN); \
|
||||
sprintf(key, "%s", NAME); \
|
||||
hentry = (PortalHashEnt*)hash_search(PortalHashTable, \
|
||||
key, HASH_FIND, &found); \
|
||||
@@ -139,7 +139,7 @@ static HTAB *PortalHashTable = NULL;
|
||||
}
|
||||
#define PortalHashTableInsert(PORTAL) \
|
||||
{ PortalHashEnt *hentry; bool found; char key[MAX_PORTALNAME_LEN]; \
|
||||
memset(key, 0, MAX_PORTALNAME_LEN); \
|
||||
MemSet(key, 0, MAX_PORTALNAME_LEN); \
|
||||
sprintf(key, "%s", PORTAL->name); \
|
||||
hentry = (PortalHashEnt*)hash_search(PortalHashTable, \
|
||||
key, HASH_ENTER, &found); \
|
||||
@@ -151,7 +151,7 @@ static HTAB *PortalHashTable = NULL;
|
||||
}
|
||||
#define PortalHashTableDelete(PORTAL) \
|
||||
{ PortalHashEnt *hentry; bool found; char key[MAX_PORTALNAME_LEN]; \
|
||||
memset(key, 0, MAX_PORTALNAME_LEN); \
|
||||
MemSet(key, 0, MAX_PORTALNAME_LEN); \
|
||||
sprintf(key, "%s", PORTAL->name); \
|
||||
hentry = (PortalHashEnt*)hash_search(PortalHashTable, \
|
||||
key, HASH_REMOVE, &found); \
|
||||
|
||||
Reference in New Issue
Block a user