| Message ID | 20181120123701.GW3513@dell |
|---|---|
| State | Accepted |
| Commit | 5c6f9bc1567d6e3364a623a963088f9a3f1e1348 |
| Headers | show |
| Series | [v3,(part,2)] generic/blocklist: Fix implicit declaration of function ‘grub_file_filter_disable_compression' | expand |
LGTM On Tue, 20 Nov 2018, 14:40 Lee Jones, <lee.jones@linaro.org> wrote: > From: Lee Jones <lee.jones@linaro.org> > > generic/blocklist: Fix implicit declaration of function > ‘grub_file_filter_disable_compression' > > grub_file_filter_disable_compression() no longer exists. > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > diff --git a/grub-core/osdep/generic/blocklist.c > b/grub-core/osdep/generic/blocklist.c > index 74024fd06..43186949d 100644 > --- a/grub-core/osdep/generic/blocklist.c > +++ b/grub-core/osdep/generic/blocklist.c > @@ -59,8 +59,7 @@ grub_install_get_blocklist (grub_device_t root_dev, > > grub_disk_cache_invalidate_all (); > > - grub_file_filter_disable_compression (); > - file = grub_file_open (core_path_dev); > + file = grub_file_open (core_path_dev, FILE_TYPE_NO_DECOMPRESS); > if (file) > { > if (grub_file_size (file) != core_size) > @@ -117,8 +116,7 @@ grub_install_get_blocklist (grub_device_t root_dev, > > grub_file_t file; > /* Now read the core image to determine where the sectors are. */ > - grub_file_filter_disable_compression (); > - file = grub_file_open (core_path_dev); > + file = grub_file_open (core_path_dev, FILE_TYPE_NO_DECOMPRESS); > if (! file) > grub_util_error ("%s", grub_errmsg); > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > https://lists.gnu.org/mailman/listinfo/grub-devel > LGTM<br><br><div class="gmail_quote"><div dir="ltr">On Tue, 20 Nov 2018, 14:40 Lee Jones, <<a href="mailto:lee.jones@linaro.org">lee.jones@linaro.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Lee Jones <<a href="mailto:lee.jones@linaro.org" target="_blank">lee.jones@linaro.org</a>><br> <br> generic/blocklist: Fix implicit declaration of function ‘grub_file_filter_disable_compression'<br> <br> grub_file_filter_disable_compression() no longer exists.<br> <br> Signed-off-by: Lee Jones <<a href="mailto:lee.jones@linaro.org" target="_blank">lee.jones@linaro.org</a>><br> <br> diff --git a/grub-core/osdep/generic/blocklist.c b/grub-core/osdep/generic/blocklist.c<br> index 74024fd06..43186949d 100644<br> --- a/grub-core/osdep/generic/blocklist.c<br> +++ b/grub-core/osdep/generic/blocklist.c<br> @@ -59,8 +59,7 @@ grub_install_get_blocklist (grub_device_t root_dev,<br> <br> grub_disk_cache_invalidate_all ();<br> <br> - grub_file_filter_disable_compression ();<br> - file = grub_file_open (core_path_dev);<br> + file = grub_file_open (core_path_dev, FILE_TYPE_NO_DECOMPRESS);<br> if (file)<br> {<br> if (grub_file_size (file) != core_size)<br> @@ -117,8 +116,7 @@ grub_install_get_blocklist (grub_device_t root_dev,<br> <br> grub_file_t file;<br> /* Now read the core image to determine where the sectors are. */<br> - grub_file_filter_disable_compression ();<br> - file = grub_file_open (core_path_dev);<br> + file = grub_file_open (core_path_dev, FILE_TYPE_NO_DECOMPRESS);<br> if (! file)<br> grub_util_error ("%s", grub_errmsg);<br> <br> _______________________________________________<br> Grub-devel mailing list<br> <a href="mailto:Grub-devel@gnu.org" target="_blank">Grub-devel@gnu.org</a><br> <a href="https://lists.gnu.org/mailman/listinfo/grub-devel" rel="noreferrer" target="_blank">https://lists.gnu.org/mailman/listinfo/grub-devel</a><br> </blockquote></div> _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
On Tue, Nov 20, 2018 at 12:37:01PM +0000, Lee Jones wrote: > From: Lee Jones <lee.jones@linaro.org> > > generic/blocklist: Fix implicit declaration of function ‘grub_file_filter_disable_compression' > > grub_file_filter_disable_compression() no longer exists. > > Signed-off-by: Lee Jones <lee.jones@linaro.org> Pushed with two minor changes. Thanks a lot! Daniel
diff --git a/grub-core/osdep/generic/blocklist.c b/grub-core/osdep/generic/blocklist.c index 74024fd06..43186949d 100644 --- a/grub-core/osdep/generic/blocklist.c +++ b/grub-core/osdep/generic/blocklist.c @@ -59,8 +59,7 @@ grub_install_get_blocklist (grub_device_t root_dev, grub_disk_cache_invalidate_all (); - grub_file_filter_disable_compression (); - file = grub_file_open (core_path_dev); + file = grub_file_open (core_path_dev, FILE_TYPE_NO_DECOMPRESS); if (file) { if (grub_file_size (file) != core_size) @@ -117,8 +116,7 @@ grub_install_get_blocklist (grub_device_t root_dev, grub_file_t file; /* Now read the core image to determine where the sectors are. */ - grub_file_filter_disable_compression (); - file = grub_file_open (core_path_dev); + file = grub_file_open (core_path_dev, FILE_TYPE_NO_DECOMPRESS); if (! file) grub_util_error ("%s", grub_errmsg);