| subr_scanf.c (44016) | subr_scanf.c (50275) |
|---|---|
| 1/*- 2 * Copyright (c) 1990, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Chris Torek. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 19 unchanged lines hidden (view full) --- 28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 * | 1/*- 2 * Copyright (c) 1990, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Chris Torek. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 19 unchanged lines hidden (view full) --- 28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 * |
| 36 * $Id: subr_scanf.c,v 1.4 1999/01/29 08:09:32 dillon Exp $ | 36 * $Id: subr_scanf.c,v 1.5 1999/02/14 20:58:21 dillon Exp $ |
| 37 * From: Id: vfscanf.c,v 1.13 1998/09/25 12:20:27 obrien Exp 38 */ 39 40#include <sys/param.h> 41#include <sys/systm.h> 42#include <sys/kernel.h> 43#include <machine/limits.h> 44 --- 467 unchanged lines hidden (view full) --- 512 } 513 if ((flags & SUPPRESS) == 0) { 514 u_quad_t res; 515 516 *p = 0; 517 res = (*ccfn)(buf, (const char **)NULL, base); 518 if (flags & POINTER) 519 *va_arg(ap, void **) = | 37 * From: Id: vfscanf.c,v 1.13 1998/09/25 12:20:27 obrien Exp 38 */ 39 40#include <sys/param.h> 41#include <sys/systm.h> 42#include <sys/kernel.h> 43#include <machine/limits.h> 44 --- 467 unchanged lines hidden (view full) --- 512 } 513 if ((flags & SUPPRESS) == 0) { 514 u_quad_t res; 515 516 *p = 0; 517 res = (*ccfn)(buf, (const char **)NULL, base); 518 if (flags & POINTER) 519 *va_arg(ap, void **) = |
| 520 (void *)(u_long)res; | 520 (void *)(uintptr_t)res; |
| 521 else if (flags & SHORT) 522 *va_arg(ap, short *) = res; 523 else if (flags & LONG) 524 *va_arg(ap, long *) = res; 525 else if (flags & QUAD) 526 *va_arg(ap, quad_t *) = res; 527 else 528 *va_arg(ap, int *) = res; --- 265 unchanged lines hidden --- | 521 else if (flags & SHORT) 522 *va_arg(ap, short *) = res; 523 else if (flags & LONG) 524 *va_arg(ap, long *) = res; 525 else if (flags & QUAD) 526 *va_arg(ap, quad_t *) = res; 527 else 528 *va_arg(ap, int *) = res; --- 265 unchanged lines hidden --- |