diff options
| author | Lars Magne Ingebrigtsen | 2014-11-24 15:42:34 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-11-24 15:42:34 +0100 |
| commit | d71a2d495f688083faa97f7ea305fdc6b595750c (patch) | |
| tree | 1bcdbd22060ac5a583d7246fbb1409b88ebac7a6 | |
| parent | 9faf591a66aa0c5ab4522f2077c170b79e95c9ec (diff) | |
| download | emacs-d71a2d495f688083faa97f7ea305fdc6b595750c.tar.gz emacs-d71a2d495f688083faa97f7ea305fdc6b595750c.zip | |
* gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings. | ||
| 4 | |||
| 1 | 2014-11-24 Glenn Morris <rgm@gnu.org> | 5 | 2014-11-24 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * emacs.c (main) <--version>: Make use of PACKAGE_NAME. | 7 | * 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 *); | |||
| 62 | static void gnutls_audit_log_function (gnutls_session_t, const char *); | 62 | static void gnutls_audit_log_function (gnutls_session_t, const char *); |
| 63 | #endif | 63 | #endif |
| 64 | 64 | ||
| 65 | static enum | 65 | enum extra_peer_verification |
| 66 | { | 66 | { |
| 67 | CERTIFICATE_NOT_MATCHING = 2, | 67 | CERTIFICATE_NOT_MATCHING = 2 |
| 68 | } extra_peer_verification_t; | 68 | }; |
| 69 | 69 | ||
| 70 | 70 | ||
| 71 | #ifdef WINDOWSNT | 71 | #ifdef WINDOWSNT |
| @@ -768,8 +768,8 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, | |||
| 768 | #endif | 768 | #endif |
| 769 | } | 769 | } |
| 770 | 770 | ||
| 771 | Lisp_Object | 771 | static Lisp_Object |
| 772 | gnutls_hex_string (char *buf, size_t buf_size, char *prefix) { | 772 | gnutls_hex_string (char *buf, size_t buf_size, const char *prefix) { |
| 773 | size_t prefix_length = strlen (prefix); | 773 | size_t prefix_length = strlen (prefix); |
| 774 | char *string = malloc (buf_size * 3 + prefix_length); | 774 | char *string = malloc (buf_size * 3 + prefix_length); |
| 775 | Lisp_Object ret; | 775 | Lisp_Object ret; |
| @@ -786,7 +786,7 @@ gnutls_hex_string (char *buf, size_t buf_size, char *prefix) { | |||
| 786 | return ret; | 786 | return ret; |
| 787 | } | 787 | } |
| 788 | 788 | ||
| 789 | Lisp_Object | 789 | static Lisp_Object |
| 790 | gnutls_certificate_details (gnutls_x509_crt_t cert) | 790 | gnutls_certificate_details (gnutls_x509_crt_t cert) |
| 791 | { | 791 | { |
| 792 | Lisp_Object res = Qnil; | 792 | Lisp_Object res = Qnil; |