cdio_driver_return_code_to_str -> cdio_driver_errmsg

This commit is contained in:
rocky
2006-02-02 04:37:29 +00:00
parent 6d539596b8
commit d25c11fbb8
5 changed files with 10 additions and 12 deletions

View File

@@ -1,5 +1,5 @@
/*
$Id: udf2.c,v 1.2 2005/11/04 08:15:18 rocky Exp $
$Id: udf2.c,v 1.3 2006/02/02 04:37:29 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -96,8 +96,8 @@ main(int argc, const char *argv[])
return 1;
} else {
udf_dirent_t *p_udf_root = udf_get_root(p_udf, true, 0);
udf_dirent_t *p_udf_file;
if (NULL == p_udf_file) {
udf_dirent_t *p_udf_file = NULL;
if (NULL == p_udf_root) {
fprintf(stderr, "Sorry, couldn't find / in %s\n",
psz_udf_image);
return 1;
@@ -105,13 +105,11 @@ main(int argc, const char *argv[])
p_udf_file = udf_fopen(p_udf_root, psz_udf_fname);
print_file_info(p_udf_file, udf_get_filename(p_udf_file));
#if 0
{
char buf[2048];
udf_read_block(p_udf_file, buf, 1);
printf("%s", buf);
}
#endif
udf_dirent_free(p_udf_file);
udf_dirent_free(p_udf_root);
}

View File

@@ -1,5 +1,5 @@
/* -*- C++ -*-
$Id: cdio.hpp,v 1.7 2006/01/25 07:21:52 rocky Exp $
$Id: cdio.hpp,v 1.8 2006/02/02 04:37:29 rocky Exp $
Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
@@ -49,7 +49,7 @@ public:
return driver_return_code;
};
const char *get_msg(void) {
return cdio_driver_return_code_to_str(driver_return_code);
return cdio_driver_errmsg(driver_return_code);
};
};

View File

@@ -1,5 +1,5 @@
/* -*- c -*-
$Id: device.h,v 1.31 2006/01/21 12:02:55 rocky Exp $
$Id: device.h,v 1.32 2006/02/02 04:37:29 rocky Exp $
Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
@@ -239,7 +239,7 @@ extern "C" {
@param drc the return code you want interpreted.
@return the string information about drc
*/
const char *cdio_driver_return_code_to_str(driver_return_code_t drc);
const char *cdio_driver_errmsg(driver_return_code_t drc);
/*!
Eject media in CD drive if there is a routine to do so.

View File

@@ -1,5 +1,5 @@
/*
$Id: device.c,v 1.32 2006/02/01 00:45:45 rocky Exp $
$Id: device.c,v 1.33 2006/02/02 04:37:29 rocky Exp $
Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
@@ -243,7 +243,7 @@ CdIo_driver_t CdIo_all_drivers[CDIO_MAX_DRIVER+1] = {
};
const char *
cdio_driver_return_code_to_str(driver_return_code_t drc)
cdio_driver_errmsg(driver_return_code_t drc)
{
switch(drc) {
case DRIVER_OP_SUCCESS:

View File

@@ -27,7 +27,7 @@ cdio_close_tray
cdio_debug
cdio_destroy
cdio_driver_describe
cdio_driver_return_code_to_str
cdio_driver_errmsg
cdio_eject_media
cdio_eject_media_drive
cdio_error