[BACK]Return to str.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / engine

Diff for /OpenXM_contrib2/asir2000/engine/str.c between version 1.2 and 1.5

version 1.2, 2000/08/21 08:31:28 version 1.5, 2004/02/26 07:06:32
Line 23 
Line 23 
  * shall be made on your publication or presentation in any form of the   * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.   * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by   * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
  * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification   * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the   * for such modification or the source code of the modified part of the
  * SOFTWARE.   * SOFTWARE.
  *   *
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/engine/str.c,v 1.1.1.1 1999/12/03 07:39:08 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/engine/str.c,v 1.4 2000/11/08 08:02:49 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
   
Line 56  STRING *c;
Line 56  STRING *c;
 {  {
         char *buf;          char *buf;
   
         buf = (char *)MALLOC(strlen(BDY(a))+strlen(BDY(b))+1);          buf = (char *)MALLOC_ATOMIC(strlen(BDY(a))+strlen(BDY(b))+1);
         sprintf(buf,"%s%s",BDY(a),BDY(b));          sprintf(buf,"%s%s",BDY(a),BDY(b));
         MKSTR(*c,buf);          MKSTR(*c,buf);
 }  }
Line 66  VL vl;
Line 66  VL vl;
 STRING a,b;  STRING a,b;
 {  {
         return a ? (b?strcmp(BDY(a),BDY(b)):1) : (b?-1:0);          return a ? (b?strcmp(BDY(a),BDY(b)):1) : (b?-1:0);
   }
   
   /* primitive functions for BYTEARRAY */
   
   int compbytearray(vl,a,b)
   VL vl;
   BYTEARRAY a,b;
   {
           int i;
   
           if ( !a )
                   if ( b )
                           return -1;
                   else
                           return 0;
           else if ( !b )
                   return 1;
           else if ( a->len > b->len )
                   return 1;
           else if ( a->len < b->len )
                   return -1;
           else {
                   for ( i = 0; i < a->len; i++ )
                           if ( a->body[i] > b->body[i] )
                                   return 1;
                           else if ( a->body[i] < b->body[i] )
                                   return -1;
                   return 0;
           }
 }  }
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.5
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>