[src/trunk]: src/sys/arch/ia64/stand Make it compile again - partly from PR 4...

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

details:   https://anonhg.NetBSD.org/src/rev/2142e510501a
branches:  trunk
changeset: 328590:2142e510501a
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Apr 08 21:51:06 2014 +0000

description:
Make it compile again - partly from PR 48727 by Henning Petersen.

diffstat:

 sys/arch/ia64/stand/common/boot.c           |  4 ++--
 sys/arch/ia64/stand/common/commands.c       |  4 ++--
 sys/arch/ia64/stand/efi/libefi/devicename.c |  4 ++--
 sys/arch/ia64/stand/ia64/ski/devicename.c   |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r 7d7433000f98 -r 2142e510501a sys/arch/ia64/stand/common/boot.c
--- a/sys/arch/ia64/stand/common/boot.c Tue Apr 08 21:08:36 2014 +0000
+++ b/sys/arch/ia64/stand/common/boot.c Tue Apr 08 21:51:06 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.6 2014/03/25 18:35:32 christos Exp $        */
+/*     $NetBSD: boot.c,v 1.7 2014/04/08 21:51:06 martin Exp $  */
 
 /*-
  * Copyright (c) 1998 Michael Smith <msmith%freebsd.org@localhost>
@@ -108,7 +108,7 @@
        return(CMD_ERROR);
 
     /* Call the exec handler from the loader matching the kernel */
-    command_seterr("%s", strerror(file_formats[fp->f_loader]->l_exec(fp));
+    command_seterr("%s", strerror(file_formats[fp->f_loader]->l_exec(fp)));
     return(CMD_ERROR);
 }
 
diff -r 7d7433000f98 -r 2142e510501a sys/arch/ia64/stand/common/commands.c
--- a/sys/arch/ia64/stand/common/commands.c     Tue Apr 08 21:08:36 2014 +0000
+++ b/sys/arch/ia64/stand/common/commands.c     Tue Apr 08 21:51:06 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: commands.c,v 1.4 2014/03/25 18:35:32 christos Exp $    */
+/*     $NetBSD: commands.c,v 1.5 2014/04/08 21:51:06 martin Exp $      */
 
 /*-
  * Copyright (c) 1998 Michael Smith <msmith%freebsd.org@localhost>
@@ -42,7 +42,7 @@
 {
        int len;
        va_list ap;
-       va_start(fmt, ap);
+       va_start(ap, fmt);
        len = vsnprintf(command_errbuf, sizeof(command_errbuf), fmt, ap);
        va_end(ap);
        return len;
diff -r 7d7433000f98 -r 2142e510501a sys/arch/ia64/stand/efi/libefi/devicename.c
--- a/sys/arch/ia64/stand/efi/libefi/devicename.c       Tue Apr 08 21:08:36 2014 +0000
+++ b/sys/arch/ia64/stand/efi/libefi/devicename.c       Tue Apr 08 21:51:06 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: devicename.c,v 1.7 2014/03/27 18:22:56 christos Exp $  */
+/*     $NetBSD: devicename.c,v 1.8 2014/04/08 21:51:06 martin Exp $    */
 
 /*-
  * Copyright (c) 1998 Michael Smith <msmith%freebsd.org@localhost>
@@ -227,8 +227,8 @@
                if (dev->d_kind.efidisk.partition >= 0) {
                        len += snprintf(buf + len, buflen - len, "%c", dev->d_kind.efidisk.partition + 'a');
                        if (len > buflen)
+                               len = buflen;
                }
-                               len = buflen;
                strlcat(buf, ":", sizeof(buf) - len);
                break;
 
diff -r 7d7433000f98 -r 2142e510501a sys/arch/ia64/stand/ia64/ski/devicename.c
--- a/sys/arch/ia64/stand/ia64/ski/devicename.c Tue Apr 08 21:08:36 2014 +0000
+++ b/sys/arch/ia64/stand/ia64/ski/devicename.c Tue Apr 08 21:51:06 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: devicename.c,v 1.6 2014/03/27 18:22:56 christos Exp $  */
+/*     $NetBSD: devicename.c,v 1.7 2014/04/08 21:51:06 martin Exp $    */
 
 /*-
  * Copyright (c) 1998 Michael Smith <msmith%freebsd.org@localhost>
@@ -224,7 +224,7 @@
                        if (len > buflen)
                                len = buflen;
                }
-               strlcat(cp, ":", buflen - len);
+               strlcat(buf, ":", buflen - len);
                break;
 
        case DEVT_NET: