From owner-svn-src-head@freebsd.org  Tue Aug 11 05:58:34 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20AC799D34E;
 Tue, 11 Aug 2015 05:58:34 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 11C1A6E5;
 Tue, 11 Aug 2015 05:58:34 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7B5wXLu058163;
 Tue, 11 Aug 2015 05:58:33 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7B5wXYc058162;
 Tue, 11 Aug 2015 05:58:33 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201508110558.t7B5wXYc058162@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 11 Aug 2015 05:58:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286617 - head/usr.bin/patch
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Aug 2015 05:58:34 -0000

Author: delphij
Date: Tue Aug 11 05:58:33 2015
New Revision: 286617
URL: https://svnweb.freebsd.org/changeset/base/286617

Log:
  Use __DECONST instead of doing strdup/free.
  
  Suggested by:	ed
  MFC after:	2 weeks

Modified:
  head/usr.bin/patch/inp.c

Modified: head/usr.bin/patch/inp.c
==============================================================================
--- head/usr.bin/patch/inp.c	Tue Aug 11 05:51:00 2015	(r286616)
+++ head/usr.bin/patch/inp.c	Tue Aug 11 05:58:33 2015	(r286617)
@@ -219,8 +219,8 @@ plan_a(const char *filename)
 					say("Comparing file %s to default "
 					    "RCS version...\n", filename);
 
-				argp[0] = strdup(RCSDIFF);
-				argp[1] = strdup(filename);
+				argp[0] = __DECONST(char *, RCSDIFF);
+				argp[1] = __DECONST(char *, filename);
 				posix_spawn_file_actions_init(&file_actions);
 				posix_spawn_file_actions_addopen(&file_actions,
 				    STDOUT_FILENO, _PATH_DEVNULL, O_WRONLY, 0);
@@ -234,17 +234,15 @@ plan_a(const char *filename)
 				} else
 					fatal("posix_spawn: %s\n", strerror(errno));
 				posix_spawn_file_actions_destroy(&file_actions);
-				free(argp[1]);
-				free(argp[0]);
 			}
 
 			if (verbose)
 				say("Checking out file %s from RCS...\n",
 				    filename);
 
-			argp[0] = strdup(CHECKOUT);
-			argp[1] = strdup("-l");
-			argp[2] = strdup(filename);
+			argp[0] = __DECONST(char *, CHECKOUT);
+			argp[1] = __DECONST(char *, "-l");
+			argp[2] = __DECONST(char *, filename);
 			if (posix_spawn(&pid, CHECKOUT, NULL, NULL, argp,
 			    NULL) == 0) {
 				pid = waitpid(pid, &pstat, 0);
@@ -254,9 +252,6 @@ plan_a(const char *filename)
 					    filename);
 			} else
 				fatal("posix_spawn: %s\n", strerror(errno));
-			free(argp[2]);
-			free(argp[1]);
-			free(argp[0]);
 		} else if (statfailed) {
 			fatal("can't find %s\n", filename);
 		}