From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 25 Jan 2013 21:01:30 +0000 (+0100)
Subject: Avoid many indirect calls.
X-Git-Tag: gnutls_3_1_7~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8bdd3cc081f3235e22b77a75f99bd5425f03672;p=thirdparty%2Fgnutls.git

Avoid many indirect calls.
---

diff --git a/lib/algorithms.h b/lib/algorithms.h
index 3ee2032aa6..a46216dfbe 100644
--- 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 bcaffb8a05..b483377ab3 100644
--- 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)
 {