*** /var/tmp/,RCSt1a13871	Sat Apr 13 21:19:25 2002
--- cif.c	Sat Apr 13 16:51:48 2002
***************
*** 282,288
    void __far *new_block;
  
      /* Are the arguments valid? */
!   if (!old_block || elsize == 0) return CIF_ARGUMENT;
  
      /* Is the size alread correct? */
  

--- 282,288 -----
    void __far *new_block;
  
      /* Are the arguments valid? */
!   if (!old_block || elsize == (size_t)0) return CIF_ARGUMENT;
  
      /* Is the size alread correct? */
  
***************
*** 292,298
  
      /* Allocate the memory */
  
!   if (nelem > 0) {
      new_block = _fmalloc (nelem * elsize);
      if (!new_block)
        return CIF_ALLOC;

--- 292,298 -----
  
      /* Allocate the memory */
  
!   if (nelem > (size_t)0) {
      new_block = _fmalloc (nelem * elsize);
      if (!new_block)
        return CIF_ALLOC;
***************
*** 303,309
  
      /* Copy the old data */
    if (old_nelem)
!       if (*old_block && *old_nelem > 0 && nelem > 0)
      {
        if (*old_nelem > nelem)
              *old_nelem = nelem;

--- 303,309 -----
  
      /* Copy the old data */
    if (old_nelem)
!       if (*old_block && *old_nelem > (size_t)0 && nelem > (size_t)0)
      {
        if (*old_nelem > nelem)
              *old_nelem = nelem;
***************
*** 320,326
    if (!old_nelem)
      memset (new_block, 0, nelem * elsize);
    else
!     if (nelem > 0 && nelem > *old_nelem)
        memset (((char __far *) new_block) + *old_nelem * elsize, 0,
                                       (nelem - *old_nelem) * elsize);
  

--- 320,326 -----
    if (!old_nelem)
      memset (new_block, 0, nelem * elsize);
    else
!     if (nelem > (size_t)0 && nelem > *old_nelem)
        memset (((char __far *) new_block) + *old_nelem * elsize, 0,
                                       (nelem - *old_nelem) * elsize);
  
***************
*** 1545,1551
  
    do
    {
!     length = file->text_used;
      if (reprocess)
        reprocess = 0;
      else

--- 1545,1551 -----
  
    do
    {
!     length = (int)(file->text_used);
      if (reprocess)
        reprocess = 0;
      else
***************
*** 1838,1844
  
      /* Is the size already close enough? */
  
!   if (file->text_size > size && file->text_size <= size + 256 && size > 0)
  
      return 0;
  

--- 1838,1844 -----
  
      /* Is the size already close enough? */
  
!   if (file->text_size > size && file->text_size <= size + 256 && size > (size_t)0)
  
      return 0;
  
***************
*** 1865,1872
      /* Expand the buffer? */
  
    kblock = 16;
!   if (file->text_used+2 > 128*2) kblock = 128;
!   if (file->text_used+2 > 512*2) kblock = 512;
    new_size = (((int)((file->text_used+2)/kblock)))*kblock+kblock;
    if (new_size < file->text_used+3) new_size = file->text_used+3;
  

--- 1865,1872 -----
      /* Expand the buffer? */
  
    kblock = 16;
!   if (file->text_used+2 > (size_t)(128*2)) kblock = 128;
!   if (file->text_used+2 > (size_t)(512*2)) kblock = 512;
    new_size = (((int)((file->text_used+2)/kblock)))*kblock+kblock;
    if (new_size < file->text_used+3) new_size = (int)file->text_used+3;
  
***************
*** 1868,1874
    if (file->text_used+2 > 128*2) kblock = 128;
    if (file->text_used+2 > 512*2) kblock = 512;
    new_size = (((int)((file->text_used+2)/kblock)))*kblock+kblock;
!   if (new_size < file->text_used+3) new_size = file->text_used+3;
  
    if (new_size >= file->text_size)
  

--- 1868,1874 -----
    if (file->text_used+2 > (size_t)(128*2)) kblock = 128;
    if (file->text_used+2 > (size_t)(512*2)) kblock = 512;
    new_size = (((int)((file->text_used+2)/kblock)))*kblock+kblock;
!   if (new_size < file->text_used+3) new_size = (int)file->text_used+3;
  
    if (new_size >= file->text_size)