← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_pack.c

  • Committer: Jay Pipes
  • Date: 2008-07-17 21:23:43 UTC
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: jay@mysql.com-20080717212343-242tb1p1vd93fcp0
Phase 8 - Remove DBUG from mysys

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_pack.c
37
37
  size_t d_length,length,buff_length= 0;
38
38
  char * start;
39
39
  char buff[FN_REFLEN];
40
 
  DBUG_ENTER("pack_dirname");
41
40
 
42
41
  (void) intern_filename(to,from);              /* Change to intern name */
43
42
 
101
100
      }
102
101
    }
103
102
  }
104
 
  DBUG_PRINT("exit",("to: '%s'",to));
105
 
  DBUG_VOID_RETURN;
 
103
  return;
106
104
} /* pack_dirname */
107
105
 
108
106
 
137
135
#ifdef BACKSLASH_MBTAIL
138
136
  CHARSET_INFO *fs= fs_character_set();
139
137
#endif
140
 
  DBUG_ENTER("cleanup_dirname");
141
 
  DBUG_PRINT("enter",("from: '%s'",from));
142
138
 
143
139
  start=buff;
144
140
  from_ptr=(char *) from;
227
223
    }
228
224
  }
229
225
  (void) strmov(to,buff);
230
 
  DBUG_PRINT("exit",("to: '%s'",to));
231
 
  DBUG_RETURN((size_t) (pos-buff));
 
226
  return((size_t) (pos-buff));
232
227
} /* cleanup_dirname */
233
228
 
234
229
 
300
295
{
301
296
  size_t length, h_length;
302
297
  char buff[FN_REFLEN+1+4],*suffix,*tilde_expansion;
303
 
  DBUG_ENTER("unpack_dirname");
304
298
 
305
299
  (void) intern_filename(buff,from);        /* Change to intern name */
306
300
  length= strlen(buff);                     /* Fix that '/' is last */
337
331
  if (my_use_symdir)
338
332
    symdirget(buff);
339
333
#endif
340
 
  DBUG_RETURN(system_filename(to,buff));        /* Fix for open */
 
334
  return(system_filename(to,buff));     /* Fix for open */
341
335
} /* unpack_dirname */
342
336
 
343
337
 
391
385
{
392
386
  size_t length, n_length, buff_length;
393
387
  char buff[FN_REFLEN];
394
 
  DBUG_ENTER("unpack_filename");
395
388
 
396
389
  length=dirname_part(buff, from, &buff_length);/* copy & convert dirname */
397
390
  n_length=unpack_dirname(buff,buff);
402
395
  }
403
396
  else
404
397
    length= system_filename(to,from);           /* Fix to usably filename */
405
 
  DBUG_RETURN(length);
 
398
  return(length);
406
399
} /* unpack_filename */
407
400
 
408
401
 
427
420
  size_t length;
428
421
  char * to_pos,from_pos,pos;
429
422
  char buff[FN_REFLEN];
430
 
  DBUG_ENTER("system_filename");
431
423
 
432
424
  libchar_found=0;
433
425
  (void) strmov(buff,from);                      /* If to == from */
472
464
    *(to_pos++)=FN_C_AFTER_DIR;
473
465
  }
474
466
  length= (size_t) (strmov(to_pos,from_pos)-to);
475
 
  DBUG_PRINT("exit",("name: '%s'",to));
476
 
  DBUG_RETURN(length);
 
467
  return(length);
477
468
#endif
478
469
} /* system_filename */
479
470