From patchwork Mon Jan 5 12:01:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 5567251 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-dash@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A515DBF6C3 for ; Mon, 5 Jan 2015 12:02:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9862920165 for ; Mon, 5 Jan 2015 12:02:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B96C82015A for ; Mon, 5 Jan 2015 12:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753368AbbAEMCE (ORCPT ); Mon, 5 Jan 2015 07:02:04 -0500 Received: from helcar.apana.org.au ([209.40.204.226]:35586 "EHLO helcar.apana.org.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753130AbbAEMCD (ORCPT ); Mon, 5 Jan 2015 07:02:03 -0500 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by fornost.hengli.com.au with esmtp (Exim 4.80 #3 (Debian)) id 1Y86M4-0005xL-Mp; Mon, 05 Jan 2015 23:01:52 +1100 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.80) (envelope-from ) id 1Y86M4-0001mB-8A; Mon, 05 Jan 2015 23:01:52 +1100 Subject: [PATCH 1/4] input: Make preadbuffer static References: <20150105120030.GA6101@gondor.apana.org.au> To: Jilles Tjoelker , Eric Blake , Oleg Bulatov , dash@vger.kernel.org, Juergen Daubert Message-Id: From: Herbert Xu Date: Mon, 05 Jan 2015 23:01:52 +1100 Sender: dash-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dash@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The function preadbuffer should be static as it's only used in input.c. Signed-off-by: Herbert Xu --- src/input.c | 4 ++-- src/input.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe dash" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/input.c b/src/input.c index f11ac84..aa5dcfc 100644 --- a/src/input.c +++ b/src/input.c @@ -109,6 +109,7 @@ EditLine *el; /* cookie for editline package */ STATIC void pushfile(void); static int preadfd(void); static void setinputfd(int fd, int push); +static int preadbuffer(void); #ifdef mkinit INCLUDE @@ -222,8 +223,7 @@ retry: * 4) Process input up to the next newline, deleting nul characters. */ -int -preadbuffer(void) +static int preadbuffer(void) { char *q; int more; diff --git a/src/input.h b/src/input.h index 775291b..90ff6c3 100644 --- a/src/input.h +++ b/src/input.h @@ -52,7 +52,6 @@ extern char *parsenextc; /* next character in input buffer */ int pgetc(void); int pgetc2(void); -int preadbuffer(void); void pungetc(void); void pushstring(char *, void *); void popstring(void);