[src/pgoyette-compat]: src/sys/sys Use restricted namespace identifiers for v...

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

details:   https://anonhg.NetBSD.org/src/rev/4267087639cd
branches:  pgoyette-compat
changeset: 830766:4267087639cd
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Sep 23 10:41:01 2018 +0000

description:
Use restricted namespace identifiers for variables within the code
generated by macro expansion.

diffstat:

 sys/sys/module_hook.h |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 393a3271f64f -r 4267087639cd sys/sys/module_hook.h
--- a/sys/sys/module_hook.h     Sun Sep 23 09:16:49 2018 +0000
+++ b/sys/sys/module_hook.h     Sun Sep 23 10:41:01 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: module_hook.h,v 1.1.2.2 2018/09/19 06:26:13 pgoyette Exp $ */
+/* $NetBSD: module_hook.h,v 1.1.2.3 2018/09/23 10:41:01 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -169,24 +169,24 @@
 hook ## _ ## which ## _call decl                               \
 {                                                              \
        bool hooked;                                            \
-       int error, s;                                           \
+       int __hook_error, __hook_s;                             \
                                                                \
-       s = pserialize_read_enter();                            \
+       __hook_s = pserialize_read_enter();                     \
        hooked = hook.hooked;                                   \
        if (hooked) {                                           \
                membar_consumer();                              \
                localcount_acquire(&hook.lc);                   \
        }                                                       \
-       pserialize_read_exit(s);                                \
+       pserialize_read_exit(__hook_s);                         \
                                                                \
        if (hooked) {                                           \
-               error = (*hook.which)args;                      \
+               __hook_error = (*hook.which)args;               \
                localcount_release(&hook.lc, &hook.cv,          \
                    &hook.mtx);                                 \
        } else {                                                \
-               error = default;                                \
+               __hook_error = default;                         \
        }                                                       \
-       return error;                                           \
+       return __hook_error;                                    \
 }
 
 #endif /* _SYS_MODULE_HOOK_H */