From patchwork Tue Oct 25 18:17:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 79262 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3257045qge; Tue, 25 Oct 2016 11:17:24 -0700 (PDT) X-Received: by 10.99.159.17 with SMTP id g17mr34920935pge.149.1477419444116; Tue, 25 Oct 2016 11:17:24 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id wm3si18274572pab.75.2016.10.25.11.17.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Oct 2016 11:17:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B01951A1E73; Tue, 25 Oct 2016 11:17:23 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com [IPv6:2a00:1450:400c:c09::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A293F1A1E6B for ; Tue, 25 Oct 2016 11:17:21 -0700 (PDT) Received: by mail-wm0-x22c.google.com with SMTP id d128so42027538wmf.1 for ; Tue, 25 Oct 2016 11:17:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r7n0s9+XYWE58yQf2UmAUltwjEYrVLKgeta4/Cy+74A=; b=in8OmqA6/sksbVugmIB1uEf0U8FnRqpDg8STnaQr+Qi/n9twd2TLwdn/7iXEdxBzSc jeopphVRk4D7FJMj35eieswi/GKXRFll7KJoF1CVsDzQ/pIZPcCO+aJG36AkgrE2WZn4 3koUfffbQdU5BiEuIi2ss+egElvTizy9rjM3I= 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=r7n0s9+XYWE58yQf2UmAUltwjEYrVLKgeta4/Cy+74A=; b=fcKy87v97lXOFvd0zvxv6/nCgvkm6X/3stXsV5OImZZJngdQQi/I1p43axLLJSVvut MsanOpGnazOe49IwEqbQxXke+DLVVJQaQ1VharjzR6dRxAjyvokx5WYgZ+poJV8GvZ3N qkLThx6WRGdfQh/Pp2kEQUh8girqY+I9fsmj1Afsa5jXSVT7HAtjj1aX5+aKJd+ILRYq KNIVYIhdCS0EjHRq2aeJa4Dfwpc0rX7/qEYzCoK8U3+t5sLlY4mSmLAtkCYRMnwU5Yon E4fgJKJLjgIRYnjWmLFwf+JwdwYRq4N8iXRtoHBpuyd4OpiqUpY1nndHhUyq4a7fesX0 c3ag== X-Gm-Message-State: ABUngvcYCSudf2xWPJ6SSEqNyPQMppKBURt0wRQBBVx3ididxoPM4Ix85YPiQqEVhXkKzJPV X-Received: by 10.28.19.131 with SMTP id 125mr4289347wmt.133.1477419440263; Tue, 25 Oct 2016 11:17:20 -0700 (PDT) Received: from localhost.localdomain ([105.129.136.43]) by smtp.gmail.com with ESMTPSA id k74sm4993378wmd.18.2016.10.25.11.17.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 11:17:19 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Tue, 25 Oct 2016 19:17:03 +0100 Message-Id: <1477419424-22235-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477419424-22235-1-git-send-email-ard.biesheuvel@linaro.org> References: <1477419424-22235-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 1/2] ArmPlatformPkg/ArmVExpressFastBootDxe: eliminate deprecated string functions X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lersek@redhat.com, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Get rid of functions that are no longer available when defining DISABLE_NEW_DEPRECATED_INTERFACES Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c index 4d0811cc5eaf..6b39682948aa 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c @@ -269,7 +269,7 @@ ArmFastbootPlatformInit ( // Copy handle and partition name Entry->PartitionHandle = AllHandles[LoopIndex]; - StrnCpy ( + CopyMem ( Entry->PartitionName, PartitionEntries[PartitionNode->PartitionNumber - 1].PartitionName, // Partition numbers start from 1. PARTITION_NAME_MAX_LENGTH @@ -320,7 +320,7 @@ ArmFastbootPlatformFlashPartition ( CHAR16 PartitionNameUnicode[60]; BOOLEAN PartitionFound; - AsciiStrToUnicodeStr (PartitionName, PartitionNameUnicode); + AsciiStrToUnicodeStrS (PartitionName, PartitionNameUnicode, 60); PartitionFound = FALSE; Entry = (FASTBOOT_PARTITION_LIST *) GetFirstNode (&(mPartitionListHead)); @@ -396,7 +396,7 @@ ArmFastbootPlatformGetVar ( ) { if (AsciiStrCmp (Name, "product")) { - AsciiStrCpy (Value, FixedPcdGetPtr (PcdFirmwareVendor)); + AsciiStrCpyS (Value, 60, FixedPcdGetPtr (PcdFirmwareVendor)); } else { *Value = '\0'; } @@ -410,7 +410,7 @@ ArmFastbootPlatformOemCommand ( { CHAR16 CommandUnicode[65]; - AsciiStrToUnicodeStr (Command, CommandUnicode); + AsciiStrToUnicodeStrS (Command, CommandUnicode, 65); if (AsciiStrCmp (Command, "Demonstrate") == 0) { DEBUG ((EFI_D_ERROR, "ARM OEM Fastboot command 'Demonstrate' received.\n"));