| Message ID | 1434633116-8588-1-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show |
Adding Feng to CC. Note that this fixes the currently broken build on GCC/AArch64 On 18 June 2015 at 15:11, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > Remove two instances of 'DHCP_SERVICE *DhcpSb' in function scope > that are assigned but never used afterwards. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > index ac4b11f09402..821dfbb450a7 100644 > --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > @@ -1188,7 +1188,6 @@ Dhcp4InstanceConfigUdpIo ( > ) > { > DHCP_PROTOCOL *Instance; > - DHCP_SERVICE *DhcpSb; > EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token; > EFI_UDP4_CONFIG_DATA UdpConfigData; > IP4_ADDR ClientAddr; > @@ -1197,7 +1196,6 @@ Dhcp4InstanceConfigUdpIo ( > IP4_ADDR SubnetMask; > > Instance = (DHCP_PROTOCOL *) Context; > - DhcpSb = Instance->Service; > Token = Instance->Token; > > ZeroMem (&UdpConfigData, sizeof (EFI_UDP4_CONFIG_DATA)); > @@ -1309,7 +1307,6 @@ PxeDhcpInput ( > ) > { > DHCP_PROTOCOL *Instance; > - DHCP_SERVICE *DhcpSb; > EFI_DHCP4_HEADER *Head; > NET_BUF *Wrap; > EFI_DHCP4_PACKET *Packet; > @@ -1320,7 +1317,6 @@ PxeDhcpInput ( > Wrap = NULL; > Instance = (DHCP_PROTOCOL *) Context; > Token = Instance->Token; > - DhcpSb = Instance->Service; > > // > // Don't restart receive if error occurs or DHCP is destroyed. > -- > 1.9.1 > ------------------------------------------------------------------------------
On 18 June 2015 at 17:50, Laszlo Ersek <lersek@redhat.com> wrote: > On 06/18/15 15:11, Ard Biesheuvel wrote: >> Remove two instances of 'DHCP_SERVICE *DhcpSb' in function scope >> that are assigned but never used afterwards. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> --- >> MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c | 4 ---- >> 1 file changed, 4 deletions(-) >> >> diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c >> index ac4b11f09402..821dfbb450a7 100644 >> --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c >> +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c >> @@ -1188,7 +1188,6 @@ Dhcp4InstanceConfigUdpIo ( >> ) >> { >> DHCP_PROTOCOL *Instance; >> - DHCP_SERVICE *DhcpSb; >> EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token; >> EFI_UDP4_CONFIG_DATA UdpConfigData; >> IP4_ADDR ClientAddr; >> @@ -1197,7 +1196,6 @@ Dhcp4InstanceConfigUdpIo ( >> IP4_ADDR SubnetMask; >> >> Instance = (DHCP_PROTOCOL *) Context; >> - DhcpSb = Instance->Service; >> Token = Instance->Token; >> >> ZeroMem (&UdpConfigData, sizeof (EFI_UDP4_CONFIG_DATA)); >> @@ -1309,7 +1307,6 @@ PxeDhcpInput ( >> ) >> { >> DHCP_PROTOCOL *Instance; >> - DHCP_SERVICE *DhcpSb; >> EFI_DHCP4_HEADER *Head; >> NET_BUF *Wrap; >> EFI_DHCP4_PACKET *Packet; >> @@ -1320,7 +1317,6 @@ PxeDhcpInput ( >> Wrap = NULL; >> Instance = (DHCP_PROTOCOL *) Context; >> Token = Instance->Token; >> - DhcpSb = Instance->Service; >> >> // >> // Don't restart receive if error occurs or DHCP is destroyed. >> > > Reviewed-by: Laszlo Ersek <lersek@redhat.com> > > Thanks for picking this up, Ard -- this repeated breakage is annoying, > especially after Scott has made available prebuilt gcc toolchains for > Windows-based developers: > > http://sourceforge.net/projects/edk2developertoolsforwindows/files/Tool%20Chain%20Binaries/ > > which could be used to weed out such issues. I guess people first have > to learn to care about the community. > To be honest, I am more annoyed by the lack of response from Jiaxin (who has been active on the mailing list today but couldn't be bothered to respond) than from the actual breakage itself, even if the problem is due to sloppy coding and not obscure GCC-isms that may catch Windows users by surprise. Surely, VC has some kind of diagnostic option that complains about unused locals as well? Thanks, Ard. > I couldn't find it in me this time to write and post the fix, so thanks > again for doing this. > > Laszlo ------------------------------------------------------------------------------
On 19 June 2015 at 03:21, Wu, Jiaxin <jiaxin.wu@intel.com> wrote: > Hi, Ard & Laszlo > Sorry for replying so late. This patch is already reviewed by me and checked in. > OK, I'm glad that it has been fixed. Thanks, Ard. > -----Original Message----- > From: Tian, Feng > Sent: Friday, June 19, 2015 9:00 AM > To: edk2-devel@lists.sourceforge.net; Ard Biesheuvel > Cc: Gerd Hoffmann (GMail address); Wu, Jiaxin; Laszlo Ersek; Tian, Feng > Subject: RE: [edk2] [PATCH] MdeModulePkg: remove unused variables to fix the build > > Hi, Ard & Laszlo > > Sorry for not giving feedback in time. Jiaxin has been aware of this and will fix it soon. > > For this build error, I double check MSDN. Looks like VS only complains those unreferenced local variables (that's VS warning C4101). But if this local variable gets assigned, then there is no complain even the variable is never used. > > Not sure if there is a better way to avoid such break in the future besides the way of Scott's GCC pre-built toolchain in windows. > > Thanks > Feng > > -----Original Message----- > From: Laszlo Ersek [mailto:lersek@redhat.com] > Sent: Friday, June 19, 2015 00:44 > To: Ard Biesheuvel > Cc: edk2-devel@lists.sourceforge.net; Gerd Hoffmann (GMail address); Wu, Jiaxin > Subject: Re: [edk2] [PATCH] MdeModulePkg: remove unused variables to fix the build > > On 06/18/15 18:21, Ard Biesheuvel wrote: >> On 18 June 2015 at 17:50, Laszlo Ersek <lersek@redhat.com> wrote: >>> On 06/18/15 15:11, Ard Biesheuvel wrote: >>>> Remove two instances of 'DHCP_SERVICE *DhcpSb' in function scope >>>> that are assigned but never used afterwards. >>>> >>>> Contributed-under: TianoCore Contribution Agreement 1.0 >>>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >>>> --- >>>> MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c | 4 ---- >>>> 1 file changed, 4 deletions(-) >>>> >>>> diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c >>>> b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c >>>> index ac4b11f09402..821dfbb450a7 100644 >>>> --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c >>>> +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c >>>> @@ -1188,7 +1188,6 @@ Dhcp4InstanceConfigUdpIo ( >>>> ) >>>> { >>>> DHCP_PROTOCOL *Instance; >>>> - DHCP_SERVICE *DhcpSb; >>>> EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token; >>>> EFI_UDP4_CONFIG_DATA UdpConfigData; >>>> IP4_ADDR ClientAddr; >>>> @@ -1197,7 +1196,6 @@ Dhcp4InstanceConfigUdpIo ( >>>> IP4_ADDR SubnetMask; >>>> >>>> Instance = (DHCP_PROTOCOL *) Context; >>>> - DhcpSb = Instance->Service; >>>> Token = Instance->Token; >>>> >>>> ZeroMem (&UdpConfigData, sizeof (EFI_UDP4_CONFIG_DATA)); @@ >>>> -1309,7 +1307,6 @@ PxeDhcpInput ( >>>> ) >>>> { >>>> DHCP_PROTOCOL *Instance; >>>> - DHCP_SERVICE *DhcpSb; >>>> EFI_DHCP4_HEADER *Head; >>>> NET_BUF *Wrap; >>>> EFI_DHCP4_PACKET *Packet; >>>> @@ -1320,7 +1317,6 @@ PxeDhcpInput ( >>>> Wrap = NULL; >>>> Instance = (DHCP_PROTOCOL *) Context; >>>> Token = Instance->Token; >>>> - DhcpSb = Instance->Service; >>>> >>>> // >>>> // Don't restart receive if error occurs or DHCP is destroyed. >>>> >>> >>> Reviewed-by: Laszlo Ersek <lersek@redhat.com> >>> >>> Thanks for picking this up, Ard -- this repeated breakage is >>> annoying, especially after Scott has made available prebuilt gcc >>> toolchains for Windows-based developers: >>> >>> http://sourceforge.net/projects/edk2developertoolsforwindows/files/To >>> ol%20Chain%20Binaries/ >>> >>> which could be used to weed out such issues. I guess people first >>> have to learn to care about the community. >>> >> >> To be honest, I am more annoyed by the lack of response from Jiaxin >> (who has been active on the mailing list today but couldn't be >> bothered to respond) than from the actual breakage itself, > > :/ > >> even if the >> problem is due to sloppy coding and not obscure GCC-isms that may >> catch Windows users by surprise. Surely, VC has some kind of >> diagnostic option that complains about unused locals as well? > > Fully unused locals: probably. Assigned-to, but never read ones: > probably not. > > Thanks > Laszlo > >> >> Thanks, >> Ard. >> >> >>> I couldn't find it in me this time to write and post the fix, so >>> thanks again for doing this. >>> >>> Laszlo > > > ------------------------------------------------------------------------------ > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/edk2-devel ------------------------------------------------------------------------------
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c index ac4b11f09402..821dfbb450a7 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c @@ -1188,7 +1188,6 @@ Dhcp4InstanceConfigUdpIo ( ) { DHCP_PROTOCOL *Instance; - DHCP_SERVICE *DhcpSb; EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token; EFI_UDP4_CONFIG_DATA UdpConfigData; IP4_ADDR ClientAddr; @@ -1197,7 +1196,6 @@ Dhcp4InstanceConfigUdpIo ( IP4_ADDR SubnetMask; Instance = (DHCP_PROTOCOL *) Context; - DhcpSb = Instance->Service; Token = Instance->Token; ZeroMem (&UdpConfigData, sizeof (EFI_UDP4_CONFIG_DATA)); @@ -1309,7 +1307,6 @@ PxeDhcpInput ( ) { DHCP_PROTOCOL *Instance; - DHCP_SERVICE *DhcpSb; EFI_DHCP4_HEADER *Head; NET_BUF *Wrap; EFI_DHCP4_PACKET *Packet; @@ -1320,7 +1317,6 @@ PxeDhcpInput ( Wrap = NULL; Instance = (DHCP_PROTOCOL *) Context; Token = Instance->Token; - DhcpSb = Instance->Service; // // Don't restart receive if error occurs or DHCP is destroyed.
Remove two instances of 'DHCP_SERVICE *DhcpSb' in function scope that are assigned but never used afterwards. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c | 4 ---- 1 file changed, 4 deletions(-)