diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-12-14 15:41:19 +0000 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-09 12:14:08 +0200 |
| commit | 694563fee1ff738e2c2fed14555c1bd2f15a9c34 (patch) | |
| tree | 563e4897009d2a8193f96d21da339158fd40652e | |
| parent | 5ebb3968072da90d83d9392aa36f8027013683d3 (diff) | |
reject_reason_get_dbus_error: streamline boilerplate with a macro
| -rw-r--r-- | telepathy-glib/tls-certificate.c | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/telepathy-glib/tls-certificate.c b/telepathy-glib/tls-certificate.c index 37c897e22..06a1e779d 100644 --- a/telepathy-glib/tls-certificate.c +++ b/telepathy-glib/tls-certificate.c @@ -279,33 +279,21 @@ reject_reason_get_dbus_error (TpTLSCertificateRejectReason reason) switch (reason) { - case TP_TLS_CERTIFICATE_REJECT_REASON_UNTRUSTED: - retval = tp_error_get_dbus_name (TP_ERROR_CERT_UNTRUSTED); - break; - case TP_TLS_CERTIFICATE_REJECT_REASON_EXPIRED: - retval = tp_error_get_dbus_name (TP_ERROR_CERT_EXPIRED); - break; - case TP_TLS_CERTIFICATE_REJECT_REASON_NOT_ACTIVATED: - retval = tp_error_get_dbus_name (TP_ERROR_CERT_NOT_ACTIVATED); - break; - case TP_TLS_CERTIFICATE_REJECT_REASON_FINGERPRINT_MISMATCH: - retval = tp_error_get_dbus_name (TP_ERROR_CERT_FINGERPRINT_MISMATCH); - break; - case TP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH: - retval = tp_error_get_dbus_name (TP_ERROR_CERT_HOSTNAME_MISMATCH); - break; - case TP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED: - retval = tp_error_get_dbus_name (TP_ERROR_CERT_SELF_SIGNED); - break; - case TP_TLS_CERTIFICATE_REJECT_REASON_REVOKED: - retval = tp_error_get_dbus_name (TP_ERROR_CERT_REVOKED); - break; - case TP_TLS_CERTIFICATE_REJECT_REASON_INSECURE: - retval = tp_error_get_dbus_name (TP_ERROR_CERT_INSECURE); - break; - case TP_TLS_CERTIFICATE_REJECT_REASON_LIMIT_EXCEEDED: - retval = tp_error_get_dbus_name (TP_ERROR_CERT_LIMIT_EXCEEDED); - break; +#define EASY_CASE(x) \ + case TP_TLS_CERTIFICATE_REJECT_REASON_ ## x: \ + retval = tp_error_get_dbus_name (TP_ERROR_CERT_ ## x); \ + 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); +#undef EASY_CASE + case TP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN: default: retval = tp_error_get_dbus_name (TP_ERROR_CERT_INVALID); |