diff options
| author | Juergen Keil <jkeil@users.sourceforge.net> | 2002-01-02 18:16:07 +0000 |
|---|---|---|
| committer | Juergen Keil <jkeil@users.sourceforge.net> | 2002-01-02 18:16:07 +0000 |
| commit | 11b26a83b403b3f3661aa59cfc5c3f2c1a7e1705 (patch) | |
| tree | 1bb9fc098e4b2ba6e7d66a793b7491d057cdf2e8 /src/input/input_dvd.c | |
| parent | 671368008941ee43f9e541477eef8530ded71654 (diff) | |
| download | xine-lib-11b26a83b403b3f3661aa59cfc5c3f2c1a7e1705.tar.gz xine-lib-11b26a83b403b3f3661aa59cfc5c3f2c1a7e1705.tar.bz2 | |
Correct spelling of __VA_ARGS__ macro
CVS patchset: 1324
CVS date: 2002/01/02 18:16:07
Diffstat (limited to 'src/input/input_dvd.c')
| -rw-r--r-- | src/input/input_dvd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 2edd6992f..7f5b1cc63 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.41 2001/12/27 14:30:30 f1rmb Exp $ + * $Id: input_dvd.c,v 1.42 2002/01/02 18:16:07 jkeil Exp $ */ #ifdef HAVE_CONFIG_H @@ -65,11 +65,11 @@ extern int errno; } #else #define LOG_MSG_STDERR(xine, ...) { \ - xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__); \ + xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__); \ fprintf(stderr, __VA_ARGS__); \ } #define LOG_MSG(xine, ...) { \ - xine_log(xine, XINE_LOG_INPUT, __VAR_ARGS__); \ + xine_log(xine, XINE_LOG_INPUT, __VA_ARGS__); \ printf(__VA_ARGS__); \ } #endif @@ -215,7 +215,7 @@ typedef union { * Read DVD "Copyright Structure" from DVD Drive */ static int -dvd_read_copyright(int fd, dvd_struct *s) +dvd_read_copyright(dvd_input_plugin_t *this, dvd_struct *s) { struct uscsi_cmd sc; union scsi_cdb rs_cdb; @@ -238,7 +238,7 @@ dvd_read_copyright(int fd, dvd_struct *s) memset(buf, 0, sizeof(buf)); - if (ioctl(fd, USCSICMD, &sc)) { + if (ioctl(this->raw_fd, USCSICMD, &sc)) { LOG_MSG(this->xine, _("USCSICMD dvd_read_copyright: %s"), strerror(errno)); return -1; } @@ -333,10 +333,10 @@ static int openDVDFile (dvd_input_plugin_t *this, dvd.copyright.type = DVD_STRUCT_COPYRIGHT; dvd.copyright.layer_num = 0; - if (dvd_read_copyright(this->raw_fd, &dvd) < 0) + if (dvd_read_copyright(this, &dvd) < 0) { LOG_MSG(this->xine, _("input_dvd: Could not read Copyright Structure.\n" " Assuming disk is not encrypted.\n")); - else + } else encrypted = (dvd.copyright.cpst != 0); } #endif |