From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: Emacs on windows and GnuTLS Date: Mon, 04 Nov 2013 11:20:34 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87fvrcrve5.fsf@flea.lifelogs.com> References: <877gcpu3bu.fsf@flea.lifelogs.com> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1383582044 31415 80.91.229.3 (4 Nov 2013 16:20:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 Nov 2013 16:20:44 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 04 17:20:47 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VdMtN-0003UG-F2 for ged-emacs-devel@m.gmane.org; Mon, 04 Nov 2013 17:20:41 +0100 Original-Received: from localhost ([::1]:50804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdMtM-0007Kp-PU for ged-emacs-devel@m.gmane.org; Mon, 04 Nov 2013 11:20:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdMt9-0007IT-Dh for emacs-devel@gnu.org; Mon, 04 Nov 2013 11:20:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdMt1-0006an-Id for emacs-devel@gnu.org; Mon, 04 Nov 2013 11:20:26 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:32887) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdMt1-0006aB-Bd for emacs-devel@gnu.org; Mon, 04 Nov 2013 11:20:19 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VdMst-0002MW-RE for emacs-devel@gnu.org; Mon, 04 Nov 2013 17:20:11 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 04 Nov 2013 17:20:11 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 04 Nov 2013 17:20:11 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 46 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:ZwwoUNXqkLxqz8pEubjC0+5AE+c= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:164929 Archived-At: --=-=-= Content-Type: text/plain Thanks for the review, Fabrice. Anticipating the need for more of these special cases, here's a switch-based approach that avoids special variables and makes the level explicit in each case. It's easier to read, too. Let me know if this works for you and I will install it. Ted --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=gnutls.eagain-lower.patch === modified file 'src/gnutls.c' --- src/gnutls.c 2013-11-04 06:09:03 +0000 +++ src/gnutls.c 2013-11-04 16:16:31 +0000 @@ -488,8 +488,20 @@ else { ret = 1; - GNUTLS_LOG2 (1, max_log_level, "non-fatal error:", str); - /* TODO: EAGAIN AKA Qgnutls_e_again should be level 2. */ + + switch (err) + { + case GNUTLS_E_AGAIN: + GNUTLS_LOG2 (3, + max_log_level, + "retry:", + str); + default: + GNUTLS_LOG2 (1, + max_log_level, + "non-fatal error:", + str); + } } if (err == GNUTLS_E_WARNING_ALERT_RECEIVED --=-=-=--