external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Remove more legacy libast code (re: f9c127e3, 651bbd56)

Browse source 
This removes #ifdefs checking for the existence of
SH_PLUGIN_VERSION (version check for dynamically loaded builtins)
and the SFIO identifiers SF_BUFCONST, SF_CLOSING, SF_APPENDWR,
SF_ATEXIT, all of which are defined by the bundled libast.
This commit is contained in:
Martijn Dekker 2021-03-21 04:17:05 +00:00
parent c7242de16f
commit 0b814b53bd
8 changed files with 18 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/cmd/ksh93/edit/history.c
View file

@ -110,14 +110,8 @@ static History_t* hist_trim(History_t*, int);
static int hist_nearend(History_t*,Sfio_t*, off_t);
static int hist_check(int);
static int hist_clean(int);
#ifdef SF_BUFCONST
static ssize_t hist_write(Sfio_t*, const void*, size_t, Sfdisc_t*);
static int hist_exceptf(Sfio_t*, int, void*, Sfdisc_t*);
#else
static int hist_write(Sfio_t*, const void*, int, Sfdisc_t*);
static int hist_exceptf(Sfio_t*, int, Sfdisc_t*);
#endif
static ssize_t hist_write(Sfio_t*, const void*, size_t, Sfdisc_t*);
static int hist_exceptf(Sfio_t*, int, void*, Sfdisc_t*);
static int histinit;
static mode_t histmode;
@ -788,11 +782,7 @@ void hist_flush(register History_t *hp)
* a zero byte. Line sequencing is added as required
*/
#ifdef SF_BUFCONST
static ssize_t hist_write(Sfio_t *iop,const void *buff,register size_t insize,Sfdisc_t* handle)
#else
static int hist_write(Sfio_t *iop,const void *buff,register int insize,Sfdisc_t* handle)
#endif
{
register History_t *hp = (History_t*)handle;
register char *bufptr = ((char*)buff)+insize;
@ -1174,14 +1164,11 @@ done:
/*
* Handle history file exceptions
*/
#ifdef SF_BUFCONST
static int hist_exceptf(Sfio_t* fp, int type, void *data, Sfdisc_t *handle)
#else
static int hist_exceptf(Sfio_t* fp, int type, Sfdisc_t *handle)
#endif
{
register int newfd,oldfd;
History_t *hp = (History_t*)handle;
NOT_USED(data);
if(type==SF_WRITE)
{
if(errno==ENOSPC || hp->histwfail++ >= 10)