From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B1F11138350 for ; Sat, 2 May 2020 23:12:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDCFCE07FA; Sat, 2 May 2020 23:12:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1002E07FA for ; Sat, 2 May 2020 23:12:51 +0000 (UTC) Date: Sat, 2 May 2020 16:12:48 -0700 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH 6/8] targets: Inline functions with one caller Message-ID: <20200502161248.162a34ad@storm> In-Reply-To: <20200502014036.1039317-6-mattst88@gentoo.org> References: <20200502014036.1039317-1-mattst88@gentoo.org> <20200502014036.1039317-6-mattst88@gentoo.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: 731061e3-93dc-4fd7-b2df-e5a139775fd1 X-Archives-Hash: 5f7889a61ee383159b9ca3a31e8c9057 On Fri, 1 May 2020 18:40:34 -0700 Matt Turner wrote: > Signed-off-by: Matt Turner > --- 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 > -}