Avoid many indirect calls.

diff --git a/lib/algorithms.h b/lib/algorithms.h
index 3ee2032aa6b899cc49b5450bbd960b84c22ca384..a46216dfbe071485ac5c16984e814141f97eccc3 100644 (file)
--- a/lib/algorithms.h
+++ b/lib/algorithms.h
@@ -54,8 +54,18 @@ gnutls_digest_algorithm_t _gnutls_x509_oid_to_digest (const char *oid);
 const char *_gnutls_x509_mac_to_oid (gnutls_mac_algorithm_t mac);
 
 /* Functions for digests. */
-const char *_gnutls_x509_digest_to_oid (gnutls_digest_algorithm_t algorithm);
-const char *_gnutls_digest_get_name (gnutls_digest_algorithm_t algorithm);
+inline static const char *
+_gnutls_x509_digest_to_oid (gnutls_digest_algorithm_t algorithm)
+{
+  return _gnutls_x509_mac_to_oid ((gnutls_mac_algorithm_t) algorithm);
+}
+
+inline static const char *
+_gnutls_digest_get_name (gnutls_digest_algorithm_t algorithm)
+{
+  return gnutls_mac_get_name ((gnutls_mac_algorithm_t) algorithm);
+}
+
 int _gnutls_digest_is_secure (gnutls_digest_algorithm_t algorithm);
 
 /* Functions for cipher suites. */

diff --git a/lib/algorithms/mac.c b/lib/algorithms/mac.c
index bcaffb8a05b03e2a8656003aa36495eeeebc5e84..b483377ab309b6ab583f79d84c61cff7da607396 100644 (file)
--- a/lib/algorithms/mac.c
+++ b/lib/algorithms/mac.c
@@ -197,18 +197,6 @@ _gnutls_x509_oid_to_digest (const char *oid)
   return ret;
 }
 
-const char *
-_gnutls_x509_digest_to_oid (gnutls_digest_algorithm_t algorithm)
-{
-  return _gnutls_x509_mac_to_oid ((gnutls_mac_algorithm_t) algorithm);
-}
-
-const char *
-_gnutls_digest_get_name (gnutls_digest_algorithm_t algorithm)
-{
-  return gnutls_mac_get_name ((gnutls_mac_algorithm_t) algorithm);
-}
-
 int
 _gnutls_mac_is_ok (gnutls_mac_algorithm_t algorithm)
 {