From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ian Kelling Newsgroups: gmane.emacs.bugs Subject: bug#20978: [PATCH 3/7] ; Rename local var to match function name Date: Sat, 04 Jul 2015 05:42:14 -0700 Message-ID: <87lhewjdqx.fsf@iankelling.org> References: <87zj3ckso6.fsf@iankelling.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1436013803 8379 80.91.229.3 (4 Jul 2015 12:43:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Jul 2015 12:43:23 +0000 (UTC) To: 20978@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jul 04 14:43:12 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1ZBMml-0006a5-OW for geb-bug-gnu-emacs@m.gmane.org; Sat, 04 Jul 2015 14:43:12 +0200 Original-Received: from localhost ([::1]:44178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBMmk-000512-TT for geb-bug-gnu-emacs@m.gmane.org; Sat, 04 Jul 2015 08:43:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBMmh-00050P-9S for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 08:43:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBMmc-0006Ye-2o for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 08:43:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBMmb-0006Ya-VA for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 08:43:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1ZBMmb-0002EM-MJ for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 08:43:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <87zj3ckso6.fsf@iankelling.org> Resent-From: Ian Kelling Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 04 Jul 2015 12:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20978 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 20978-submit@debbugs.gnu.org id=B20978.14360137438517 (code B ref 20978); Sat, 04 Jul 2015 12:43:01 +0000 Original-Received: (at 20978) by debbugs.gnu.org; 4 Jul 2015 12:42:23 +0000 Original-Received: from localhost ([127.0.0.1]:39362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZBMly-0002DG-Fs for submit@debbugs.gnu.org; Sat, 04 Jul 2015 08:42:23 -0400 Original-Received: from out5-smtp.messagingengine.com ([66.111.4.29]:38514) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZBMlx-0002D9-8N for 20978@debbugs.gnu.org; Sat, 04 Jul 2015 08:42:21 -0400 Original-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 07CD021B36; Sat, 4 Jul 2015 08:42:21 -0400 (EDT) Original-Received: from frontend1 ([10.202.2.160]) by compute3.internal (MEProxy); Sat, 04 Jul 2015 08:42:21 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=iankelling.org; h= content-type:date:from:message-id:mime-version:subject:to :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=vwUlS1UhBT7CsyZbMtuOaY3u9uE =; b=hGoYs2CM7kRidDRplFSUUa1wW2x/69JnSzytUW9BUOu78oZKSd76Etsvl3X mmag3gTTWgkkFtWgQkePkZGJb1WTlgIuZoANCnfCLg+MVBMpFh1CGwzvR6A+UWBP PhH0BgZV1Yx6dmucj6N4WCFC9IGcJI16BCoopRnuxnyjPkfQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=vw UlS1UhBT7CsyZbMtuOaY3u9uE=; b=pMIrMYAJPKWv8YyE6t96SB7ObehvX9Zh/5 Aa6R+GqK4x8eN2OkBM6I1mQDuwX1xTNZmsmwoEhvq+mG+PaNPpwasP3anSZUOZ19 zWXhtrWLzRpJN+3SsttUczo9dYKQPNCRtmXYzrxr2Z0oQR9M38kx1RhImL0IUHrE cGp6zvgTg= X-Sasl-enc: Hrqp+59FjqK5g5CJ6QL+F/QKDubAQIU2myJUHvegScdr 1436013740 Original-Received: from treetowl.lan (c-73-53-70-213.hsd1.wa.comcast.net [73.53.70.213]) by mail.messagingengine.com (Postfix) with ESMTPA id A0A45C0028A for <20978@debbugs.gnu.org>; Sat, 4 Jul 2015 08:42:20 -0400 (EDT) Original-Received: by treetowl.lan (Postfix, from userid 1000) id AF0581FE26; Sat, 4 Jul 2015 05:42:14 -0700 (PDT) User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x 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:104685 Archived-At: * src/process.c (wait_reading_process_output, status_notify): Previously the function wait_reading_process_input was renamed to the more logical wait_reading_process_output. Make it's local variables consistent with that change. diff --git a/src/process.c b/src/process.c index 1541de2..d5569d4 100644 --- a/src/process.c +++ b/src/process.c @@ -4586,7 +4586,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, int xerrno; Lisp_Object proc; struct timespec timeout, end_time; - int got_some_input = -1; + int got_some_output = -1; ptrdiff_t count = SPECPDL_INDEX (); FD_ZERO (&Available); @@ -4634,7 +4634,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, break; /* After reading input, vacuum up any leftovers without waiting. */ - if (0 <= got_some_input) + if (0 <= got_some_output) nsecs = -1; /* Compute time from now till when time limit is up. */ @@ -4755,7 +4755,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, /* It's okay for us to do this and then continue with the loop, since timeout has already been zeroed out. */ clear_waiting_for_input (); - got_some_input = status_notify (NULL, wait_proc); + got_some_output = status_notify (NULL, wait_proc); if (do_display) redisplay_preserve_echo_area (13); } } @@ -4791,8 +4791,8 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, } else { - if (got_some_input < nread) - got_some_input = nread; + if (got_some_output < nread) + got_some_output = nread; if (nread == 0) break; read_some_bytes = true; @@ -5089,8 +5089,8 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, buffered-ahead character if we have one. */ nread = read_process_output (proc, channel); - if ((!wait_proc || wait_proc == XPROCESS (proc)) && got_some_input < nread) - got_some_input = nread; + if ((!wait_proc || wait_proc == XPROCESS (proc)) && got_some_output < nread) + got_some_output = nread; if (nread > 0) { /* Since read_process_output can run a filter, @@ -5250,7 +5250,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, QUIT; } - return got_some_input; + return got_some_output; } /* Given a list (FUNCTION ARGS...), apply FUNCTION to the ARGS. */ @@ -6659,7 +6659,7 @@ status_notify (struct Lisp_Process *deleting_process, Lisp_Object proc; Lisp_Object tail, msg; struct gcpro gcpro1, gcpro2; - int got_some_input = -1; + int got_some_output = -1; tail = Qnil; msg = Qnil; @@ -6693,8 +6693,8 @@ status_notify (struct Lisp_Process *deleting_process, { int nread = read_process_output (proc, p->infd); if ((!wait_proc || wait_proc == XPROCESS (proc)) - && got_some_input < nread) - got_some_input = nread; + && got_some_output < nread) + got_some_output = nread; if (nread <= 0) break; } @@ -6729,7 +6729,7 @@ status_notify (struct Lisp_Process *deleting_process, update_mode_lines = 24; /* In case buffers use %s in mode-line-format. */ UNGCPRO; - return got_some_input; + return got_some_output; } DEFUN ("internal-default-process-sentinel", Finternal_default_process_sentinel, -- 2.4.5