From d71a2d495f688083faa97f7ea305fdc6b595750c Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 24 Nov 2014 15:42:34 +0100 Subject: [PATCH] * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings. --- src/ChangeLog | 4 ++++ src/gnutls.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a4410161c5a..448de36eb05 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-24 Lars Magne Ingebrigtsen + + * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings. + 2014-11-24 Glenn Morris * emacs.c (main) <--version>: Make use of PACKAGE_NAME. diff --git a/src/gnutls.c b/src/gnutls.c index 22e3aec0c21..dd9c8015ca1 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -62,10 +62,10 @@ static void gnutls_log_function2 (int, const char *, const char *); static void gnutls_audit_log_function (gnutls_session_t, const char *); #endif -static enum - { - CERTIFICATE_NOT_MATCHING = 2, - } extra_peer_verification_t; +enum extra_peer_verification +{ + CERTIFICATE_NOT_MATCHING = 2 +}; #ifdef WINDOWSNT @@ -768,8 +768,8 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, #endif } -Lisp_Object -gnutls_hex_string (char *buf, size_t buf_size, char *prefix) { +static Lisp_Object +gnutls_hex_string (char *buf, size_t buf_size, const char *prefix) { size_t prefix_length = strlen (prefix); char *string = malloc (buf_size * 3 + prefix_length); Lisp_Object ret; @@ -786,7 +786,7 @@ gnutls_hex_string (char *buf, size_t buf_size, char *prefix) { return ret; } -Lisp_Object +static Lisp_Object gnutls_certificate_details (gnutls_x509_crt_t cert) { Lisp_Object res = Qnil; -- 2.39.5