From patchwork Mon Dec 3 03:00:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 203271 X-Patchwork-Delegate: joe.hershberger@gmail.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 84C772C00B5 for ; Mon, 3 Dec 2012 14:01:42 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2E6054A09D; Mon, 3 Dec 2012 04:01:35 +0100 (CET) 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 qrsHh+ckBubm; Mon, 3 Dec 2012 04:01:34 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 640574A09F; Mon, 3 Dec 2012 04:01:12 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 716A74A050 for ; Mon, 3 Dec 2012 04:01:05 +0100 (CET) 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 1eHniMhnyn1p for ; Mon, 3 Dec 2012 04:00:57 +0100 (CET) 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-f172.google.com (mail-ob0-f172.google.com [209.85.214.172]) by theia.denx.de (Postfix) with ESMTPS id CFBFD4A030 for ; Mon, 3 Dec 2012 04:00:51 +0100 (CET) Received: by mail-ob0-f172.google.com with SMTP id za17so1976153obc.3 for ; Sun, 02 Dec 2012 19:00:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=LtNsUEqHeK+8T6iyFsX9vheizPGE62OpfGLdrZnQ8zI=; b=Sq3KDeyCmqdiPZn17wRXjG31TGdX786AQjHqL/2IaaeytksYjG8W69mEanPpvi/OT3 rVOEJFoDu1o3M3jgzgeVfBGWJbr+OICv/Jv9GftrnFFknxdj6t0CK7pINm95Ck/gVg+B CZo1LWSB59wgcz4eRJNeXmkv0GGKUnun1bzzkWxOLY0nKYYKPtPJ5cmpodx5SugZ2gN6 BpiGUCkZfdHQjL3Ep+1xZaD3xBEzsh82htC5p18kkF4iPYVhKNoJIUN0awUnO4AZafkb uuRTGUBKDr6AQr4ViDh/6JuuVZR6oGDgNO2E8yusSiUtrif7MoCNYhq62I6Y0I4QtT3t MRsw== Received: by 10.60.171.11 with SMTP id aq11mr6985781oec.104.1354503649983; Sun, 02 Dec 2012 19:00:49 -0800 (PST) Received: from rob-laptop.grandenetworks.net (65-36-73-129.dyn.grandenetworks.net. [65.36.73.129]) by mx.google.com with ESMTPS id vq7sm9420855oeb.13.2012.12.02.19.00.48 (version=SSLv3 cipher=OTHER); Sun, 02 Dec 2012 19:00:49 -0800 (PST) From: Rob Herring To: u-boot@lists.denx.de Date: Sun, 2 Dec 2012 21:00:21 -0600 Message-Id: <1354503629-25621-3-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1354503629-25621-1-git-send-email-robherring2@gmail.com> References: <1354503629-25621-1-git-send-email-robherring2@gmail.com> Cc: trini@ti.com, Rob Herring Subject: [U-Boot] [PATCH 02/10] pxe: make string parameters const 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 From: Rob Herring Convert a bunch of string parameters to be const. Signed-off-by: Rob Herring --- common/cmd_pxe.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 306c483..8b897ad 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -31,7 +31,7 @@ * environment. It always returns what getenv does, so it can be used in * place of getenv without changing error handling otherwise. */ -static char *from_env(char *envvar) +static char *from_env(const char *envvar) { char *ret; @@ -115,14 +115,14 @@ static int get_bootfile_path(const char *file_path, char *bootfile_path, return 1; } -static int (*do_getfile)(char *file_path, char *file_addr); +static int (*do_getfile)(const char *file_path, char *file_addr); -static int do_get_tftp(char *file_path, char *file_addr) +static int do_get_tftp(const char *file_path, char *file_addr) { char *tftp_argv[] = {"tftp", NULL, NULL, NULL}; tftp_argv[1] = file_addr; - tftp_argv[2] = file_path; + tftp_argv[2] = (void *)file_path; if (do_tftpb(NULL, 0, 3, tftp_argv)) return -ENOENT; @@ -132,12 +132,12 @@ static int do_get_tftp(char *file_path, char *file_addr) static char *fs_argv[5]; -static int do_get_ext2(char *file_path, char *file_addr) +static int do_get_ext2(const char *file_path, char *file_addr) { #ifdef CONFIG_CMD_EXT2 fs_argv[0] = "ext2load"; fs_argv[3] = file_addr; - fs_argv[4] = file_path; + fs_argv[4] = (void *)file_path; if (!do_ext2load(NULL, 0, 5, fs_argv)) return 1; @@ -145,12 +145,12 @@ static int do_get_ext2(char *file_path, char *file_addr) return -ENOENT; } -static int do_get_fat(char *file_path, char *file_addr) +static int do_get_fat(const char *file_path, char *file_addr) { #ifdef CONFIG_CMD_FAT fs_argv[0] = "fatload"; fs_argv[3] = file_addr; - fs_argv[4] = file_path; + fs_argv[4] = (void *)file_path; if (!do_fat_fsload(NULL, 0, 5, fs_argv)) return 1; @@ -166,7 +166,7 @@ static int do_get_fat(char *file_path, char *file_addr) * * Returns 1 for success, or < 0 on error. */ -static int get_relfile(char *file_path, void *file_addr) +static int get_relfile(const char *file_path, void *file_addr) { size_t path_len; char relfile[MAX_TFTP_PATH_LEN+1]; @@ -205,7 +205,7 @@ static int get_relfile(char *file_path, void *file_addr) * * Returns 1 on success, or < 0 for error. */ -static int get_pxe_file(char *file_path, void *file_addr) +static int get_pxe_file(const char *file_path, void *file_addr) { unsigned long config_file_size; char *tftp_filesize; @@ -242,7 +242,7 @@ static int get_pxe_file(char *file_path, void *file_addr) * * Returns 1 on success or < 0 on error. */ -static int get_pxelinux_path(char *file, void *pxefile_addr_r) +static int get_pxelinux_path(const char *file, void *pxefile_addr_r) { size_t base_len = strlen(PXELINUX_DIR); char path[MAX_TFTP_PATH_LEN+1]; @@ -382,7 +382,7 @@ do_pxe_get(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * * Returns 1 on success or < 0 on error. */ -static int get_relfile_envaddr(char *file_path, char *envaddr_name) +static int get_relfile_envaddr(const char *file_path, const char *envaddr_name) { unsigned long file_addr; char *envaddr;