[BACK]Return to ox.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / ox_toolkit

Diff for /OpenXM/src/ox_toolkit/ox.c between version 1.23 and 1.45

version 1.23, 2003/03/30 08:05:22 version 1.45, 2015/08/27 03:03:33
Line 1 
Line 1 
 /* -*- mode: C; coding: euc-japan -*- */  /* -*- mode: C; coding: euc-japan -*- */
 /* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.22 2003/03/23 20:17:35 ohara Exp $ */  /* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.44 2015/08/18 02:24:04 noro Exp $ */
   
 /*  /*
    This module includes functions for sending/receiveng CMO's.     This module includes functions for sending/receiveng CMO's.
Line 11 
Line 11 
 #include <stdlib.h>  #include <stdlib.h>
 #include <stdarg.h>  #include <stdarg.h>
 #include <string.h>  #include <string.h>
 #include <unistd.h>  
 #include <fcntl.h>  #include <fcntl.h>
 #include <sys/file.h>  
 #include <time.h>  #include <time.h>
   #if !defined(_MSC_VER)
   #include <unistd.h>
   #include <sys/file.h>
   #endif
   
   #include <mpfr.h>
   /* XXX : defined in mpfr-impl.h */
   #define MPFR_PREC(x)      ((x)->_mpfr_prec)
   #define MPFR_EXP(x)       ((x)->_mpfr_exp)
   #define MPFR_MANT(x)      ((x)->_mpfr_d)
   #define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS)
   #define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1)
   
   #if SIZEOF_LONG==4
   typedef long long L64;
   typedef unsigned long long UL64;
   #else
   typedef long L64;
   typedef unsigned long UL64;
   #endif
   
 #include "mysocket.h"  #include "mysocket.h"
 #include "ox_toolkit.h"  #include "ox_toolkit.h"
 #include "parse.h"  #include "parse.h"
