diff options
Diffstat (limited to 'contrib/sendmail/libsm/findfp.c')
| -rw-r--r-- | contrib/sendmail/libsm/findfp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/contrib/sendmail/libsm/findfp.c b/contrib/sendmail/libsm/findfp.c index a2ec20c..115ed22 100644 --- a/contrib/sendmail/libsm/findfp.c +++ b/contrib/sendmail/libsm/findfp.c @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: findfp.c,v 1.62 2002/01/11 16:33:03 ca Exp $") +SM_RCSID("@(#)$Id: findfp.c,v 1.66 2002/02/20 02:40:24 ca Exp $") #include <stdlib.h> #include <unistd.h> #include <sys/param.h> @@ -47,7 +47,7 @@ SM_FILE_T SmFtStdiofd_def = SM_TIME_BLOCK, "stdiofd" }; /* A string file type */ -SM_FILE_T _SmFtString_def = +SM_FILE_T SmFtString_def = {SmFileMagic, 0, 0, 0, (SMRW|SMNBF), -1, {0, 0}, 0, 0, 0, sm_strclose, sm_strread, sm_strseek, sm_strwrite, sm_stropen, sm_strsetinfo, sm_strgetinfo, SM_TIME_FOREVER, @@ -119,9 +119,9 @@ sm_moreglue_x(n) register struct sm_glue *g; register SM_FILE_T *p; - g = (struct sm_glue *) sm_pmalloc_x(sizeof(*g) + ALIGNBYTES + + g = (struct sm_glue *) sm_pmalloc_x(sizeof(*g) + SM_ALIGN_BITS + n * sizeof(SM_FILE_T)); - p = (SM_FILE_T *) ALIGN(g + 1); + p = (SM_FILE_T *) SM_ALIGN(g + 1); g->gl_next = NULL; g->gl_niobs = n; g->gl_iobs = p; @@ -194,13 +194,10 @@ found: fp->f_setinfo = t->f_setinfo; /* assign setinfo function */ fp->f_getinfo = t->f_getinfo; /* assign getinfo function */ fp->f_type = t->f_type; /* file type */ - fp->f_self = fp; /* self reference for future use */ fp->f_ub.smb_base = NULL; /* no ungetc buffer */ fp->f_ub.smb_size = 0; /* no size for no ungetc buffer */ - fp->f_lb.smb_base = NULL; /* no line buffer */ - fp->f_lb.smb_size = 0; /* no size for no line buffer */ if (fp->f_timeout == SM_TIME_DEFAULT) fp->f_timeout = SM_TIME_FOREVER; else |
