Diff of /lib/driver/osx.c [e74fc3] .. [16bdbf]  Maximize  Restore

Switch to unified view

a/lib/driver/osx.c b/lib/driver/osx.c
1
/*
1
/*
2
    $Id: osx.c,v 1.4 2005/09/30 00:01:09 rocky Exp $
2
    $Id: osx.c,v 1.5 2005/10/05 09:48:12 rocky Exp $
3
3
4
    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> 
4
    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> 
5
    from vcdimager code: 
5
    from vcdimager code: 
6
    Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
6
    Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
7
    and VideoLAN code Copyright (C) 1998-2001 VideoLAN
7
    and VideoLAN code Copyright (C) 1998-2001 VideoLAN
...
...
32

32

33
#ifdef HAVE_CONFIG_H
33
#ifdef HAVE_CONFIG_H
34
#include "config.h"
34
#include "config.h"
35
#endif
35
#endif
36
36
37
static const char _rcsid[] = "$Id: osx.c,v 1.4 2005/09/30 00:01:09 rocky Exp $";
37
static const char _rcsid[] = "$Id: osx.c,v 1.5 2005/10/05 09:48:12 rocky Exp $";
38
38
39
#include <cdio/logging.h>
39
#include <cdio/logging.h>
40
#include <cdio/sector.h>
40
#include <cdio/sector.h>
41
#include <cdio/util.h>
41
#include <cdio/util.h>
42
42
...
...
1625
      if( CFStringGetCString( str_bsd_path,
1625
      if( CFStringGetCString( str_bsd_path,
1626
                  (char*)&psz_buf + dev_path_length,
1626
                  (char*)&psz_buf + dev_path_length,
1627
                  sizeof(psz_buf) - dev_path_length,
1627
                  sizeof(psz_buf) - dev_path_length,
1628
                  kCFStringEncodingASCII ) )
1628
                  kCFStringEncodingASCII ) )
1629
        {
1629
        {
1630
        CFRelease( str_bsd_path );
1631
        IOObjectRelease( next_media );
1632
        IOObjectRelease( media_iterator );
1633
          cdio_add_device_list(&drives, strdup(psz_buf), &num_drives);
1630
          cdio_add_device_list(&drives, strdup(psz_buf), &num_drives);
1634
        }
1631
        }
1635
    else 
1636
      {
1637
          CFRelease( str_bsd_path );
1632
      CFRelease( str_bsd_path );
1638
      }
1639
      IOObjectRelease( next_media );
1633
      IOObjectRelease( next_media );
1640
      
1634
      
1641
    } while( ( next_media = IOIteratorNext( media_iterator ) ) != 0 );
1635
    } while( ( next_media = IOIteratorNext( media_iterator ) ) != 0 );
1642
    }
1636
    }
1643
  IOObjectRelease( media_iterator );
1637
  IOObjectRelease( media_iterator );