← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_format.c

  • Committer: Monty Taylor
  • Date: 2008-10-04 18:42:30 UTC
  • Revision ID: monty@inaugust.com-20081004184230-j2j1uottu2d0yl0m
Removed NullS. bu-bye.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_format.c
37
37
  if (length == 0 || (flag & MY_REPLACE_DIR))
38
38
  {
39
39
    /* Use given directory */
40
 
    convert_dirname(dev,dir,NullS);             /* Fix to this OS */
 
40
    convert_dirname(dev,dir,NULL);              /* Fix to this OS */
41
41
  }
42
42
  else if ((flag & MY_RELATIVE_PATH) && !test_if_hard_path(dev))
43
43
  {
44
44
    /* Put 'dir' before the given path */
45
45
    strmake(buff,dev,sizeof(buff)-1);
46
 
    pos=convert_dirname(dev,dir,NullS);
 
46
    pos=convert_dirname(dev,dir,NULL);
47
47
    strmake(pos,buff,sizeof(buff)-1- (int) (pos-dev));
48
48
  }
49
49
 
53
53
    (void) unpack_dirname(dev,dev);             /* Replace ~/.. with dir */
54
54
 
55
55
  if (!(flag & MY_APPEND_EXT) &&
56
 
      (pos= (char*) strchr(name,FN_EXTCHAR)) != NullS)
 
56
      (pos= (char*) strchr(name,FN_EXTCHAR)) != NULL)
57
57
  {
58
58
    if ((flag & MY_REPLACE_EXT) == 0)           /* If we should keep old ext */
59
59
    {
77
77
    /* To long path, return original or NULL */
78
78
    size_t tmp_length;
79
79
    if (flag & MY_SAFE_PATH)
80
 
      return NullS;
 
80
      return NULL;
81
81
    tmp_length= strlength(startpos);
82
82
    (void) strmake(to,startpos,cmin(tmp_length,FN_REFLEN-1));
83
83
  }