Use a macro for the reason switch

This also gets rid of the 'retval' variable.

1 files changed, 17 insertions, 33 deletions

diff --git a/src/server-tls-manager.c b/src/server-tls-manager.c
index 367ff4389..9644c2592 100644
--- a/src/server-tls-manager.c
+++ b/src/server-tls-manager.c
@@ -350,44 +350,28 @@ channel_manager_iface_init (gpointer g_iface,
 static TpConnectionStatusReason
 cert_reject_reason_to_conn_reason (GabbleTLSCertificateRejectReason tls_reason)
 {
-  TpConnectionStatusReason retval;
+  #define EASY_CASE(x) \
+    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_ ## x: \
+      return TP_CONNECTION_STATUS_REASON_CERT_ ## x;
 
   switch (tls_reason)
     {
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_UNTRUSTED:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED;
-      break;
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_EXPIRED:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_EXPIRED;
-      break;
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_NOT_ACTIVATED:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED;
-      break;
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_FINGERPRINT_MISMATCH:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH;
-      break;
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH;
-      break;
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED;
-      break;
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_REVOKED:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_REVOKED;
-      break;
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_INSECURE:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_INSECURE;
-      break;
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_LIMIT_EXCEEDED:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_LIMIT_EXCEEDED;
-      break;
-    case GABBLE_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN:
-    default:
-      retval = TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR;
-      break;
+      EASY_CASE (UNTRUSTED);
+      EASY_CASE (EXPIRED);
+      EASY_CASE (NOT_ACTIVATED);
+      EASY_CASE (FINGERPRINT_MISMATCH);
+      EASY_CASE (HOSTNAME_MISMATCH);
+      EASY_CASE (SELF_SIGNED);
+      EASY_CASE (REVOKED);
+      EASY_CASE (INSECURE);
+      EASY_CASE (LIMIT_EXCEEDED);
+
+      case GABBLE_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN:
+      default:
+        return TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR;
     }
 
-  return retval;
+  #undef EASY_CASE
 }
 
 void