From owner-cvs-src@FreeBSD.ORG Wed Mar 9 10:13:22 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74DC116A4CE; Wed, 9 Mar 2005 10:13:22 +0000 (GMT) Received: from bgo1smout1.broadpark.no (bgo1smout1.broadpark.no [217.13.4.94]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6CEE43D39; Wed, 9 Mar 2005 10:13:21 +0000 (GMT) (envelope-from des@des.no) Received: from bgo1sminn1.broadpark.no ([217.13.4.93]) by bgo1smout1.broadpark.no (Sun Java System Messaging Server 6.1 HotFix 0.05 (built Oct 21 2004)) with ESMTP id <0ID200ED2XH87ZA0@bgo1smout1.broadpark.no>; Wed, 09 Mar 2005 11:07:56 +0100 (CET) Received: from dsa.des.no ([80.203.228.37]) by bgo1sminn1.broadpark.no (Sun Java System Messaging Server 6.1 HotFix 0.05 (built Oct 21 2004)) with ESMTP id <0ID200AY7XTG74G0@bgo1sminn1.broadpark.no>; Wed, 09 Mar 2005 11:15:16 +0100 (CET) Received: by dsa.des.no (Pony Express, from userid 666) id 7085545222; Wed, 09 Mar 2005 11:13:20 +0100 (CET) Received: from xps.des.no (xps.des.no [10.0.0.12]) by dsa.des.no (Pony Express) with ESMTP id C3A9345212; Wed, 09 Mar 2005 11:13:16 +0100 (CET) Received: by xps.des.no (Postfix, from userid 1001) id AB51533C1B; Wed, 09 Mar 2005 11:13:16 +0100 (CET) Date: Wed, 09 Mar 2005 11:13:16 +0100 From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) In-reply-to: <200503082051.20064.mistry.7@osu.edu> To: Anish Mistry Message-id: <86acpdunyb.fsf@xps.des.no> MIME-version: 1.0 Content-type: multipart/mixed; boundary="Boundary_(ID_1czkZxGYYcY8em5/EnCGug)" X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on dsa.des.no References: <200503051552.j25FqCjg079895@repoman.freebsd.org> <200503082051.20064.mistry.7@osu.edu> User-Agent: Gnus/5.110002 (No Gnus v0.2) Emacs/21.3 (berkeley-unix) X-Spam-Status: No, score=-2.8 required=5.0 tests=ALL_TRUSTED,AWL autolearn=disabled version=3.0.2 X-Spam-Level: cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/kern kern_environment.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2005 10:13:22 -0000 --Boundary_(ID_1czkZxGYYcY8em5/EnCGug) Content-type: text/plain; charset=iso-8859-1 Content-transfer-encoding: quoted-printable Anish Mistry writes: > On Saturday 05 March 2005 10:52 am, Dag-Erling Smorgrav wrote: > > Log: > > Teach getenv_quad() to recognize k/m/g/t suffixes in both lower- > > and upper-case. This means (almost) all tunables now support those > > suffixes. > This commit breaks resuming from suspend on my laptop. Hrm. Try the attached patch. DES --=20 Dag-Erling Sm=F8rgrav - des@des.no --Boundary_(ID_1czkZxGYYcY8em5/EnCGug) Content-type: text/x-patch; NAME=kern_environment.diff Content-transfer-encoding: 7BIT Content-disposition: attachment; filename=kern_environment.diff Index: sys/kern/kern_environment.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_environment.c,v retrieving revision 1.38 diff -u -r1.38 kern_environment.c --- sys/kern/kern_environment.c 5 Mar 2005 15:52:12 -0000 1.38 +++ sys/kern/kern_environment.c 9 Mar 2005 10:11:40 -0000 @@ -458,9 +458,10 @@ if (value == NULL) return (0); iv = strtoq(value, &vtp, 0); - freeenv(value); - if (vtp == value || (vtp[0] != '\0' && vtp[1] != '\0')) + if (vtp == value || (vtp[0] != '\0' && vtp[1] != '\0')) { + freeenv(value); return (0); + } switch (vtp[0]) { case 't': case 'T': iv *= 1024; @@ -473,9 +474,11 @@ case '\0': break; default: + freeenv(value); return (0); } *data = iv; + freeenv(value); return (1); } --Boundary_(ID_1czkZxGYYcY8em5/EnCGug)--