From e33e271f08dacb24a2764dd95be2a3471f3c5fe3 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Wed, 29 Jul 1998 15:50:41 +0000 Subject: [PATCH] Fixed printf format errors. Use offsetof() instead of null pointer hacks. Use a home made offsetof() because including is not permitted in LKMs. --- sys/alpha/linux/linux_genassym.c | 20 +++++++++++--------- sys/i386/linux/linux_genassym.c | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/sys/alpha/linux/linux_genassym.c b/sys/alpha/linux/linux_genassym.c index 7c69d1b6b48b..76b8ced0eb66 100644 --- a/sys/alpha/linux/linux_genassym.c +++ b/sys/alpha/linux/linux_genassym.c @@ -1,23 +1,25 @@ -/* $Id: linux_genassym.c,v 1.6 1997/08/25 23:36:23 bde Exp $ */ +/* $Id: linux_genassym.c,v 1.7 1998/02/01 18:47:56 bde Exp $ */ #include #include +#define offsetof(type, member) ((size_t)(&((type *)0)->member)) +#define OS(s, m) ((u_int)offsetof(struct s, m)) + int main __P((void)); int printf __P((const char *, ...)); int main() { - struct linux_sigframe *linux_sigf = (struct linux_sigframe *)0; - struct linux_sigcontext *linux_sc = (struct linux_sigcontext *)0; - - printf("#define\tLINUX_SIGF_HANDLER %d\n", &linux_sigf->sf_handler); - printf("#define\tLINUX_SIGF_SC %d\n", &linux_sigf->sf_sc); - printf("#define\tLINUX_SC_FS %d\n", &linux_sc->sc_fs); - printf("#define\tLINUX_SC_GS %d\n", &linux_sc->sc_gs); - printf("#define\tLINUX_SC_EFLAGS %d\n", &linux_sc->sc_eflags); + printf("#define\tLINUX_SIGF_HANDLER %u\n", + OS(linux_sigframe, sf_handler)); + printf("#define\tLINUX_SIGF_SC %u\n", OS(linux_sigframe, sf_sc)); + printf("#define\tLINUX_SC_FS %u\n", OS(linux_sigcontext, sc_fs)); + printf("#define\tLINUX_SC_GS %u\n", OS(linux_sigcontext, sc_gs)); + printf("#define\tLINUX_SC_EFLAGS %u\n", + OS(linux_sigcontext, sc_eflags)); return (0); } diff --git a/sys/i386/linux/linux_genassym.c b/sys/i386/linux/linux_genassym.c index 7c69d1b6b48b..76b8ced0eb66 100644 --- a/sys/i386/linux/linux_genassym.c +++ b/sys/i386/linux/linux_genassym.c @@ -1,23 +1,25 @@ -/* $Id: linux_genassym.c,v 1.6 1997/08/25 23:36:23 bde Exp $ */ +/* $Id: linux_genassym.c,v 1.7 1998/02/01 18:47:56 bde Exp $ */ #include #include +#define offsetof(type, member) ((size_t)(&((type *)0)->member)) +#define OS(s, m) ((u_int)offsetof(struct s, m)) + int main __P((void)); int printf __P((const char *, ...)); int main() { - struct linux_sigframe *linux_sigf = (struct linux_sigframe *)0; - struct linux_sigcontext *linux_sc = (struct linux_sigcontext *)0; - - printf("#define\tLINUX_SIGF_HANDLER %d\n", &linux_sigf->sf_handler); - printf("#define\tLINUX_SIGF_SC %d\n", &linux_sigf->sf_sc); - printf("#define\tLINUX_SC_FS %d\n", &linux_sc->sc_fs); - printf("#define\tLINUX_SC_GS %d\n", &linux_sc->sc_gs); - printf("#define\tLINUX_SC_EFLAGS %d\n", &linux_sc->sc_eflags); + printf("#define\tLINUX_SIGF_HANDLER %u\n", + OS(linux_sigframe, sf_handler)); + printf("#define\tLINUX_SIGF_SC %u\n", OS(linux_sigframe, sf_sc)); + printf("#define\tLINUX_SC_FS %u\n", OS(linux_sigcontext, sc_fs)); + printf("#define\tLINUX_SC_GS %u\n", OS(linux_sigcontext, sc_gs)); + printf("#define\tLINUX_SC_EFLAGS %u\n", + OS(linux_sigcontext, sc_eflags)); return (0); }