Module Name: src Committed By: snj Date: Wed Jun 10 16:41:12 UTC 2015
Modified Files: src/gnu/dist/groff/src/utils/hpftodit [netbsd-7]: hpftodit.cpp src/gnu/dist/texinfo/makeinfo [netbsd-7]: files.c src/usr.bin/netstat [netbsd-7]: atalk.c Log Message: Pull up following revision(s) (requested by joerg in ticket #831): gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp: revision 1.6 gnu/dist/texinfo/makeinfo/files.c: revision 1.10 usr.bin/netstat/atalk.c: revision 1.16 Fix operator precedence to allocate enough memory. -- Drop assignment from uninitialized and otherwise unused variable. -- The opposite of new[] is delete[], not delete. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.62.1 \ src/gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp cvs rdiff -u -r1.9 -r1.9.38.1 src/gnu/dist/texinfo/makeinfo/files.c cvs rdiff -u -r1.15 -r1.15.4.1 src/usr.bin/netstat/atalk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp diff -u src/gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp:1.5 src/gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp:1.5.62.1 --- src/gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp:1.5 Mon Feb 6 18:25:48 2006 +++ src/gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp Wed Jun 10 16:41:12 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: hpftodit.cpp,v 1.5 2006/02/06 18:25:48 wiz Exp $ */ +/* $NetBSD: hpftodit.cpp,v 1.5.62.1 2015/06/10 16:41:12 snj Exp $ */ // -*- C++ -*- /* Copyright (C) 1994, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. @@ -577,7 +577,7 @@ output_font_name(File &f) ; *(p + 1) = '\0'; printf("# %s\n", font_name); - delete font_name; + delete[] font_name; } static void Index: src/gnu/dist/texinfo/makeinfo/files.c diff -u src/gnu/dist/texinfo/makeinfo/files.c:1.9 src/gnu/dist/texinfo/makeinfo/files.c:1.9.38.1 --- src/gnu/dist/texinfo/makeinfo/files.c:1.9 Tue Sep 2 08:41:51 2008 +++ src/gnu/dist/texinfo/makeinfo/files.c Wed Jun 10 16:41:12 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: files.c,v 1.9 2008/09/02 08:41:51 christos Exp $ */ +/* $NetBSD: files.c,v 1.9.38.1 2015/06/10 16:41:12 snj Exp $ */ /* files.c -- file-related functions for makeinfo. Id: files.c,v 1.5 2004/07/27 00:06:31 karl Exp @@ -458,8 +458,7 @@ full_pathname (char *filename) temp_home = (char *) getenv ("HOME"); result = xmalloc (strlen (&filename[1]) + 1 - + temp_home ? strlen (temp_home) - : 0); + + (temp_home ? strlen (temp_home) : 0)); *result = 0; if (temp_home) Index: src/usr.bin/netstat/atalk.c diff -u src/usr.bin/netstat/atalk.c:1.15 src/usr.bin/netstat/atalk.c:1.15.4.1 --- src/usr.bin/netstat/atalk.c:1.15 Fri Oct 18 20:26:45 2013 +++ src/usr.bin/netstat/atalk.c Wed Jun 10 16:41:12 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: atalk.c,v 1.15 2013/10/18 20:26:45 christos Exp $ */ +/* $NetBSD: atalk.c,v 1.15.4.1 2015/06/10 16:41:12 snj Exp $ */ /* * Copyright (c) 1983, 1988, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "from @(#)atalk.c 1.1 (Whistle) 6/6/96"; #else -__RCSID("$NetBSD: atalk.c,v 1.15 2013/10/18 20:26:45 christos Exp $"); +__RCSID("$NetBSD: atalk.c,v 1.15.4.1 2015/06/10 16:41:12 snj Exp $"); #endif #endif /* not lint */ @@ -229,7 +229,6 @@ atalk_print2(const struct sockaddr *sa, void atalkprotopr(u_long off, const char *name) { - struct ddpcb cb; struct ddpcb *next; struct ddpcb *initial; int width = 22; @@ -237,7 +236,6 @@ atalkprotopr(u_long off, const char *nam return; if (kread(off, (char *)&initial, sizeof(struct ddpcb *)) < 0) return; - ddpcb = cb; for (next = initial; next != NULL;) { u_long ppcb = (u_long)next;