← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_wfile.c

  • Committer: Jay Pipes
  • Date: 2008-07-17 19:43:08 UTC
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: jay@mysql.com-20080717194308-l9i4ti57gikm2qbv
Phase 1 removal of DBUG in mysys

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_wfile.c
36
36
  register char * pos;
37
37
  char * buffer;
38
38
  WF_PACK *ret;
39
 
  DBUG_ENTER("wf_comp");
40
39
 
41
40
  not_pos= -1;                  /* Skip space and '!' in front */
42
41
  while (*str == ' ')
47
46
    while (*++str == ' ') {};
48
47
  }
49
48
  if (*str == 0)                                /* Empty == everything */
50
 
    DBUG_RETURN((WF_PACK *) NULL);
 
49
    return((WF_PACK *) NULL);
51
50
 
52
51
  ant=1;                                        /* Count filespecs */
53
52
  for (pos=str ; *pos ; pos++)
57
56
                                 sizeof(WF_PACK)+ (uint) strlen(str)+1,
58
57
                                 MYF(MY_WME)))
59
58
        == 0)
60
 
    DBUG_RETURN((WF_PACK *) NULL);
 
59
    return((WF_PACK *) NULL);
61
60
  ret->wild= (char **) (ret+1);
62
61
  buffer= (char *) (ret->wild+ant);
63
62
 
80
79
  else
81
80
    ret->not_pos=(uint) not_pos;
82
81
 
83
 
  DBUG_PRINT("exit",("antal: %d  not_pos: %d",ret->wilds,ret->not_pos));
84
 
  DBUG_RETURN(ret);
 
82
  return(ret);
85
83
} /* wf_comp */
86
84
 
87
85
 
91
89
{
92
90
  register uint i;
93
91
  register uint not_pos;
94
 
  DBUG_ENTER("wf_test");
95
92
 
96
93
  if (! wf_pack || wf_pack->wilds == 0)
97
 
    DBUG_RETURN(0);                     /* Everything goes */
 
94
    return(0);                  /* Everything goes */
98
95
 
99
96
  not_pos=wf_pack->not_pos;
100
97
  for (i=0 ; i < not_pos; i++)
101
98
    if (wild_compare(name,wf_pack->wild[i],0) == 0)
102
99
      goto found;
103
100
  if (i)
104
 
    DBUG_RETURN(1);                     /* No-match */
 
101
    return(1);                  /* No-match */
105
102
 
106
103
found:
107
104
/* Test that it isn't in not-list */
108
105
 
109
106
  for (i=not_pos ; i < wf_pack->wilds; i++)
110
107
    if (wild_compare(name,wf_pack->wild[i],0) == 0)
111
 
      DBUG_RETURN(1);
112
 
  DBUG_RETURN(0);
 
108
      return(1);
 
109
  return(0);
113
110
} /* wf_test */
114
111
 
115
112
 
117
114
 
118
115
void wf_end(WF_PACK *buffer)
119
116
{
120
 
  DBUG_ENTER("wf_end");
121
117
  if (buffer)
122
118
    my_free((uchar*) buffer,MYF(0));
123
 
  DBUG_VOID_RETURN;
 
119
  return;
124
120
} /* wf_end */