claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove extraneous parameter on udf_opendir().

Browse Source
This commit is contained in:
rocky
2005-11-01 03:21:04 +00:00
parent 7de9d148bf
commit 00a3010210
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
example/udf1.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: udf1.c,v 1.14 2005/11/01 03:14:49 rocky Exp $ $Id: udf1.c,v 1.15 2005/11/01 03:21:04 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -76,7 +76,7 @@ list_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const char *psz_path)
if (udf_is_dir(p_udf_dirent)) { if (udf_is_dir(p_udf_dirent)) {
udf_dirent_t *p_udf_dirent2 = udf_opendir(p_udf, p_udf_dirent); udf_dirent_t *p_udf_dirent2 = udf_opendir(p_udf_dirent);
if (p_udf_dirent2) { if (p_udf_dirent2) {
const char *psz_dirname = udf_get_filename(p_udf_dirent); const char *psz_dirname = udf_get_filename(p_udf_dirent);
const unsigned int i_newlen=2 + strlen(psz_path) + strlen(psz_dirname); const unsigned int i_newlen=2 + strlen(psz_path) + strlen(psz_dirname);

4
include/cdio/udf_file.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: udf_file.h,v 1.2 2005/11/01 03:14:50 rocky Exp $ $Id: udf_file.h,v 1.3 2005/11/01 03:21:04 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@ extern "C" {
/*! /*!
Return the next subdirectory. Return the next subdirectory.
*/ */
udf_dirent_t *udf_opendir(udf_t *p_udf, const udf_dirent_t *p_udf_dirent); udf_dirent_t *udf_opendir(const udf_dirent_t *p_udf_dirent);
/*! /*!
Advances p_udf_direct to the the next directory entry in the Advances p_udf_direct to the the next directory entry in the

7
lib/udf/udf_fs.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: udf_fs.c,v 1.10 2005/11/01 03:14:50 rocky Exp $ $Id: udf_fs.c,v 1.11 2005/11/01 03:21:04 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -199,7 +199,7 @@ udf_ff_traverse(udf_t *p_udf, udf_dirent_t *p_udf_dirent, char *psz_token)
if (!next_tok) if (!next_tok)
return p_udf_dirent; /* found */ return p_udf_dirent; /* found */
else if (p_udf_dirent->b_dir) { else if (p_udf_dirent->b_dir) {
udf_dirent_t * p_udf_dirent2 = udf_opendir(p_udf, p_udf_dirent); udf_dirent_t * p_udf_dirent2 = udf_opendir(p_udf_dirent);
if (p_udf_dirent2) { if (p_udf_dirent2) {
udf_dirent_t * p_udf_dirent3 = udf_dirent_t * p_udf_dirent3 =
@@ -550,9 +550,10 @@ udf_close (udf_t *p_udf)
} }
udf_dirent_t * udf_dirent_t *
udf_opendir(udf_t *p_udf, const udf_dirent_t *p_udf_dirent) udf_opendir(const udf_dirent_t *p_udf_dirent)
{ {
if (p_udf_dirent->b_dir && !p_udf_dirent->b_parent && p_udf_dirent->fid) { if (p_udf_dirent->b_dir && !p_udf_dirent->b_parent && p_udf_dirent->fid) {
udf_t *p_udf = p_udf_dirent->p_udf;
uint8_t data[UDF_BLOCKSIZE]; uint8_t data[UDF_BLOCKSIZE];
udf_file_entry_t *p_udf_fe = (udf_file_entry_t *) &data; udf_file_entry_t *p_udf_fe = (udf_file_entry_t *) &data;