pgcrypto: Remove unused code

The mbuf_tell, mbuf_rewind and pgp_get_cipher_name functions were
introduced in commit e94dd6ab91, but were never used, so remove.

Reviewed-by: Aleksander Alekseev <[email protected]>
Discussion: https://postgr.es/m/FCF3F14E-17D5-41F2-AC58-0A97B341193A@yesql.se

diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
index bc668a0e802ff64e2621b6d0f3bd3f498b766e5d..99f8957b00414fb9b4973da917db1dc86d8e5a14 100644 (file)
--- 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
index e6d754e8695ce85fc6b9826585db17e8eee99c68..adb18430b718a1ed9de8cddca657faaaa6c455ca 100644 (file)
--- 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
index 3e9c2fef9bc69d0e6ab901ec226f9db02d96c775..8a6a6c2adf1f444240d8f88fcdfce4f1003d02fa 100644 (file)
--- 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
index f338523b7a644ab45c97988b05904b446cfb54eb..805f01af5b2f24721f4da638ad14d37a81257bf3 100644 (file)
--- 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);