Module Name: src Committed By: wiz Date: Fri Jun 16 23:31:54 UTC 2023
Modified Files: src/usr.bin/patch: pch.c Log Message: Comment out variable assignations that are not used. Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/patch/pch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/patch/pch.c diff -u src/usr.bin/patch/pch.c:1.32 src/usr.bin/patch/pch.c:1.33 --- src/usr.bin/patch/pch.c:1.32 Tue May 25 11:25:59 2021 +++ src/usr.bin/patch/pch.c Fri Jun 16 23:31:53 2023 @@ -1,19 +1,19 @@ /* * $OpenBSD: pch.c,v 1.37 2007/09/02 15:19:33 deraadt Exp $ * $DragonFly: src/usr.bin/patch/pch.c,v 1.6 2008/08/10 23:35:40 joerg Exp $ - * $NetBSD: pch.c,v 1.32 2021/05/25 11:25:59 cjep Exp $ + * $NetBSD: pch.c,v 1.33 2023/06/16 23:31:53 wiz Exp $ */ /* * patch - a program to apply diffs to original files - * + * * Copyright 1986, Larry Wall - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following condition is met: * 1. Redistributions of source code must retain the above copyright notice, * this condition and the following disclaimer. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -25,13 +25,13 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * -C option added in 1998, original code by Marc Espie, based on FreeBSD * behaviour */ #include <sys/cdefs.h> -__RCSID("$NetBSD: pch.c,v 1.32 2021/05/25 11:25:59 cjep Exp $"); +__RCSID("$NetBSD: pch.c,v 1.33 2023/06/16 23:31:53 wiz Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -553,7 +553,7 @@ another_hunk(void) p_context = 100; p_hunk_beg = p_input_line + 1; while (p_end < p_max) { - line_beginning = ftell(pfp); + // line_beginning = ftell(pfp); ret = pgetline(&buf, &bufsz, pfp); p_input_line++; if (ret == -1) { @@ -935,7 +935,7 @@ hunk_done: context = 0; p_hunk_beg = p_input_line + 1; while (fillold <= p_ptrn_lines || fillnew <= p_end) { - line_beginning = ftell(pfp); + // line_beginning = ftell(pfp); ret = pgetline(&buf, &bufsz, pfp); p_input_line++; if (ret == -1) {