From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.web11.6021.1593633683491217615 for ; Wed, 01 Jul 2020 13:01:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=iqay+LWL; spf=pass (domain: nuviainc.com, ip: 209.85.128.42, mailfrom: leif@nuviainc.com) Received: by mail-wm1-f42.google.com with SMTP id o2so24797721wmh.2 for ; Wed, 01 Jul 2020 13:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UdGFnR/hMQkV5UCmAvYjV5pBERy02+quJ3r+rZ3JEl8=; b=iqay+LWLCNgVEG7oOARLI+Pee10ssm7uP2XMe7kT5KCWf8ITR2rWvtwT4SeGThAalM BtJgZm++QlMiKNmls65tuWxvLG6IyyKz9u4PTd0NNZJUZw7hEyDNZDrElwNPRSR7R09n s52+h55UiFPHCHXSgPZFGq8fALtBnbKvYEb/2j1MqeFCpffBwxna9WxbG0LMk2YsMAMk s9/uhjbnNHWHy8qq+yHFwE5WtCRv0xS0eduCSh2PbYzXRFiKuA93UuVg0c18kSMlwJv/ iOHBVLpsnx3U9hCsOsARfIqWUuTKdXfkNxU1dW3MRGCqulP8rZXjq/5cBToxLBM8HplV pXnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UdGFnR/hMQkV5UCmAvYjV5pBERy02+quJ3r+rZ3JEl8=; b=hdUuE8p9llvBeV9zaqpgT3y9RyqKdllaXDfQ/TfXJlRYZGEQRJufZsaEwc8Iz7JP+k +P7QfYlhnzY0Aes3Yyl2ex2WUI6lcfyUzy29OyP/AmF3FeF4QKs4YkBR8YHlTy8VntcR kNcr3rjuZl1UaB6mwbQlVJNq9BldIFpMF7Eud75YSSQ2E38UsCY033qxl+v3nkHrv4mi bPz/pfq8rV5g9fifee6Qf/p7adGpf0L1vpnp2XWFhwW3gFRe80T/corosoWa8SlJoqe/ aI+OOXMQ8CfxEo+pySrN/DDtrGLIncmFG7gIpkb1a7NwGKTjQeCxHkY+Is6/edK+3T5U T+bA== X-Gm-Message-State: AOAM530l9c1XvbAWddoIfPSQJWc7Hn+KFwsf2mYBc7e0NeUaC7PjXVEN NJH2XsUHm8al+WEnSFYeqQue92iaRGYrCUAKJkCSCq2k5dgFxA8OXAryh0n3LiZd8CCncSTmdda vgEhIBMpD/nqMv4I91VQ4J3MX6ogOmPSn8andq3z/jhrjF5to8PH03JCxYASU6A7RwQ== X-Google-Smtp-Source: ABdhPJxeJZ00z0IeU61W32XsR2qd0sNnEjIr5cDXrEkUH1NOUQUocIF4IepA9IxDCZSbJZL+0TBCbw== X-Received: by 2002:a1c:1dc7:: with SMTP id d190mr27411712wmd.36.1593633681778; Wed, 01 Jul 2020 13:01:21 -0700 (PDT) Return-Path: Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id s8sm8519067wru.38.2020.07.01.13.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 13:01:21 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Ard Biesheuvel , macarl@microsoft.com Subject: [RFC 1/5] EmbeddedPkg/PrePiLib: style cleanup in FwVol.c Date: Wed, 1 Jul 2020 21:01:14 +0100 Message-Id: <20200701200118.3972-2-leif@nuviainc.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701200118.3972-1-leif@nuviainc.com> References: <20200701200118.3972-1-leif@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Move some curly brackets, change a couple of EFI_D_ to DEBUG_, and fix some intentation. Signed-off-by: Leif Lindholm --- EmbeddedPkg/Library/PrePiLib/FwVol.c | 44 +++++++++++++--------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/EmbeddedPkg/Library/PrePiLib/FwVol.c b/EmbeddedPkg/Library/PrePiLib/FwVol.c index 881506edddaf..90b5b4444002 100644 --- a/EmbeddedPkg/Library/PrePiLib/FwVol.c +++ b/EmbeddedPkg/Library/PrePiLib/FwVol.c @@ -361,7 +361,7 @@ FfsProcessSection ( // // GetInfo failed // - DEBUG ((EFI_D_ERROR, "Decompress GetInfo Failed - %r\n", Status)); + DEBUG ((DEBUG_ERROR, "Decompress GetInfo Failed - %r\n", Status)); return EFI_NOT_FOUND; } // @@ -392,38 +392,37 @@ FfsProcessSection ( if (Section->Type == EFI_SECTION_COMPRESSION) { if (IS_SECTION2 (Section)) { CompressedData = (CHAR8 *) ((EFI_COMPRESSION_SECTION2 *) Section + 1); - } - else { + } else { CompressedData = (CHAR8 *) ((EFI_COMPRESSION_SECTION *) Section + 1); } Status = UefiDecompress ( - CompressedData, - DstBuffer, - ScratchBuffer - ); + CompressedData, + DstBuffer, + ScratchBuffer + ); } else if (Section->Type == EFI_SECTION_GUID_DEFINED) { Status = ExtractGuidedSectionDecode ( - Section, - &DstBuffer, - ScratchBuffer, - &AuthenticationStatus - ); + Section, + &DstBuffer, + ScratchBuffer, + &AuthenticationStatus + ); } if (EFI_ERROR (Status)) { // // Decompress failed // - DEBUG ((EFI_D_ERROR, "Decompress Failed - %r\n", Status)); + DEBUG ((DEBUG_ERROR, "Decompress Failed - %r\n", Status)); return EFI_NOT_FOUND; } else { return FfsProcessSection ( - SectionType, - DstBuffer, - DstBufferSize, - OutputBuffer - ); + SectionType, + DstBuffer, + DstBufferSize, + OutputBuffer + ); } } @@ -756,17 +755,14 @@ FfsAnyFvFindFirstFile ( Instance = 0; *FileHandle = NULL; - while (1) - { + while (1) { Status = FfsFindNextVolume (Instance++, VolumeHandle); - if (EFI_ERROR (Status)) - { + if (EFI_ERROR (Status)) { break; } Status = FfsFindNextFile (FileType, *VolumeHandle, FileHandle); - if (!EFI_ERROR (Status)) - { + if (!EFI_ERROR (Status)) { break; } } -- 2.20.1