← 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-16 16:14:22 UTC
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: jay@mysql.com-20080716161422-fy1bl8o5q7m8kglq
Removed all DBUG symbols from heap storage engine

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