Line 33  static cmo_zero*         receive_cmo_zero(OXFILE *oxfp
Line 51  static cmo_zero*         receive_cmo_zero(OXFILE *oxfp
 static cmo_dms_generic*  receive_cmo_dms_generic(OXFILE *oxfp);  static cmo_dms_generic*  receive_cmo_dms_generic(OXFILE *oxfp);
 static cmo_ring_by_name* receive_cmo_ring_by_name(OXFILE *oxfp);  static cmo_ring_by_name* receive_cmo_ring_by_name(OXFILE *oxfp);
 static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(OXFILE *oxfp);  static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(OXFILE *oxfp);
   static cmo_recursive_polynomial* receive_cmo_recursive_polynomial(OXFILE *oxfp);
   static cmo_polynomial_in_one_variable* receive_cmo_polynomial_in_one_variable(OXFILE *oxfp);
   static cmo_double*       receive_cmo_double(OXFILE *oxfp);
 static cmo_error2*       receive_cmo_error2(OXFILE *oxfp);  static cmo_error2*       receive_cmo_error2(OXFILE *oxfp);
   
 static int          send_cmo_null(OXFILE *oxfp, cmo_null* c);  static int          send_cmo_null(OXFILE *oxfp, cmo_null* c);
Line 41  static int          send_cmo_string(OXFILE *oxfp, cmo_
Line 62  static int          send_cmo_string(OXFILE *oxfp, cmo_
 static int          send_cmo_mathcap(OXFILE *oxfp, cmo_mathcap* c);  static int          send_cmo_mathcap(OXFILE *oxfp, cmo_mathcap* c);
 static int          send_cmo_list(OXFILE *oxfp, cmo_list* c);  static int          send_cmo_list(OXFILE *oxfp, cmo_list* c);
 static int          send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c);  static int          send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c);
   static int          send_cmo_double(OXFILE *oxfp, cmo_double* c);
 static int          send_cmo_error2(OXFILE *oxfp, cmo_error2* c);  static int          send_cmo_error2(OXFILE *oxfp, cmo_error2* c);
 static int          send_cmo_distributed_polynomial(OXFILE *oxfp, cmo_distributed_polynomial* c);  static int          send_cmo_distributed_polynomial(OXFILE *oxfp, cmo_distributed_polynomial* c);
   static int send_cmo_polynomial_in_one_variable(OXFILE *oxfp, cmo_polynomial_in_one_variable* c);
   static int send_cmo_recursive_polynomial(OXFILE *oxfp, cmo_recursive_polynomial* c);
   
 static cmo_zz*      receive_cmo_zz(OXFILE *oxfp);  static cmo_zz*      receive_cmo_zz(OXFILE *oxfp);
 static void         receive_mpz(OXFILE *oxfp, mpz_ptr mpz);  static void         receive_mpz(OXFILE *oxfp, mpz_ptr mpz);
 static int          send_cmo_zz(OXFILE *oxfp, cmo_zz* c);  static int          send_cmo_zz(OXFILE *oxfp, cmo_zz* c);
 static int          send_mpz(OXFILE *oxfp, mpz_ptr mpz);  static int          send_mpz(OXFILE *oxfp, mpz_ptr mpz);
   static void         receive_mpfr(OXFILE *oxfp, mpfr_ptr mpfr);
   static int          send_mpfr(OXFILE *oxfp, mpfr_ptr mpfr);
   
 /* hook functions. (yet not implemented) */  /* hook functions. (yet not implemented) */
 static hook_t hook_before_send_cmo = NULL;  static hook_t hook_before_send_cmo = NULL;
Line 112  int receive_int32(OXFILE *oxfp)
Line 138  int receive_int32(OXFILE *oxfp)
     return oxfp->receive_int32(oxfp);      return oxfp->receive_int32(oxfp);
 }  }
   
   /* sending an object of int32 type. (not equal to cmo_int32 type)  */
   int send_double(OXFILE *oxfp, double d)
   {
       return oxfp->send_double(oxfp, d);
   }
   
   /* receiving an object of int32 type. (not equal to cmo_int32 type)  */
   double receive_double(OXFILE *oxfp)
   {
       return oxfp->receive_double(oxfp);
   }
   
 /* receiving an (OX_tag, serial number)  */  /* receiving an (OX_tag, serial number)  */
 int receive_ox_tag(OXFILE *oxfp)  int receive_ox_tag(OXFILE *oxfp)
 {  {
Line 142  static cmo_int32* receive_cmo_int32(OXFILE *oxfp)
Line 180  static cmo_int32* receive_cmo_int32(OXFILE *oxfp)
 static cmo_string* receive_cmo_string(OXFILE *oxfp)  static cmo_string* receive_cmo_string(OXFILE *oxfp)
 {  {
     int len = receive_int32(oxfp);      int len = receive_int32(oxfp);
     char* s = malloc(len+1);      char* s = MALLOC(len+1);
     memset(s, '\0', len+1);      memset(s, '\0', len+1);
     if (len > 0) {      if (len > 0) {
         oxf_read(s, 1, len, oxfp);          oxf_read(s, 1, len, oxfp);
Line 190  static cmo_zz* receive_cmo_zz(OXFILE *oxfp)
Line 228  static cmo_zz* receive_cmo_zz(OXFILE *oxfp)
     return c;      return c;
 }  }
   
   static cmo_qq* receive_cmo_qq(OXFILE *oxfp)
   {
       mpz_t num, den;
       mpz_init(num);
       mpz_init(den);
       receive_mpz(oxfp, num);
       receive_mpz(oxfp, den);
       return new_cmo_qq_set_mpz(num, den);
   }
   
   static cmo_bf* receive_cmo_bf(OXFILE *oxfp)
   {
       mpfr_t num;
       mpfr_init(num);
       receive_mpfr(oxfp, num);
       return new_cmo_bf_set_mpfr(num);
   }
   
   static cmo_complex* receive_cmo_complex(OXFILE *oxfp)
   {
       cmo *re, *im;
   
       re = receive_cmo(oxfp);
       im = receive_cmo(oxfp);
       return new_cmo_complex_set_re_im(re,im);
   }
   
   
 static cmo_zero* receive_cmo_zero(OXFILE *oxfp)  static cmo_zero* receive_cmo_zero(OXFILE *oxfp)
 {  {
     return new_cmo_zero();      return new_cmo_zero();
Line 207  static cmo_ring_by_name* receive_cmo_ring_by_name(OXFI
Line 273  static cmo_ring_by_name* receive_cmo_ring_by_name(OXFI
     return new_cmo_ring_by_name(ob);      return new_cmo_ring_by_name(ob);
 }  }
   
   static cmo_recursive_polynomial* receive_cmo_recursive_polynomial(OXFILE *oxfp)
   {
           cmo_list* ringdef = (cmo_list *)receive_cmo(oxfp);
           cmo* coef         = receive_cmo(oxfp);
       return new_cmo_recursive_polynomial(ringdef, coef);
   }
   
 static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(OXFILE *oxfp)  static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(OXFILE *oxfp)
 {  {
     cmo* ob;      cmo* ob;
Line 222  static cmo_distributed_polynomial* receive_cmo_distrib
Line 295  static cmo_distributed_polynomial* receive_cmo_distrib
     return c;      return c;
 }  }
   
   static cmo_polynomial_in_one_variable* receive_cmo_polynomial_in_one_variable(OXFILE *oxfp)
   {
       cmo* coef;
       cmo_polynomial_in_one_variable* c;
       int len = receive_int32(oxfp);
       int var = receive_int32(oxfp);
       int exp;
       c = new_cmo_polynomial_in_one_variable(var);
       while (len>0) {
           exp  = receive_int32(oxfp);
           coef = receive_cmo(oxfp);
           list_append_monomial((cmo_list *)c, coef, exp);
           len--;
       }
       return c;
   }
   
   static cmo_double* receive_cmo_double(OXFILE *oxfp)
   {
           double d = receive_double(oxfp);
           return new_cmo_double(d);
   }
   
   static cmo_indeterminate* receive_cmo_indeterminate(OXFILE *oxfp)
   {
       cmo* ob = receive_cmo(oxfp);
       return new_cmo_indeterminate(ob);
   }
   
   static cmo_tree* receive_cmo_tree(OXFILE *oxfp)
   {
       cmo_string* name = (cmo_string *)receive_cmo(oxfp);
       cmo_list* attrib = (cmo_list *)receive_cmo(oxfp);
       cmo_list* leaves = (cmo_list *)receive_cmo(oxfp);
       return new_cmo_tree(name, attrib, leaves);
   }
   
   static cmo_lambda* receive_cmo_lambda(OXFILE *oxfp)
   {
       cmo_list* args = (cmo_list *)receive_cmo(oxfp);
       cmo_tree* body = (cmo_tree *)receive_cmo(oxfp);
       return new_cmo_lambda(args, body);
   }
   
 static cmo_error2* receive_cmo_error2(OXFILE *oxfp)  static cmo_error2* receive_cmo_error2(OXFILE *oxfp)
 {  {
     cmo* ob = receive_cmo(oxfp);      cmo* ob = receive_cmo(oxfp);
Line 231  static cmo_error2* receive_cmo_error2(OXFILE *oxfp)
Line 348  static cmo_error2* receive_cmo_error2(OXFILE *oxfp)
 /* receive_cmo() is called after receive_ox_tag(). */  /* receive_cmo() is called after receive_ox_tag(). */
 cmo* receive_cmo(OXFILE *oxfp)  cmo* receive_cmo(OXFILE *oxfp)
 {  {
     cmo* m;  
     int tag = receive_int32(oxfp);      int tag = receive_int32(oxfp);
       return receive_cmo_tag(oxfp, tag);
   }
   
   cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
   {
       cmo* m;
     switch(tag) {      switch(tag) {
     case CMO_NULL:      case CMO_NULL:
         m = receive_cmo_null(oxfp);          m = receive_cmo_null(oxfp);
Line 255  cmo* receive_cmo(OXFILE *oxfp)
Line 377  cmo* receive_cmo(OXFILE *oxfp)
     case CMO_ZZ:      case CMO_ZZ:
         m = (cmo *)receive_cmo_zz(oxfp);          m = (cmo *)receive_cmo_zz(oxfp);
         break;          break;
       case CMO_QQ:
           m = (cmo *)receive_cmo_qq(oxfp);
           break;
       case CMO_BIGFLOAT:
           m = (cmo *)receive_cmo_bf(oxfp);
           break;
       case CMO_COMPLEX:
           m = (cmo *)receive_cmo_complex(oxfp);
           break;
     case CMO_ZERO:      case CMO_ZERO:
         m = (cmo *)receive_cmo_zero(oxfp);          m = (cmo *)receive_cmo_zero(oxfp);
         break;          break;
Line 267  cmo* receive_cmo(OXFILE *oxfp)
Line 398  cmo* receive_cmo(OXFILE *oxfp)
     case CMO_DISTRIBUTED_POLYNOMIAL:      case CMO_DISTRIBUTED_POLYNOMIAL:
         m = (cmo *)receive_cmo_distributed_polynomial(oxfp);          m = (cmo *)receive_cmo_distributed_polynomial(oxfp);
         break;          break;
       case CMO_RECURSIVE_POLYNOMIAL:
           m = (cmo *)receive_cmo_recursive_polynomial(oxfp);
           break;
       case CMO_POLYNOMIAL_IN_ONE_VARIABLE:
           m = (cmo *)receive_cmo_polynomial_in_one_variable(oxfp);
           break;
           case CMO_64BIT_MACHINE_DOUBLE:
           case CMO_IEEE_DOUBLE_FLOAT:
           m = (cmo *)receive_cmo_double(oxfp);
           break;
       case CMO_INDETERMINATE:
           m = (cmo *)receive_cmo_indeterminate(oxfp);
           break;
       case CMO_TREE:
           m = (cmo *)receive_cmo_tree(oxfp);
           break;
       case CMO_LAMBDA:
           m = (cmo *)receive_cmo_lambda(oxfp);
           break;
     case CMO_ERROR2:      case CMO_ERROR2:
         m = (cmo *)receive_cmo_error2(oxfp);          m = (cmo *)receive_cmo_error2(oxfp);
         break;          break;
     case CMO_DATUM:      case CMO_DATUM:
     case CMO_QQ:  
     default:      default:
         m = NULL;          m = NULL;
         ox_printf("the CMO (%d) is not implemented.\n", tag);          ox_printf("the CMO (%d) is not implemented.\n", tag);
Line 282  cmo* receive_cmo(OXFILE *oxfp)
Line 431  cmo* receive_cmo(OXFILE *oxfp)
 static void receive_mpz(OXFILE *oxfp, mpz_ptr mpz)  static void receive_mpz(OXFILE *oxfp, mpz_ptr mpz)
 {  {
     int i;      int i;
       int n = sizeof(mpz->_mp_d[0]) / sizeof(int);
     int size  = receive_int32(oxfp);      int size  = receive_int32(oxfp);
     int len   = abs(size);      int len   = abs(size);
     resize_mpz(mpz, size);      int *ptr;
       if (n == 1) {
           resize_mpz(mpz, size);
       } else if (size >= 0) {
           resize_mpz(mpz, (size+1) / n);
       } else {
           resize_mpz(mpz, (size-1) / n);
       }
   
       ptr = (int *)mpz->_mp_d;
     for(i=0; i<len; i++) {      for(i=0; i<len; i++) {
         mpz->_mp_d[i] = receive_int32(oxfp);          ptr[i] = receive_int32(oxfp);
     }      }
 }  }
   
Line 462  static int send_cmo_distributed_polynomial(OXFILE *oxf
Line 620  static int send_cmo_distributed_polynomial(OXFILE *oxf
     return 0;      return 0;
 }  }
   
   static int send_cmo_polynomial_in_one_variable(OXFILE *oxfp, cmo_polynomial_in_one_variable* c)
   {
       cell* el = list_first((cmo_list *)c);
       int len = list_length((cmo_list *)c);
       send_int32(oxfp, len);
           send_int32(oxfp, c->var);
   
       while(!list_endof((cmo_list *)c, el)) {
           send_int32(oxfp, el->exp);
           send_cmo(oxfp, el->cmo);
           el = list_next(el);
       }
       return 0;
   }
   
   static int send_cmo_double(OXFILE *oxfp, cmo_double* c)
   {
       return send_double(oxfp, c->d);
   }
   
 static int send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c)  static int send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c)
 {  {
     int i;      int i;
Line 480  static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c)
Line 658  static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c)
     return 0;      return 0;
 }  }
   
   static int send_cmo_qq(OXFILE *oxfp, cmo_qq* c)
   {
       send_mpz(oxfp, mpq_numref(c->mpq));
       send_mpz(oxfp, mpq_denref(c->mpq));
       return 0;
   }
   
   static int send_cmo_bf(OXFILE *oxfp, cmo_bf* c)
   {
       send_mpfr(oxfp, c->mpfr);
       return 0;
   }
   
   static int send_cmo_complex(OXFILE *oxfp, cmo_complex* c)
   {
       send_cmo(oxfp, c->re);
       send_cmo(oxfp, c->im);
       return 0;
   }
   
   static int send_cmo_recursive_polynomial(OXFILE *oxfp, cmo_recursive_polynomial* c)
   {
           send_cmo(oxfp, (cmo *)c->ringdef);
       send_cmo(oxfp, c->coef);
       return 0;
   }
   
   static int send_cmo_tree(OXFILE *oxfp, cmo_tree *c)
   {
       send_cmo(oxfp, (cmo *)c->name);
       send_cmo(oxfp, (cmo *)c->attributes);
       send_cmo(oxfp, (cmo *)c->leaves);
       return 0;
   }
   
   static int send_cmo_lambda(OXFILE *oxfp, cmo_lambda *c)
   {
       send_cmo(oxfp, (cmo *)c->args);
       send_cmo(oxfp, (cmo *)c->body);
       return 0;
   }
   
 static int send_cmo_error2(OXFILE *oxfp, cmo_error2* c)  static int send_cmo_error2(OXFILE *oxfp, cmo_error2* c)
 {  {
     send_cmo(oxfp, c->ob);      send_cmo(oxfp, c->ob);
Line 521  void send_cmo(OXFILE *oxfp, cmo* c)
Line 741  void send_cmo(OXFILE *oxfp, cmo* c)
     case CMO_ZZ:      case CMO_ZZ:
         send_cmo_zz(oxfp, (cmo_zz *)c);          send_cmo_zz(oxfp, (cmo_zz *)c);
         break;          break;
       case CMO_QQ:
           send_cmo_qq(oxfp, (cmo_qq *)c);
           break;
       case CMO_BIGFLOAT:
           send_cmo_bf(oxfp, (cmo_bf *)c);
           break;
       case CMO_COMPLEX:
           send_cmo_complex(oxfp, (cmo_complex *)c);
           break;
     case CMO_DISTRIBUTED_POLYNOMIAL:      case CMO_DISTRIBUTED_POLYNOMIAL:
         send_cmo_distributed_polynomial(oxfp, (cmo_distributed_polynomial *)c);          send_cmo_distributed_polynomial(oxfp, (cmo_distributed_polynomial *)c);
         break;          break;
       case CMO_RECURSIVE_POLYNOMIAL:
           send_cmo_recursive_polynomial(oxfp, (cmo_recursive_polynomial *)c);
           break;
       case CMO_POLYNOMIAL_IN_ONE_VARIABLE:
           send_cmo_polynomial_in_one_variable(oxfp, (cmo_polynomial_in_one_variable *)c);
           break;
           case CMO_64BIT_MACHINE_DOUBLE:
           case CMO_IEEE_DOUBLE_FLOAT:
                   send_cmo_double(oxfp, (cmo_double *)c);
                   break;
       case CMO_TREE:
           send_cmo_tree(oxfp, (cmo_tree *)c);
           break;
       case CMO_LAMBDA:
           send_cmo_lambda(oxfp, (cmo_lambda *)c);
           break;
     default:      default:
         call_hook_after_send_cmo(oxfp, c);          call_hook_after_send_cmo(oxfp, c);
     }      }
Line 532  void send_cmo(OXFILE *oxfp, cmo* c)
Line 777  void send_cmo(OXFILE *oxfp, cmo* c)
 static int send_mpz(OXFILE *oxfp, mpz_ptr mpz)  static int send_mpz(OXFILE *oxfp, mpz_ptr mpz)
 {  {
     int i;      int i;
     int len = abs(mpz->_mp_size);          int n = sizeof(mpz->_mp_d[0]) / sizeof(int);
     send_int32(oxfp, mpz->_mp_size);      int len = abs(mpz->_mp_size) * n;
           int *ptr = (int *)mpz->_mp_d;
       int size;
       if (len > 0 && ptr[len-1] == 0) {
           len--;
       }
       size = mpz->_mp_size < 0 ? -len : len;
       send_int32(oxfp, size);
     for(i=0; i<len; i++) {      for(i=0; i<len; i++) {
         send_int32(oxfp, mpz->_mp_d[i]);          send_int32(oxfp, ptr[i]);
     }      }
     return 0;      return 0;
 }  }
   
   int send_int64(OXFILE *oxfp,UL64 a)
   {
     return oxfp->send_double(oxfp,((double *)&a)[0]);
   }
   
   UL64 receive_int64(OXFILE *oxfp)
   {
           double d = receive_double(oxfp);
     return ((UL64 *)&d)[0];
   }
   
   static void receive_mpfr(OXFILE *oxfp, mpfr_ptr mpfr)
   {
     int sgn,prec,len,i;
     unsigned int hi,lo;
     unsigned long *ptr;
     L64 exp;
   
     sgn  = receive_int32(oxfp);
     prec  = receive_int32(oxfp);
     exp = receive_int64(oxfp);
     /* len = length as an int array (int = 4bytes) */
     len  = receive_int32(oxfp);
   
     mpfr_init2(mpfr,prec);
     MPFR_SIGN(mpfr) = sgn;
     ptr = mpfr->_mpfr_d;
     mpfr->_mpfr_exp = exp;
   #if SIZEOF_LONG==4
     for ( i = 0; i < len; i++ )
       ptr[i] = receive_int32(oxfp);
   #else
     if ( len%2 ) {
       hi = receive_int32(oxfp);
       ptr[0] = (((UL64)hi)<<32);
           i = 1;
     } else
       i = 0;
     len = (len+1)/2;
     for ( ; i < len; i ++ ) {
       lo = (unsigned int)receive_int32(oxfp);
       hi = (unsigned int)receive_int32(oxfp);
       ptr[i] = (((UL64)hi)<<32)|((UL64)lo);
     }
   #endif
   }
   
   static int send_mpfr(OXFILE *oxfp, mpfr_ptr mpfr)
   {
   
     int i,len,t;
     unsigned long *ptr;
     UL64 uexp;
   
     send_int32(oxfp, MPFR_SIGN(mpfr));
     send_int32(oxfp, MPFR_PREC(mpfr));
     send_int64(oxfp, MPFR_EXP(mpfr));
     len = MPFR_LIMB_SIZE(mpfr);
     ptr = MPFR_MANT(mpfr);
   #if SIZEOF_LONG==4
     send_int32(oxfp, len);
     for ( i = 0; i < len; i++ )
       send_int32(oxfp,ptr[i]);
   #else /* SIZEOF_LONG==8 */
     t = (MPFR_PREC(mpfr)+31)/32;
     send_int32(oxfp, t);
     if ( t%2 ) {
           send_int32(oxfp,(unsigned int)(ptr[0]>>32));
       i = 1;
     } else
       i = 0;
     t = (t+1)/2;
     for ( ; i < len; i++ ) {
           send_int32(oxfp,(unsigned int)(ptr[i]&0xffffffff));
           send_int32(oxfp,(unsigned int)(ptr[i]>>32));
     }
   #endif
       return 0;
   }
   
 ox_data* new_ox_data(cmo* c)  ox_data* new_ox_data(cmo* c)
 {  {
     ox_data* m = malloc(sizeof(ox_data));      ox_data* m = MALLOC(sizeof(ox_data));
     m->tag = OX_DATA;      m->tag = OX_DATA;
     m->cmo = c;      m->cmo = c;
     return m;      return m;
Line 550  ox_data* new_ox_data(cmo* c)
Line 882  ox_data* new_ox_data(cmo* c)
   
 ox_command* new_ox_command(int sm_code)  ox_command* new_ox_command(int sm_code)
 {  {
     ox_command* m = malloc(sizeof(ox_command));      ox_command* m = MALLOC(sizeof(ox_command));
     m->tag = OX_COMMAND;      m->tag = OX_COMMAND;
     m->command = sm_code;      m->command = sm_code;
     return m;      return m;
Line 558  ox_command* new_ox_command(int sm_code)
Line 890  ox_command* new_ox_command(int sm_code)
   
 ox_sync_ball* new_ox_sync_ball()  ox_sync_ball* new_ox_sync_ball()
 {  {
     ox_sync_ball *m = malloc(sizeof(ox_sync_ball));      ox_sync_ball *m = MALLOC(sizeof(ox_sync_ball));
     m->tag = OX_SYNC_BALL;      m->tag = OX_SYNC_BALL;
     return m;      return m;
 }  }
Line 569  int ox_stderr_init(FILE *fp)
Line 901  int ox_stderr_init(FILE *fp)
     if (ox_stderr != NULL) {      if (ox_stderr != NULL) {
         setbuf(ox_stderr, NULL);          setbuf(ox_stderr, NULL);
     }      }
       return 0;
 }  }
   
 int ox_printf(char *format, ...)  int ox_printf(char *format, ...)
Line 578  int ox_printf(char *format, ...)
Line 911  int ox_printf(char *format, ...)
         va_start(ap, format);          va_start(ap, format);
         vfprintf(ox_stderr, format, ap);          vfprintf(ox_stderr, format, ap);
     }      }
       return 0;
 }  }
Legend:
Removed from v.1.23  
changed lines
  Added in v.1.45
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>