Change some unnecessary MemSet calls

petere · petere · commit 258f48f858b0 · 2022-07-01T00:16:38.000+02:00
MemSet() with a value other than 0 just falls back to memset(), so the indirection is unnecessary if the value is constant and not 0. Since there is some interest in getting rid of MemSet(), this gets some easy cases out of the way. (There are a few MemSet() calls that I didn't change to maintain the consistency with their surrounding code.) Discussion: https://www.postgresql.org/message-id/flat/CAEudQApCeq4JjW1BdnwU=m=-DvG5WyUik0Yfn3p6UNphiHjj+w@mail.gmail.com
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
@@ -459,7 +459,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS)
 			if (ISALLTRUE(datum_l) || ISALLTRUE(_j))
 			{
 				if (!ISALLTRUE(datum_l))
-					MemSet((void *) union_l, 0xff, siglen);
+					memset((void *) union_l, 0xff, siglen);
 			}
 			else
 			{
@@ -475,7 +475,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS)
 			if (ISALLTRUE(datum_r) || ISALLTRUE(_j))
 			{
 				if (!ISALLTRUE(datum_r))
-					MemSet((void *) union_r, 0xff, siglen);
+					memset((void *) union_r, 0xff, siglen);
 			}
 			else
 			{
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
@@ -420,7 +420,7 @@ g_intbig_picksplit(PG_FUNCTION_ARGS)
 			if (ISALLTRUE(datum_l) || ISALLTRUE(_j))
 			{
 				if (!ISALLTRUE(datum_l))
-					MemSet((void *) union_l, 0xff, siglen);
+					memset((void *) union_l, 0xff, siglen);
 			}
 			else
 			{
@@ -436,7 +436,7 @@ g_intbig_picksplit(PG_FUNCTION_ARGS)
 			if (ISALLTRUE(datum_r) || ISALLTRUE(_j))
 			{
 				if (!ISALLTRUE(datum_r))
-					MemSet((void *) union_r, 0xff, siglen);
+					memset((void *) union_r, 0xff, siglen);
 			}
 			else
 			{
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
@@ -345,7 +345,7 @@ _ltree_picksplit(PG_FUNCTION_ARGS)
 			if (LTG_ISALLTRUE(datum_l) || LTG_ISALLTRUE(_j))
 			{
 				if (!LTG_ISALLTRUE(datum_l))
-					MemSet((void *) union_l, 0xff, siglen);
+					memset((void *) union_l, 0xff, siglen);
 			}
 			else
 			{
@@ -361,7 +361,7 @@ _ltree_picksplit(PG_FUNCTION_ARGS)
 			if (LTG_ISALLTRUE(datum_r) || LTG_ISALLTRUE(_j))
 			{
 				if (!LTG_ISALLTRUE(datum_r))
-					MemSet((void *) union_r, 0xff, siglen);
+					memset((void *) union_r, 0xff, siglen);
 			}
 			else
 			{
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
@@ -424,7 +424,7 @@ sql_exec(PGconn *conn, const char *todo, bool quiet)
 		}
 		fprintf(stdout, "\n");
 		pad = (char *) pg_malloc(l + 1);
-		MemSet(pad, '-', l);
+		memset(pad, '-', l);
 		pad[l] = '\0';
 		fprintf(stdout, "%s\n", pad);
 		free(pad);
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
@@ -914,7 +914,7 @@ gtrgm_picksplit(PG_FUNCTION_ARGS)
 			if (ISALLTRUE(datum_l) || cache[j].allistrue)
 			{
 				if (!ISALLTRUE(datum_l))
-					MemSet((void *) GETSIGN(datum_l), 0xff, siglen);
+					memset((void *) GETSIGN(datum_l), 0xff, siglen);
 			}
 			else
 			{
@@ -930,7 +930,7 @@ gtrgm_picksplit(PG_FUNCTION_ARGS)
 			if (ISALLTRUE(datum_r) || cache[j].allistrue)
 			{
 				if (!ISALLTRUE(datum_r))
-					MemSet((void *) GETSIGN(datum_r), 0xff, siglen);
+					memset((void *) GETSIGN(datum_r), 0xff, siglen);
 			}
 			else
 			{
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
@@ -760,7 +760,7 @@ _hash_initbitmapbuffer(Buffer buf, uint16 bmsize, bool initpage)
 
 	/* set all of the bits to 1 */
 	freep = HashPageGetBitmap(pg);
-	MemSet(freep, 0xFF, bmsize);
+	memset(freep, 0xFF, bmsize);
 
 	/*
 	 * Set pd_lower just past the end of the bitmap page data.  We could even
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
@@ -1410,7 +1410,7 @@ pg_stat_get_wal_receiver(PG_FUNCTION_ARGS)
 		 * see details. Other users only get the pid value to know whether it
 		 * is a WAL receiver, but no details.
 		 */
-		MemSet(&nulls[1], true, sizeof(bool) * (tupdesc->natts - 1));
+		memset(&nulls[1], true, sizeof(bool) * (tupdesc->natts - 1));
 	}
 	else
 	{
diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c
@@ -753,7 +753,7 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)
 			if (ISALLTRUE(datum_l) || cache[j].allistrue)
 			{
 				if (!ISALLTRUE(datum_l))
-					MemSet((void *) GETSIGN(datum_l), 0xff, siglen);
+					memset((void *) GETSIGN(datum_l), 0xff, siglen);
 			}
 			else
 			{
@@ -769,7 +769,7 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)
 			if (ISALLTRUE(datum_r) || cache[j].allistrue)
 			{
 				if (!ISALLTRUE(datum_r))
-					MemSet((void *) GETSIGN(datum_r), 0xff, siglen);
+					memset((void *) GETSIGN(datum_r), 0xff, siglen);
 			}
 			else
 			{

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS)`
`459`	`459`	`if (ISALLTRUE(datum_l) \|\| ISALLTRUE(_j))`
`460`	`460`	`{`
`461`	`461`	`if (!ISALLTRUE(datum_l))`
`462`		`- MemSet((void *) union_l, 0xff, siglen);`
	`462`	`+ memset((void *) union_l, 0xff, siglen);`
`463`	`463`	`}`
`464`	`464`	`else`
`465`	`465`	`{`
`@@ -475,7 +475,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS)`
`475`	`475`	`if (ISALLTRUE(datum_r) \|\| ISALLTRUE(_j))`
`476`	`476`	`{`
`477`	`477`	`if (!ISALLTRUE(datum_r))`
`478`		`- MemSet((void *) union_r, 0xff, siglen);`
	`478`	`+ memset((void *) union_r, 0xff, siglen);`
`479`	`479`	`}`
`480`	`480`	`else`
`481`	`481`	`{`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ g_intbig_picksplit(PG_FUNCTION_ARGS)`
`420`	`420`	`if (ISALLTRUE(datum_l) \|\| ISALLTRUE(_j))`
`421`	`421`	`{`
`422`	`422`	`if (!ISALLTRUE(datum_l))`
`423`		`- MemSet((void *) union_l, 0xff, siglen);`
	`423`	`+ memset((void *) union_l, 0xff, siglen);`
`424`	`424`	`}`
`425`	`425`	`else`
`426`	`426`	`{`
`@@ -436,7 +436,7 @@ g_intbig_picksplit(PG_FUNCTION_ARGS)`
`436`	`436`	`if (ISALLTRUE(datum_r) \|\| ISALLTRUE(_j))`
`437`	`437`	`{`
`438`	`438`	`if (!ISALLTRUE(datum_r))`
`439`		`- MemSet((void *) union_r, 0xff, siglen);`
	`439`	`+ memset((void *) union_r, 0xff, siglen);`
`440`	`440`	`}`
`441`	`441`	`else`
`442`	`442`	`{`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ _ltree_picksplit(PG_FUNCTION_ARGS)`
`345`	`345`	`if (LTG_ISALLTRUE(datum_l) \|\| LTG_ISALLTRUE(_j))`
`346`	`346`	`{`
`347`	`347`	`if (!LTG_ISALLTRUE(datum_l))`
`348`		`- MemSet((void *) union_l, 0xff, siglen);`
	`348`	`+ memset((void *) union_l, 0xff, siglen);`
`349`	`349`	`}`
`350`	`350`	`else`
`351`	`351`	`{`
`@@ -361,7 +361,7 @@ _ltree_picksplit(PG_FUNCTION_ARGS)`
`361`	`361`	`if (LTG_ISALLTRUE(datum_r) \|\| LTG_ISALLTRUE(_j))`
`362`	`362`	`{`
`363`	`363`	`if (!LTG_ISALLTRUE(datum_r))`
`364`		`- MemSet((void *) union_r, 0xff, siglen);`
	`364`	`+ memset((void *) union_r, 0xff, siglen);`
`365`	`365`	`}`
`366`	`366`	`else`
`367`	`367`	`{`
Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ sql_exec(PGconn conn, const char todo, bool quiet)`
`424`	`424`	`}`
`425`	`425`	`fprintf(stdout, "\n");`
`426`	`426`	`pad = (char *) pg_malloc(l + 1);`
`427`		`- MemSet(pad, '-', l);`
	`427`	`+ memset(pad, '-', l);`
`428`	`428`	`pad[l] = '\0';`
`429`	`429`	`fprintf(stdout, "%s\n", pad);`
`430`	`430`	`free(pad);`
Original file line number	Diff line number	Diff line change
`@@ -914,7 +914,7 @@ gtrgm_picksplit(PG_FUNCTION_ARGS)`
`914`	`914`	`if (ISALLTRUE(datum_l) \|\| cache[j].allistrue)`
`915`	`915`	`{`
`916`	`916`	`if (!ISALLTRUE(datum_l))`
`917`		`- MemSet((void *) GETSIGN(datum_l), 0xff, siglen);`
	`917`	`+ memset((void *) GETSIGN(datum_l), 0xff, siglen);`
`918`	`918`	`}`
`919`	`919`	`else`
`920`	`920`	`{`
`@@ -930,7 +930,7 @@ gtrgm_picksplit(PG_FUNCTION_ARGS)`
`930`	`930`	`if (ISALLTRUE(datum_r) \|\| cache[j].allistrue)`
`931`	`931`	`{`
`932`	`932`	`if (!ISALLTRUE(datum_r))`
`933`		`- MemSet((void *) GETSIGN(datum_r), 0xff, siglen);`
	`933`	`+ memset((void *) GETSIGN(datum_r), 0xff, siglen);`
`934`	`934`	`}`
`935`	`935`	`else`
`936`	`936`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1410,7 +1410,7 @@ pg_stat_get_wal_receiver(PG_FUNCTION_ARGS)`
`1410`	`1410`	`* see details. Other users only get the pid value to know whether it`
`1411`	`1411`	`* is a WAL receiver, but no details.`
`1412`	`1412`	`*/`
`1413`		`- MemSet(&nulls[1], true, sizeof(bool) * (tupdesc->natts - 1));`
	`1413`	`+ memset(&nulls[1], true, sizeof(bool) * (tupdesc->natts - 1));`
`1414`	`1414`	`}`
`1415`	`1415`	`else`
`1416`	`1416`	`{`
Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)`
`753`	`753`	`if (ISALLTRUE(datum_l) \|\| cache[j].allistrue)`
`754`	`754`	`{`
`755`	`755`	`if (!ISALLTRUE(datum_l))`
`756`		`- MemSet((void *) GETSIGN(datum_l), 0xff, siglen);`
	`756`	`+ memset((void *) GETSIGN(datum_l), 0xff, siglen);`
`757`	`757`	`}`
`758`	`758`	`else`
`759`	`759`	`{`
`@@ -769,7 +769,7 @@ gtsvector_picksplit(PG_FUNCTION_ARGS)`
`769`	`769`	`if (ISALLTRUE(datum_r) \|\| cache[j].allistrue)`
`770`	`770`	`{`
`771`	`771`	`if (!ISALLTRUE(datum_r))`
`772`		`- MemSet((void *) GETSIGN(datum_r), 0xff, siglen);`
	`772`	`+ memset((void *) GETSIGN(datum_r), 0xff, siglen);`
`773`	`773`	`}`
`774`	`774`	`else`
`775`	`775`	`{`