Correct spelling of __VA_ARGS__ macro

CVS patchset: 1324
CVS date: 2002/01/02 18:16:07

8 files changed, 25 insertions, 25 deletions

diff --git a/src/input/input_cda.c b/src/input/input_cda.c
index 1ac7de2d4..9034921bb 100644
--- a/src/input/input_cda.c
+++ b/src/input/input_cda.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_cda.c,v 1.13 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: input_cda.c,v 1.14 2002/01/02 18:16:07 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -96,11 +96,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
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
diff --git a/src/input/input_file.c b/src/input/input_file.c
index d06833df0..b794fbbbc 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.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_file.c,v 1.36 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: input_file.c,v 1.37 2002/01/02 18:16:07 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -54,11 +54,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
diff --git a/src/input/input_http.c b/src/input/input_http.c
index cb5cfae38..9193bc5f6 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -53,11 +53,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
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 682a4b784..2bbd85242 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -58,11 +58,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
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 9ca25cd0e..0e8c4bb5f 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -97,11 +97,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
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 0db8e609e..aa5e3627d 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.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_stdin_fifo.c,v 1.18 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: input_stdin_fifo.c,v 1.19 2002/01/02 18:16:07 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -53,11 +53,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
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index e86d8b57d..347b50f79 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.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_vcd.c,v 1.34 2001/12/27 14:30:30 f1rmb Exp $
+ * $Id: input_vcd.c,v 1.35 2002/01/02 18:16:07 jkeil Exp $
  *
  */
 
@@ -64,11 +64,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