| refill.c (72373) | refill.c (72529) |
|---|---|
| 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 --- 25 unchanged lines hidden (view full) --- 34 * SUCH DAMAGE. 35 */ 36 37#if defined(LIBC_SCCS) && !defined(lint) 38#if 0 39static char sccsid[] = "@(#)refill.c 8.1 (Berkeley) 6/4/93"; 40#endif 41static const char rcsid[] = | 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 --- 25 unchanged lines hidden (view full) --- 34 * SUCH DAMAGE. 35 */ 36 37#if defined(LIBC_SCCS) && !defined(lint) 38#if 0 39static char sccsid[] = "@(#)refill.c 8.1 (Berkeley) 6/4/93"; 40#endif 41static const char rcsid[] = |
| 42 "$FreeBSD: head/lib/libc/stdio/refill.c 72373 2001-02-11 22:06:43Z deischen $"; | 42 "$FreeBSD: head/lib/libc/stdio/refill.c 72529 2001-02-16 06:11:22Z imp $"; |
| 43#endif /* LIBC_SCCS and not lint */ 44 45#include "namespace.h" 46#include <errno.h> 47#include <stdio.h> 48#include <stdlib.h> 49#include "un-namespace.h" 50 --- 53 unchanged lines hidden (view full) --- 104 * We were reading. If there is an ungetc buffer, 105 * we must have been reading from that. Drop it, 106 * restoring the previous buffer (if any). If there 107 * is anything in that buffer, return. 108 */ 109 if (HASUB(fp)) { 110 FREEUB(fp); 111 if ((fp->_r = fp->_ur) != 0) { | 43#endif /* LIBC_SCCS and not lint */ 44 45#include "namespace.h" 46#include <errno.h> 47#include <stdio.h> 48#include <stdlib.h> 49#include "un-namespace.h" 50 --- 53 unchanged lines hidden (view full) --- 104 * We were reading. If there is an ungetc buffer, 105 * we must have been reading from that. Drop it, 106 * restoring the previous buffer (if any). If there 107 * is anything in that buffer, return. 108 */ 109 if (HASUB(fp)) { 110 FREEUB(fp); 111 if ((fp->_r = fp->_ur) != 0) { |
| 112 fp->_p = fp->_up; | 112 fp->_p = fp->_extra->_up; |
| 113 return (0); 114 } 115 } 116 } 117 118 if (fp->_bf._base == NULL) 119 __smakebuf(fp); 120 --- 29 unchanged lines hidden --- | 113 return (0); 114 } 115 } 116 } 117 118 if (fp->_bf._base == NULL) 119 __smakebuf(fp); 120 --- 29 unchanged lines hidden --- |