pgcrypto: Remove unused code

danielgustafsson · danielgustafsson · commit 1d3566f1b2a8 · 2022-09-14T21:58:30.000+02:00
The mbuf_tell, mbuf_rewind and pgp_get_cipher_name functions were introduced in commit e94dd6a, but were never used, so remove. Reviewed-by: Aleksander Alekseev <aleksander@timescale.com> Discussion: https://postgr.es/m/FCF3F14E-17D5-41F2-AC58-0A97B341193A@yesql.se
diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
@@ -58,12 +58,6 @@ mbuf_size(MBuf *mbuf)
 	return mbuf->data_end - mbuf->data;
 }
 
-int
-mbuf_tell(MBuf *mbuf)
-{
-	return mbuf->read_pos - mbuf->data;
-}
-
 int
 mbuf_free(MBuf *mbuf)
 {
@@ -164,13 +158,6 @@ mbuf_grab(MBuf *mbuf, int len, uint8 **data_p)
 	return len;
 }
 
-int
-mbuf_rewind(MBuf *mbuf)
-{
-	mbuf->read_pos = mbuf->data;
-	return 0;
-}
-
 int
 mbuf_steal_data(MBuf *mbuf, uint8 **data_p)
 {
diff --git a/contrib/pgcrypto/mbuf.h b/contrib/pgcrypto/mbuf.h
@@ -78,13 +78,11 @@ struct PullFilterOps
  */
 MBuf	   *mbuf_create(int len);
 MBuf	   *mbuf_create_from_data(uint8 *data, int len);
-int			mbuf_tell(MBuf *mbuf);
 int			mbuf_avail(MBuf *mbuf);
 int			mbuf_size(MBuf *mbuf);
 int			mbuf_grab(MBuf *mbuf, int len, uint8 **data_p);
 int			mbuf_steal_data(MBuf *mbuf, uint8 **data_p);
 int			mbuf_append(MBuf *dst, const uint8 *buf, int cnt);
-int			mbuf_rewind(MBuf *mbuf);
 int			mbuf_free(MBuf *mbuf);
 
 /*
diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c
@@ -133,16 +133,6 @@ pgp_get_digest_name(int code)
 	return NULL;
 }
 
-const char *
-pgp_get_cipher_name(int code)
-{
-	const struct cipher_info *i = get_cipher_info(code);
-
-	if (i != NULL)
-		return i->name;
-	return NULL;
-}
-
 int
 pgp_get_cipher_key_size(int code)
 {
diff --git a/contrib/pgcrypto/pgp.h b/contrib/pgcrypto/pgp.h
@@ -244,7 +244,6 @@ int			pgp_free(PGP_Context *ctx);
 int			pgp_get_digest_code(const char *name);
 int			pgp_get_cipher_code(const char *name);
 const char *pgp_get_digest_name(int code);
-const char *pgp_get_cipher_name(int code);
 
 int			pgp_set_cipher_algo(PGP_Context *ctx, const char *name);
 int			pgp_set_s2k_mode(PGP_Context *ctx, int type);

Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,6 @@ mbuf_size(MBuf *mbuf)`
`58`	`58`	`return mbuf->data_end - mbuf->data;`
`59`	`59`	`}`
`60`	`60`
`61`		`-int`
`62`		`-mbuf_tell(MBuf *mbuf)`
`63`		`-{`
`64`		`- return mbuf->read_pos - mbuf->data;`
`65`		`-}`
`66`		`-`
`67`	`61`	`int`
`68`	`62`	`mbuf_free(MBuf *mbuf)`
`69`	`63`	`{`
`@@ -164,13 +158,6 @@ mbuf_grab(MBuf mbuf, int len, uint8 *data_p)`
`164`	`158`	`return len;`
`165`	`159`	`}`
`166`	`160`
`167`		`-int`
`168`		`-mbuf_rewind(MBuf *mbuf)`
`169`		`-{`
`170`		`- mbuf->read_pos = mbuf->data;`
`171`		`- return 0;`
`172`		`-}`
`173`		`-`
`174`	`161`	`int`
`175`	`162`	`mbuf_steal_data(MBuf mbuf, uint8 *data_p)`
`176`	`163`	`{`