Re: [gentoo-catalyst] [PATCH 6/8] targets: Inline functions with one caller

[Brian Dolbec]

On Fri,  1 May 2020 18:40:34 -0700
Matt Turner <matts...@gentoo.org> wrote:

> Signed-off-by: Matt Turner <matts...@gentoo.org>
> ---

Please list the functions inlined.  That way anyone does not have to
read the actual patch to know.   I know this is short and simple, but
if there were 5 or 6 inlined in as many different files...

otherwise looks fine


>  targets/support/bootloader-setup.sh | 21 +++++++++++++++++++--
>  targets/support/functions.sh        | 22 ----------------------
>  2 files changed, 19 insertions(+), 24 deletions(-)
> 
> diff --git a/targets/support/bootloader-setup.sh
> b/targets/support/bootloader-setup.sh index d507fe5e..d3a6b2dc 100755
> --- a/targets/support/bootloader-setup.sh
> +++ b/targets/support/bootloader-setup.sh
> @@ -19,8 +19,25 @@ else
>  fi
>  
>  extract_kernels $1/boot
> -check_bootargs
> -check_filesystem_type
> +
> +# Add any additional options
> +if [ -n "${clst_livecd_bootargs}" ]
> +then
> +     for x in ${clst_livecd_bootargs}
> +     do
> +             cmdline_opts="${cmdline_opts} ${x}"
> +     done
> +fi
> +
> +case ${clst_fstype} in
> +     squashfs)
> +             cmdline_opts="${cmdline_opts} looptype=squashfs
> loop=/image.squashfs"
> +     ;;
> +     jffs2)
> +             cmdline_opts="${cmdline_opts} looptype=jffs2
> loop=/image.jffs2"
> +     ;;
> +esac
> +
>  
>  default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts}
> ${custom_kopts} cdroot" [ -n "${clst_splash_theme}" ] &&
> default_append_line="${default_append_line}
> splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1
> quiet" diff --git a/targets/support/functions.sh
> b/targets/support/functions.sh index 601f5dc9..ac6710ad 100755 ---
> a/targets/support/functions.sh +++ b/targets/support/functions.sh @@
> -216,25 +216,3 @@ extract_kernel() { mv ${1}/initramfs-* ${1}/${2}.igz
>       fi
>  }
> -
> -check_bootargs(){
> -     # Add any additional options
> -     if [ -n "${clst_livecd_bootargs}" ]
> -     then
> -             for x in ${clst_livecd_bootargs}
> -             do
> -                     cmdline_opts="${cmdline_opts} ${x}"
> -             done
> -     fi
> -}
> -
> -check_filesystem_type(){
> -     case ${clst_fstype} in
> -             squashfs)
> -                     cmdline_opts="${cmdline_opts}
> looptype=squashfs loop=/image.squashfs"
> -             ;;
> -             jffs2)
> -                     cmdline_opts="${cmdline_opts} looptype=jffs2
> loop=/image.jffs2"
> -             ;;
> -     esac
> -}