From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.bugs Subject: bug#9059: 24.0.50; Logging in init_gnutls_functions does not adhere to gnutls_log_level Date: Wed, 13 Jul 2011 18:58:24 +0200 Message-ID: References: <86hb6srxh7.fsf@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1310580838 8677 80.91.229.12 (13 Jul 2011 18:13:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 13 Jul 2011 18:13:58 +0000 (UTC) Cc: Christoph Scholtes , 9059@debbugs.gnu.org To: Lars Magne Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 13 20:13:54 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Qh3wW-0007tM-H3 for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Jul 2011 20:13:52 +0200 Original-Received: from localhost ([::1]:47612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qh3wV-0004eS-A3 for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Jul 2011 14:13:51 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:56524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qh2nD-0001UV-Hu for bug-gnu-emacs@gnu.org; Wed, 13 Jul 2011 13:00:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qh2n9-0003r9-DW for bug-gnu-emacs@gnu.org; Wed, 13 Jul 2011 13:00:11 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qh2n9-0003r1-36 for bug-gnu-emacs@gnu.org; Wed, 13 Jul 2011 13:00:07 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Qh2n8-00052v-BJ; Wed, 13 Jul 2011 13:00:06 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juanma Barranquero Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 Jul 2011 17:00:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9059 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 9059-submit@debbugs.gnu.org id=B9059.131057635519189 (code B ref 9059); Wed, 13 Jul 2011 17:00:06 +0000 Original-Received: (at 9059) by debbugs.gnu.org; 13 Jul 2011 16:59:15 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Qh2mH-0004zS-Vd for submit@debbugs.gnu.org; Wed, 13 Jul 2011 12:59:14 -0400 Original-Received: from mail-yx0-f172.google.com ([209.85.213.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Qh2mG-0004zA-02 for 9059@debbugs.gnu.org; Wed, 13 Jul 2011 12:59:13 -0400 Original-Received: by yxp4 with SMTP id 4so2682726yxp.3 for <9059@debbugs.gnu.org>; Wed, 13 Jul 2011 09:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=PKAlDSi/7JqxUtMETjY0OfTGjC1/kGRj5NlyOsMcYZY=; b=V+lD0Uvuag6SxjFYJomEOzOD/82Fy7XUdTWtm1Pgvu1laWfryaFEldrOJb+h8VHQqz 4gjYp8/XUAOLq8FSLYZfcC3CalBZ0AtbyFfo+6iHZltaWBtz8aO9Zeh5+drERuu7JOsQ 0cmk7E23vDuJQMIpgulnb/CgUw9q/VQtu2wDw= Original-Received: by 10.142.234.3 with SMTP id g3mr552642wfh.423.1310576345954; Wed, 13 Jul 2011 09:59:05 -0700 (PDT) Original-Received: by 10.142.144.4 with HTTP; Wed, 13 Jul 2011 09:58:24 -0700 (PDT) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Wed, 13 Jul 2011 13:00:06 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:48902 Archived-At: On Wed, Jul 13, 2011 at 18:31, Lars Magne Ingebrigtsen wro= te: > Juanma, you did the Windows parts of gnutls.c, so could you look at > this? Would the following patch be enough? =C2=A0 =C2=A0 Juanma =3D=3D=3D modified file 'src/gnutls.c' --- src/gnutls.c 2011-07-05 09:51:56 +0000 +++ src/gnutls.c 2011-07-13 16:51:53 +0000 @@ -143,10 +143,12 @@ init_gnutls_functions (Lisp_Object libraries) { HMODULE library; + Lisp_Object gnutls_log_level =3D Fsymbol_value (Qgnutls_log_level); + int max_log_level =3D 1; if (!(library =3D w32_delayed_load (libraries, Qgnutls_dll))) { - GNUTLS_LOG (1, 1, "GnuTLS library not found"); + GNUTLS_LOG (1, max_log_level, "GnuTLS library not found"); return 0; } @@ -189,7 +191,10 @@ LOAD_GNUTLS_FN (library, gnutls_x509_crt_import); LOAD_GNUTLS_FN (library, gnutls_x509_crt_init); - GNUTLS_LOG2 (1, 1, "GnuTLS library loaded:", + if (NUMBERP (gnutls_log_level)) + max_log_level =3D XINT (gnutls_log_level); + + GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:", SDATA (Fget (Qgnutls_dll, QCloaded_from))); return 1; }