[src/netbsd-7]: src Pull up following revision(s) (requested by joerg in tick...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3420461a1055
branches:  netbsd-7
changeset: 799428:3420461a1055
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jun 10 16:41:12 2015 +0000

description:
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.

diffstat:

 gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp |  4 ++--
 gnu/dist/texinfo/makeinfo/files.c              |  5 ++---
 usr.bin/netstat/atalk.c                        |  6 ++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diffs (71 lines):

diff -r 7befaa185107 -r 3420461a1055 gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp
--- a/gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp    Wed Jun 10 16:38:05 2015 +0000
+++ b/gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp    Wed Jun 10 16:41:12 2015 +0000
@@ -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 @@
     ;
   *(p + 1) = '\0';
   printf("# %s\n", font_name);
-  delete font_name;
+  delete[] font_name;
 }
 
 static void
diff -r 7befaa185107 -r 3420461a1055 gnu/dist/texinfo/makeinfo/files.c
--- a/gnu/dist/texinfo/makeinfo/files.c Wed Jun 10 16:38:05 2015 +0000
+++ b/gnu/dist/texinfo/makeinfo/files.c Wed Jun 10 16:41:12 2015 +0000
@@ -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 @@
           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)
diff -r 7befaa185107 -r 3420461a1055 usr.bin/netstat/atalk.c
--- a/usr.bin/netstat/atalk.c   Wed Jun 10 16:38:05 2015 +0000
+++ b/usr.bin/netstat/atalk.c   Wed Jun 10 16:41:12 2015 +0000
@@ -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 @@
 void
 atalkprotopr(u_long off, const char *name)
 {
-       struct ddpcb cb;
        struct ddpcb *next;
        struct ddpcb *initial;
        int width = 22;
@@ -237,7 +236,6 @@
                return;
        if (kread(off, (char *)&initial, sizeof(struct ddpcb *)) < 0)
                return;
-       ddpcb = cb;
        for (next = initial; next != NULL;) {
                u_long  ppcb = (u_long)next;