~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_alloc.c

  • Committer: Brian Aker
  • Date: 2008-10-06 05:57:49 UTC
  • Revision ID: brian@tangent.org-20081006055749-svg700gciuqi0zu1
Remove all of uchar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
153
153
  {
154
154
    if (mem_root->error_handler)
155
155
      (*mem_root->error_handler)();
156
 
    return((uchar*) 0);                 /* purecov: inspected */
 
156
    return((unsigned char*) 0);                 /* purecov: inspected */
157
157
  }
158
158
  next->next= mem_root->used;
159
159
  next->size= length;
160
160
  mem_root->used= next;
161
 
  return((uchar*) (((char*) next)+ALIGN_SIZE(sizeof(USED_MEM))));
 
161
  return((unsigned char*) (((char*) next)+ALIGN_SIZE(sizeof(USED_MEM))));
162
162
#else
163
163
  size_t get_size, block_size;
164
 
  uchar* point;
 
164
  unsigned char* point;
165
165
  register USED_MEM *next= 0;
166
166
  register USED_MEM **prev;
167
167
  assert(alloc_root_inited(mem_root));
201
201
    *prev=next;
202
202
  }
203
203
 
204
 
  point= (uchar*) ((char*) next+ (next->size-next->left));
 
204
  point= (unsigned char*) ((char*) next+ (next->size-next->left));
205
205
  /*TODO: next part may be unneded due to mem_root->first_block_usage counter*/
206
206
  if ((next->left-= length) < mem_root->min_malloc)
207
207
  {                                             /* Full block */