From 62d49b41f576dbf591c8c6f1337c2da3cfd3fc6b Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Tue, 3 Aug 2004 12:45:40 +0000
Subject: [PATCH] Initialization bugs.

---
 lib/FreeBSD/freebsd.c | 8 +++++---
 lib/MSWindows/win32.c | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/FreeBSD/freebsd.c b/lib/FreeBSD/freebsd.c
index 6946a193..af042192 100644
--- a/lib/FreeBSD/freebsd.c
+++ b/lib/FreeBSD/freebsd.c
@@ -1,5 +1,5 @@
 /*
-    $Id: freebsd.c,v 1.34 2004/08/01 11:28:00 rocky Exp $
+    $Id: freebsd.c,v 1.35 2004/08/03 12:45:40 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: freebsd.c,v 1.34 2004/08/01 11:28:00 rocky Exp $";
+static const char _rcsid[] = "$Id: freebsd.c,v 1.35 2004/08/03 12:45:40 rocky Exp $";
 
 #include "freebsd.h"
 
@@ -186,8 +186,9 @@ _set_arg_freebsd (void *user_data, const char key[], const char value[])
   Return false if unsuccessful;
 */
 static bool
-read_toc_freebsd (_img_private_t *p_env) 
+read_toc_freebsd (void *p_user_data) 
 {
+  _img_private_t *p_env = p_user_data;
   track_t i, j;
 
   /* read TOC header */
@@ -567,6 +568,7 @@ cdio_open_am_freebsd (const char *psz_orig_source_name,
     .read_audio_sectors = _read_audio_sectors_freebsd,
     .read_mode2_sector  = _read_mode2_sector_freebsd,
     .read_mode2_sectors = _read_mode2_sectors_freebsd,
+    .read_toc           = read_toc_freebsd,
     .run_scsi_mmc_cmd   = run_scsi_cmd_freebsd,
     .set_arg            = _set_arg_freebsd,
     .stat_size          = _stat_size_freebsd
diff --git a/lib/MSWindows/win32.c b/lib/MSWindows/win32.c
index 8223d84e..d5aa6417 100644
--- a/lib/MSWindows/win32.c
+++ b/lib/MSWindows/win32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32.c,v 1.36 2004/07/29 04:14:44 rocky Exp $
+    $Id: win32.c,v 1.37 2004/08/03 12:45:40 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: win32.c,v 1.36 2004/07/29 04:14:44 rocky Exp $";
+static const char _rcsid[] = "$Id: win32.c,v 1.37 2004/08/03 12:45:40 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -410,7 +410,7 @@ set_arg_win32 (void *user_data, const char key[], const char value[])
 static bool
 read_toc_win32 (void *p_user_data) 
 {
-  _img_private_t *p_env;
+  _img_private_t *p_env = p_user_data;
   bool ret;
   if( p_env->hASPI ) {
     ret = read_toc_aspi( p_env );