Differences From Artifact [a64978791f]:

• File src/bag.c — part of check-in [c06edd231f] at 2010-05-16 19:08:45 on branch clear-title — Change from GPL to the Simplified BSD License. (user: drh size: 5292)

To Artifact [8cafeaba3c]:

• File src/bag.c — part of check-in [8f41b2fa75] at 2010-10-15 17:13:17 on branch trunk — Replace all malloc() calls with fossil_malloc(). The fossil_malloc() routine panics rather than return a NULL pointer. (user: drh size: 5299) [more...]

84
85
86
87
88
89
90
91
92
93
94
95
96
97
98

  int i;
  Bag old;
  int nDel = 0;   /* Number of deleted entries */
  int nLive = 0;  /* Number of live entries */

  old = *p;
  assert( newSize>old.cnt );
  p->a = malloc( sizeof(p->a[0])*newSize );
  p->sz = newSize;
  memset(p->a, 0, sizeof(p->a[0])*newSize );
  for(i=0; i<old.sz; i++){
    int e = old.a[i];
    if( e>0 ){
      unsigned h = bag_hash(e)%newSize;
      while( p->a[h] ){

|

84
85
86
87
88
89
90
91
92
93
94
95
96
97
98

  int i;
  Bag old;
  int nDel = 0;   /* Number of deleted entries */
  int nLive = 0;  /* Number of live entries */

  old = *p;
  assert( newSize>old.cnt );
  p->a = fossil_malloc( sizeof(p->a[0])*newSize );
  p->sz = newSize;
  memset(p->a, 0, sizeof(p->a[0])*newSize );
  for(i=0; i<old.sz; i++){
    int e = old.a[i];
    if( e>0 ){
      unsigned h = bag_hash(e)%newSize;
      while( p->a[h] ){