[BACK]Return to inp_str.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib / gmp / mpz

Diff for /OpenXM_contrib/gmp/mpz/Attic/inp_str.c between version 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2000/09/09 14:12:53 version 1.1.1.3, 2003/08/25 16:06:33
Line 1 
Line 1 
 /* mpz_inp_str(dest_integer, stream, base) -- Input a number in base  /* mpz_inp_str(dest_integer, stream, base) -- Input a number in base
    BASE from stdio stream STREAM and store the result in DEST_INTEGER.     BASE from stdio stream STREAM and store the result in DEST_INTEGER.
   
 Copyright (C) 1991, 1993, 1994, 1996, 1998, 2000 Free Software Foundation, Inc.     OF THE FUNCTIONS IN THIS FILE, ONLY mpz_inp_str IS FOR EXTERNAL USE, THE
      REST ARE INTERNALS AND ARE ALMOST CERTAIN TO BE SUBJECT TO INCOMPATIBLE
      CHANGES OR DISAPPEAR COMPLETELY IN FUTURE GNU MP RELEASES.
   
   Copyright 1991, 1993, 1994, 1996, 1998, 2000, 2001, 2002 Free Software
   Foundation, Inc.
   
 This file is part of the GNU MP Library.  This file is part of the GNU MP Library.
   
 The GNU MP Library is free software; you can redistribute it and/or modify  The GNU MP Library is free software; you can redistribute it and/or modify
Line 26  MA 02111-1307, USA. */
Line 31  MA 02111-1307, USA. */
 #include "gmp-impl.h"  #include "gmp-impl.h"
   
 static int  static int
 #if __STDC__  
 digit_value_in_base (int c, int base)  digit_value_in_base (int c, int base)
 #else  
 digit_value_in_base (c, base)  
      int c;  
      int base;  
 #endif  
 {  {
   int digit;    int digit;
   
Line 51  digit_value_in_base (c, base)
Line 50  digit_value_in_base (c, base)
 }  }
   
 size_t  size_t
 #if __STDC__  
 mpz_inp_str (mpz_ptr x, FILE *stream, int base)  mpz_inp_str (mpz_ptr x, FILE *stream, int base)
 #else  
 mpz_inp_str (x, stream, base)  
      mpz_ptr x;  
      FILE *stream;  
      int base;  
 #endif  
 {  {
   char *str;  
   size_t alloc_size, str_size;  
   int c;    int c;
   int negative;  
   mp_size_t xsize;  
   size_t nread;    size_t nread;
   
   if (stream == 0)    if (stream == 0)
Line 80  mpz_inp_str (x, stream, base)
Line 68  mpz_inp_str (x, stream, base)
     }      }
   while (isspace (c));    while (isspace (c));
   
     return mpz_inp_str_nowhite (x, stream, base, c, nread);
   }
   
   /* shared by mpq_inp_str */
   size_t
   mpz_inp_str_nowhite (mpz_ptr x, FILE *stream, int base, int c, size_t nread)
   {
     char *str;
     size_t alloc_size, str_size;
     int negative;
     mp_size_t xsize;
   
   negative = 0;    negative = 0;
   if (c == '-')    if (c == '-')
     {      {
Line 124  mpz_inp_str (x, stream, base)
Line 124  mpz_inp_str (x, stream, base)
     }      }
   
   alloc_size = 100;    alloc_size = 100;
   str = (char *) (*_mp_allocate_func) (alloc_size);    str = (char *) (*__gmp_allocate_func) (alloc_size);
   str_size = 0;    str_size = 0;
   
   for (;;)    for (;;)
Line 134  mpz_inp_str (x, stream, base)
Line 134  mpz_inp_str (x, stream, base)
         {          {
           size_t old_alloc_size = alloc_size;            size_t old_alloc_size = alloc_size;
           alloc_size = alloc_size * 3 / 2;            alloc_size = alloc_size * 3 / 2;
           str = (char *) (*_mp_reallocate_func) (str, old_alloc_size, alloc_size);            str = (char *) (*__gmp_reallocate_func) (str, old_alloc_size, alloc_size);
         }          }
       dig = digit_value_in_base (c, base);        dig = digit_value_in_base (c, base);
       if (dig < 0)        if (dig < 0)
Line 142  mpz_inp_str (x, stream, base)
Line 142  mpz_inp_str (x, stream, base)
       str[str_size++] = dig;        str[str_size++] = dig;
       c = getc (stream);        c = getc (stream);
     }      }
     nread += str_size;
   
   ungetc (c, stream);    ungetc (c, stream);
     nread--;
   
   /* Make sure the string is not empty, mpn_set_str would fail.  */    /* Make sure the string is not empty, mpn_set_str would fail.  */
   if (str_size == 0)    if (str_size == 0)
     {      {
       x->_mp_size = 0;        x->_mp_size = 0;
       (*_mp_free_func) (str, alloc_size);  
       return nread;  
     }      }
     else
       {
         xsize = (((mp_size_t)
                   (str_size / __mp_bases[base].chars_per_bit_exactly))
                  / GMP_NUMB_BITS + 2);
         if (x->_mp_alloc < xsize)
           _mpz_realloc (x, xsize);
   
   xsize = (((mp_size_t) (str_size / __mp_bases[base].chars_per_bit_exactly))        /* Convert the byte array in base BASE to our bignum format.  */
            / BITS_PER_MP_LIMB + 2);        xsize = mpn_set_str (x->_mp_d, (unsigned char *) str, str_size, base);
   if (x->_mp_alloc < xsize)        x->_mp_size = negative ? -xsize : xsize;
     _mpz_realloc (x, xsize);      }
     (*__gmp_free_func) (str, alloc_size);
   /* Convert the byte array in base BASE to our bignum format.  */    return nread;
   xsize = mpn_set_str (x->_mp_d, (unsigned char *) str, str_size, base);  
   x->_mp_size = negative ? -xsize : xsize;  
   
   (*_mp_free_func) (str, alloc_size);  
   return str_size + nread;  
 }  }
Legend:
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>