← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mulalloc.c

  • Committer: Mark Atwood
  • Date: 2008-10-17 20:35:11 UTC
  • mto: (520.1.13 drizzle)
  • mto: This revision was merged to the branch mainline in revision 530.
  • Revision ID: mark@fallenpegasus.com-20081017203511-q1s2pruvxf6d7it2
fixes as per MontyT's comments, prep for internationalization

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mulalloc.c
36
36
  va_list args;
37
37
  char **ptr,*start,*res;
38
38
  size_t tot_length,length;
39
 
  DBUG_ENTER("my_multi_malloc");
40
39
 
41
40
  va_start(args,myFlags);
42
41
  tot_length=0;
48
47
  va_end(args);
49
48
 
50
49
  if (!(start=(char *) my_malloc(tot_length,myFlags)))
51
 
    DBUG_RETURN(0); /* purecov: inspected */
 
50
    return(0); /* purecov: inspected */
52
51
 
53
52
  va_start(args,myFlags);
54
53
  res=start;
59
58
    res+=ALIGN_SIZE(length);
60
59
  }
61
60
  va_end(args);
62
 
  DBUG_RETURN((void*) start);
 
61
  return((void*) start);
63
62
}