[lxc-devel] [PATCH 2/9] lxc_user_nic: don't pass unused arg to get_username()
Stéphane Graber
stgraber at ubuntu.com
Tue Nov 19 21:50:19 UTC 2013
On Tue, Nov 19, 2013 at 04:17:45PM +0000, Serge Hallyn wrote:
> From: Serge Hallyn <serge.hallyn at ubuntu.com>
>
> Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
> ---
> src/lxc/lxc_user_nic.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c
> index c8513ba..da3ae74 100644
> --- a/src/lxc/lxc_user_nic.c
> +++ b/src/lxc/lxc_user_nic.c
> @@ -122,7 +122,7 @@ int open_and_lock(char *path)
> }
>
>
> -char *get_username(char **buf)
> +char *get_username(void)
> {
> struct passwd *pwd = getpwuid(getuid());
>
> @@ -901,13 +901,13 @@ int main(int argc, char *argv[])
> {
> int n, fd;
> bool gotone = false;
> - char *me, *buf = alloca(400);
> + char *me;
> char *nicname = alloca(40);
> char *cnic; // created nic name in container is returned here.
> char *vethname;
> int pid;
>
> - if ((me = get_username(&buf)) == NULL) {
> + if ((me = get_username()) == NULL) {
> fprintf(stderr, "Failed to get username\n");
> exit(1);
> }
> --
> 1.8.3.2
>
>
> ------------------------------------------------------------------------------
> Shape the Mobile Experience: Free Subscription
> Software experts and developers: Be at the forefront of tech innovation.
> Intel(R) Software Adrenaline delivers strategic insight and game-changing
> conversations that shape the rapidly evolving mobile landscape. Sign up now.
> http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel
--
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20131119/61fe0f55/attachment.pgp>
More information about the lxc-devel
mailing list