← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_lib.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/my_lib.c
60
60
 
61
61
void my_dirend(MY_DIR *buffer)
62
62
{
63
 
  DBUG_ENTER("my_dirend");
64
63
  if (buffer)
65
64
  {
66
65
    delete_dynamic((DYNAMIC_ARRAY*)((char*)buffer + 
69
68
                          ALIGN_SIZE(sizeof(DYNAMIC_ARRAY))), MYF(0));
70
69
    my_free((uchar*) buffer,MYF(0));
71
70
  }
72
 
  DBUG_VOID_RETURN;
 
71
  return;
73
72
} /* my_dirend */
74
73
 
75
74
 
92
91
  struct dirent *dp;
93
92
  char          tmp_path[FN_REFLEN+1],*tmp_file;
94
93
  char  dirent_tmp[sizeof(struct dirent)+_POSIX_PATH_MAX+1];
95
 
  DBUG_ENTER("my_dir");
96
 
  DBUG_PRINT("my",("path: '%s' MyFlags: %d",path,MyFlags));
97
94
 
98
95
#if !defined(HAVE_READDIR_R)
99
96
  pthread_mutex_lock(&THR_LOCK_open);
159
156
  if (!(MyFlags & MY_DONT_SORT))
160
157
    my_qsort((void *) result->dir_entry, result->number_off_files,
161
158
          sizeof(FILEINFO), (qsort_cmp) comp_names);
162
 
  DBUG_RETURN(result);
 
159
  return(result);
163
160
 
164
161
 error:
165
162
#if !defined(HAVE_READDIR_R)
171
168
  my_dirend(result);
172
169
  if (MyFlags & (MY_FAE | MY_WME))
173
170
    my_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,my_errno);
174
 
  DBUG_RETURN((MY_DIR *) NULL);
 
171
  return((MY_DIR *) NULL);
175
172
} /* my_dir */
176
173
 
177
174