From patchwork Fri Apr 11 02:01:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 338319 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1D7801400D2 for ; Fri, 11 Apr 2014 12:03:10 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7BA1A4B682; Fri, 11 Apr 2014 04:03:08 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 69h6uLZFhHA7; Fri, 11 Apr 2014 04:03:07 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C5D104B666; Fri, 11 Apr 2014 04:02:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8981E4B678 for ; Fri, 11 Apr 2014 04:02:35 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lHTmlrOwwnqs for ; Fri, 11 Apr 2014 04:02:32 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ob0-f202.google.com (mail-ob0-f202.google.com [209.85.214.202]) by theia.denx.de (Postfix) with ESMTPS id 572CC4B666 for ; Fri, 11 Apr 2014 04:02:28 +0200 (CEST) Received: by mail-ob0-f202.google.com with SMTP id wo20so1006215obc.5 for ; Thu, 10 Apr 2014 19:02:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9ZKC/Gr7SB1hIEb7N9sXCwUNwH4iA3hY7H9VafFRwJU=; b=EIBK9lJg+Y2vCrEhMOvNzNA2QBWbGZ9TDY9+ShRQzZCF0AqAKqUSWGFVGjSVNyWfBu K+j+WTrLuUgx8wuIvFrqyX3Hm1WDc1TV2zgcWPgXpmDXpZJBfX7xjlYwT4JayPD4Fxvv FYy/bF0m+GYxS9dkAN94MqcbnDZfYEHCxHSrs6cpuACGvEL9tAx9unjR46yEiuYHMOgK wQYUAaA0ogqpQ+wczzVEPTJBw8QMnj2PRHb5ks0xgj5lQo72yef18/nigSktWUvun4wV OxXP7ZdHes6K1Vu9mS+lKb2f2bBu3yRUR6zyPwfVwM+upScxsLSE+AMXmSNVvDoN3pcg PU9w== X-Gm-Message-State: ALoCoQniX9FZt8AcO+LQZPW9tFro5gBp/UNEIFThIBJf49RR2mhp0Ut0tHshiKI7o4UaxG0axdGNhlJmHejMtN8uo5uJo5kBm55kR1bm+HF/mGQl9ipOx3O5umlnngKUWrEZy+qHTeswJcwg29If6WwLpdEMrf1gQNdYXN4DoGmxsmWLh3hVxh48EF0xOuMlWmZ63BkYGzn/ X-Received: by 10.43.141.196 with SMTP id jf4mr9242614icc.9.1397181747667; Thu, 10 Apr 2014 19:02:27 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id r61si946922yhf.1.2014.04.10.19.02.27 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Apr 2014 19:02:27 -0700 (PDT) Received: from kaki.bld.corp.google.com (kaki.bld.corp.google.com [172.29.216.32]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 821895A4225; Thu, 10 Apr 2014 19:02:27 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 0A18422011B; Thu, 10 Apr 2014 20:02:26 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Thu, 10 Apr 2014 20:01:24 -0600 Message-Id: <1397181696-7271-3-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.9.1.423.g4596e3a In-Reply-To: <1397181696-7271-1-git-send-email-sjg@chromium.org> References: <1397181696-7271-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH 02/14] Rename hush to cli_hush X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Hush is a command-line interpreter, so rename it to make that clearer. Signed-off-by: Simon Glass --- board/keymile/common/common.c | 2 +- board/keymile/common/ivm.c | 2 +- common/Makefile | 2 +- common/{hush.c => cli_hush.c} | 4 ++-- common/main.c | 2 +- include/{hush.h => cli_hush.h} | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename common/{hush.c => cli_hush.c} (99%) rename include/{hush.h => cli_hush.h} (93%) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index f941e44..2ddb3da 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index f0e91bb..bffc08b 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include "common.h" diff --git a/common/Makefile b/common/Makefile index cecd81a..12068ac 100644 --- a/common/Makefile +++ b/common/Makefile @@ -11,7 +11,7 @@ obj-y += main.o obj-y += command.o obj-y += exports.o obj-y += hash.o -obj-$(CONFIG_SYS_HUSH_PARSER) += hush.o +obj-$(CONFIG_SYS_HUSH_PARSER) += cli_hush.o obj-y += s_record.o obj-y += xyzModem.o obj-y += cmd_disk.o diff --git a/common/hush.c b/common/cli_hush.c similarity index 99% rename from common/hush.c rename to common/cli_hush.c index df10267..070519f 100644 --- a/common/hush.c +++ b/common/cli_hush.c @@ -79,7 +79,7 @@ #include /* malloc, free, realloc*/ #include /* isalpha, isdigit */ #include /* readline */ -#include +#include #include /* find_cmd */ #ifndef CONFIG_SYS_PROMPT_HUSH_PS2 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " @@ -222,7 +222,7 @@ struct child_prog { #endif char **argv; /* program name and arguments */ /* was quoted when parsed; copy of struct o_string.nonnull field */ - int *argv_nonnull; + int *argv_nonnull; #ifdef __U_BOOT__ int argc; /* number of program arguments */ #endif diff --git a/common/main.c b/common/main.c index 8b6f274..2eea9c5 100644 --- a/common/main.c +++ b/common/main.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/hush.h b/include/cli_hush.h similarity index 93% rename from include/hush.h rename to include/cli_hush.h index 595303a..4951eef 100644 --- a/include/hush.h +++ b/include/cli_hush.h @@ -5,8 +5,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef _HUSH_H_ -#define _HUSH_H_ +#ifndef _CLI_HUSH_H_ +#define _CLI_HUSH_H_ #define FLAG_EXIT_FROM_LOOP 1 #define FLAG_PARSE_SEMICOLON (1 << 1) /* symbol ';' is special for parser */