← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_arr_appstr.c

  • Committer: Jay Pipes
  • Date: 2008-07-17 17:54:00 UTC
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: jay@mysql.com-20080717175400-xm2aazihjra8mdzq
Removal of DBUG from libdrizzle/ - Round 2

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_arr_appstr.c
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
#include "mysys_priv.h"
17
 
#include <mystrings/m_string.h>                           /* strcmp() */
 
17
#include <m_string.h>                           /* strcmp() */
18
18
 
19
19
 
20
20
/**
36
36
  const char **p;
37
37
  /* end points at the terminating NULL element */
38
38
  const char **end= array + size - 1;
39
 
  assert(*end == NULL);
 
39
  DBUG_ASSERT(*end == NULL);
40
40
 
41
41
  for (p= array; *p; ++p)
42
42
  {
46
46
  if (p >= end)
47
47
    return true;                               /* Array is full */
48
48
 
49
 
  assert(*p == NULL || strcmp(*p, str) == 0);
 
49
  DBUG_ASSERT(*p == NULL || strcmp(*p, str) == 0);
50
50
 
51
51
  while (*(p + 1))
52
52
  {
54
54
    ++p;
55
55
  }
56
56
 
57
 
  assert(p < end);
 
57
  DBUG_ASSERT(p < end);
58
58
  *p= str;
59
59
 
60
60
  return false;                                 /* Success */