diff options
| author |   miod <miod@openbsd.org> | 2011-04-12 21:38:16 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2011-04-12 21:38:16 +0000 |
| commit | 34ed8120281ce37342ab16a8c0e11ad7113a56e4 (patch) | |
| tree | 32121c977a9c9a6d69c6817c941f72c43ddfe722 | |
| parent | We need to delay 10msec after changing to/from D3 state. note: There are (diff) | |
| download | wireguard-openbsd-34ed8120281ce37342ab16a8c0e11ad7113a56e4.tar.xz wireguard-openbsd-34ed8120281ce37342ab16a8c0e11ad7113a56e4.zip | |
A few, hopefully last, NULL-as-an-integer misuses.
| -rw-r--r-- | gnu/usr.bin/gas/config/tc-m68k.c | 6 | ||||
| -rw-r--r-- | sys/arch/mvme88k/dev/vme.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gnu/usr.bin/gas/config/tc-m68k.c b/gnu/usr.bin/gas/config/tc-m68k.c index 954a3f95295..ed1479b8962 100644 --- a/gnu/usr.bin/gas/config/tc-m68k.c +++ b/gnu/usr.bin/gas/config/tc-m68k.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc-m68k.c,v 1.5 2002/06/26 11:25:43 espie Exp $ */ +/* $OpenBSD: tc-m68k.c,v 1.6 2011/04/12 21:38:16 miod Exp $ */ /* tc-m68k.c All the m68020 specific stuff in one convenient, huge, slow to compile, easy to find file. @@ -1233,7 +1233,7 @@ char *instring; if (p == instring) { the_ins.error = "No operator"; - the_ins.opcode[0] = NULL; + the_ins.opcode[0] = 0; /* the_ins.numo=1; */ return; } @@ -1248,7 +1248,7 @@ char *instring; if (opcode == NULL) { the_ins.error = "Unknown operator"; - the_ins.opcode[0] = NULL; + the_ins.opcode[0] = 0; /* the_ins.numo=1; */ return; } diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c index 466d5ba4038..6c11d69f375 100644 --- a/sys/arch/mvme88k/dev/vme.c +++ b/sys/arch/mvme88k/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.50 2011/04/07 15:30:15 miod Exp $ */ +/* $OpenBSD: vme.c,v 1.51 2011/04/12 21:38:18 miod Exp $ */ /* * Copyright (c) 2004, Miodrag Vallat. * Copyright (c) 1999 Steve Murphree, Jr. @@ -94,7 +94,7 @@ vme_map(bus_addr_t addr, bus_size_t size, int flags, bus_space_handle_t *ret) vaddr_t map; map = (vaddr_t)mapiodev((paddr_t)addr, size); - if (map == NULL) + if (map == 0) return ENOMEM; *ret = (bus_space_handle_t)map; @@ -343,7 +343,7 @@ vmepmap(sc, vmeaddr, bustype) #endif base = vme2chip_map(base, 16); #ifdef DEBUG - if (base == NULL) { + if (base == 0) { printf("%s: cannot map pa 0x%x\n", sc->dv_xname, base); } @@ -356,7 +356,7 @@ vmepmap(sc, vmeaddr, bustype) #endif base = vme2chip_map(base, 32); #ifdef DEBUG - if (base == NULL) { + if (base == 0) { printf("%s: cannot map pa 0x%x\n", sc->dv_xname, base); } |