From owner-svn-src-head@FreeBSD.ORG Wed Dec 5 14:48:53 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6E72C13; Wed, 5 Dec 2012 14:48:53 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by mx1.freebsd.org (Postfix) with ESMTP id 90CBC8FC08; Wed, 5 Dec 2012 14:48:52 +0000 (UTC) Received: by mail-wi0-f180.google.com with SMTP id hj13so1474732wib.13 for ; Wed, 05 Dec 2012 06:48:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=6sem2t1SMocDQaXbZFYBTW3N6gY0RoK8mahq2UG/K74=; b=fuSMPqzMbJEMkooMxBykfu1laeOBOSIh22p13xdzDpf90X8xqdY9qa2ywXpbsjZ1hO mBxDJ0YpezFSUHAEs3PLbWClpzj7mbI/FXSDYB6QkMg7qfbWMIlrBo2yqe/BCQ+3oAhk an8G/v407nUYHBjoL2dVf2c25dq0r+aqJqywHPQqnfn7Rf197GYoHqHOkE/0OsZo9Qek 8Ib9Sl9Ce0VorWX5DgWOcK+Zaf5ttxnSSnP4T0cp1FCOO/f4D6fsw4gqFEzkhe8MG3IJ ZaWGTBbqsVfXUm6QhKX1abIa0UjGozxSVVT6B3QJ/vsMhXeg16O0wqsk0/75C8Q3LKCb D19w== Received: by 10.216.204.105 with SMTP id g83mr6437705weo.80.1354718931466; Wed, 05 Dec 2012 06:48:51 -0800 (PST) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by mx.google.com with ESMTPS id w5sm6703827wiz.10.2012.12.05.06.48.49 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Dec 2012 06:48:50 -0800 (PST) Date: Wed, 5 Dec 2012 15:48:42 +0100 From: Mateusz Guzik To: Eitan Adler Subject: Re: svn commit: r243898 - head/usr.sbin/pw Message-ID: <20121205144842.GA29435@dft-labs.eu> References: <201212051356.qB5Duu0c068432@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201212051356.qB5Duu0c068432@svn.freebsd.org> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Dec 2012 14:48:54 -0000 On Wed, Dec 05, 2012 at 01:56:56PM +0000, Eitan Adler wrote: > Author: eadler > Date: Wed Dec 5 13:56:56 2012 > New Revision: 243898 > URL: http://svnweb.freebsd.org/changeset/base/243898 > > Log: > Simplify string duplication: use strdup instead of malloc + strcpy > > Submitted by: db > Approved by: cperciva > MFC after: 2 weeks > > Modified: > head/usr.sbin/pw/grupd.c > > Modified: head/usr.sbin/pw/grupd.c > ============================================================================== > --- head/usr.sbin/pw/grupd.c Wed Dec 5 13:56:52 2012 (r243897) > +++ head/usr.sbin/pw/grupd.c Wed Dec 5 13:56:56 2012 (r243898) > @@ -50,12 +50,11 @@ setgrdir(const char * dir) > { > if (dir == NULL) > return -1; > - else { > - char * d = malloc(strlen(dir)+1); > - if (d == NULL) > - return -1; > - grpath = strcpy(d, dir); > - } > + else > + grpath = strdup(dir); > + if (grpath == NULL) > + return -1; > + > return 0; > } > (yes, I know pw is a lot of work) This can be further deuglified with slight change: --- a/usr.sbin/pw/grupd.c +++ b/usr.sbin/pw/grupd.c @@ -50,8 +50,8 @@ setgrdir(const char * dir) { if (dir == NULL) return -1; - else - grpath = strdup(dir); + + grpath = strdup(dir); if (grpath == NULL) return -1; Also the only consumer does not check for errors, but after cursory look I'm not sure if it is ok to just exit. -- Mateusz Guzik