Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/kdump avoid using "errno" as struct member name, to ...



details:   https://anonhg.NetBSD.org/src/rev/846605846343
branches:  trunk
changeset: 500939:846605846343
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Dec 20 22:11:16 2000 +0000

description:
avoid using "errno" as struct member name, to avoid conflict with errno.h.
ok by jdolecek

diffstat:

 usr.bin/kdump/kdump.c   |  14 +++++++-------
 usr.bin/kdump/setemul.h |   6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (62 lines):

diff -r e459777b42ce -r 846605846343 usr.bin/kdump/kdump.c
--- a/usr.bin/kdump/kdump.c     Wed Dec 20 21:24:35 2000 +0000
+++ b/usr.bin/kdump/kdump.c     Wed Dec 20 22:11:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kdump.c,v 1.32 2000/12/17 16:09:40 jdolecek Exp $      */
+/*     $NetBSD: kdump.c,v 1.33 2000/12/20 22:11:16 itojun Exp $        */
 
 /*-
  * Copyright (c) 1988, 1993
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)kdump.c    8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: kdump.c,v 1.32 2000/12/17 16:09:40 jdolecek Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.33 2000/12/20 22:11:16 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -410,18 +410,18 @@
 {
        int i = e;
 
-       if (current->errno) {
+       if (current->errnomap) {
 
                /* No remapping for ERESTART and EJUSTRETURN */
                /* Kludge for linux that has negative error numbers */
-               if (current->errno[2] > 0 && e < 0)
+               if (current->errnomap[2] > 0 && e < 0)
                        goto normal;
 
-               for (i = 0; i < current->nerrno; i++)
-                       if (e == current->errno[i])
+               for (i = 0; i < current->nerrnomap; i++)
+                       if (e == current->errnomap[i])
                                break;
 
-               if (i == current->nerrno) {
+               if (i == current->nerrnomap) {
                        printf("-1 unknown errno %d", e);
                        return;
                }
diff -r e459777b42ce -r 846605846343 usr.bin/kdump/setemul.h
--- a/usr.bin/kdump/setemul.h   Wed Dec 20 21:24:35 2000 +0000
+++ b/usr.bin/kdump/setemul.h   Wed Dec 20 22:11:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: setemul.h,v 1.2 2000/11/13 21:38:48 jdolecek Exp $     */
+/*     $NetBSD: setemul.h,v 1.3 2000/12/20 22:11:16 itojun Exp $       */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -77,8 +77,8 @@
        const char *name;       /* Emulation name */
        const char * const *sysnames;   /* Array of system call names */
        int  nsysnames;         /* Number of */
-       int  *errno;            /* Array of error number mapping */
-       int  nerrno;            /* number of elements in array */
+       int  *errnomap;         /* Array of error number mapping */
+       int  nerrnomap;         /* number of elements in array */
 };
 
 extern const struct emulation *current;



Home | Main Index | Thread Index | Old Index