‣ merge from mksh R40-stable

use common macro bodies shf_{get,put}c_ for definition
of shf_{put,get}c as functions (MKSH_SMALL) or macros, respectively
This commit is contained in:
tg
2011-07-16 17:07:35 +00:00
parent 851f8fb7d8
commit 8d1edbd95e
2 changed files with 15 additions and 15 deletions

8
shf.c
View File

@@ -24,7 +24,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/shf.c,v 1.41 2011/03/13 01:20:23 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/shf.c,v 1.42 2011/07/16 17:07:35 tg Exp $");
/* flags to shf_emptybuf() */
#define EB_READSW 0x01 /* about to switch to reading */
@@ -1028,14 +1028,12 @@ shf_vfprintf(struct shf *shf, const char *fmt, va_list args)
int
shf_getc(struct shf *shf)
{
return ((shf)->rnleft > 0 ? (shf)->rnleft--, *(shf)->rp++ :
shf_getchar(shf));
return (shf_getc_(shf));
}
int
shf_putc(int c, struct shf *shf)
{
return ((shf)->wnleft == 0 ? shf_putchar((c), (shf)) :
((shf)->wnleft--, *(shf)->wp++ = (c)));
return (shf_putc_(c, shf));
}
#endif