[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdemultimedia/kscd/libwm
From:       alex kern <alex.kern () gmx ! de>
Date:       2003-09-27 19:33:21
[Download RAW message or body]

CVS commit by kernalex: 

white space reorganisation


  M +35 -44    plat_linux.c   1.26


--- kdemultimedia/kscd/libwm/plat_linux.c  #1.25:1.26
@@ -129,5 +129,4 @@ wmcd_open( struct wm_drive *d )
 {
   int           fd;
-  static int    warned = 0;
   char vendor[32], model[32], rev[32];
   
@@ -136,6 +135,5 @@ wmcd_open( struct wm_drive *d )
     
   
-  if (d->fd >= 0)               /* Device already open? */
-    {
+  if (d->fd >= 0) { /* Device already open? */
 /*      wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_open(): [device is \
open (fd=%d)]\n", d->fd);*/  return (0);
@@ -144,8 +142,6 @@ wmcd_open( struct wm_drive *d )
   fd = open(d->cd_device, O_RDONLY | O_NONBLOCK);
 
-  if (fd < 0)
-    {
-      if (errno == EACCES)
-        {
+  if (fd < 0) {
+    if (errno == EACCES) {
           return -EACCES;
         }
@@ -154,9 +150,7 @@ wmcd_open( struct wm_drive *d )
        * ENOMEDIUM is returned by Kernel 2.2.x unified drivers.
        */
-      else if ((errno != ENXIO) && (errno != EIO) && (errno != ENOMEDIUM))
-        {
+    else if ((errno != ENXIO) && (errno != EIO) && (errno != ENOMEDIUM)) {
           return (-6);
         }
-      
       /* No CD in drive. */
       return 1;
@@ -171,6 +165,5 @@ wmcd_open( struct wm_drive *d )
 #if defined(BUILD_CDDA)
   if(d->cdda && gen_cdda_init(d)) {
-    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS,
-      "wmcd_open(): failed in gen_cdda_init\n");
+    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_open(): failed in \
gen_cdda_init\n");  gen_close(d);
     return -1;
@@ -519,6 +512,5 @@ gen_play(struct wm_drive *d, int start, 
   msf.cdmsf_frame1 = end % 75;
   
-  if (ioctl(d->fd, CDROMPLAYMSF, &msf))
-    {
+  if (ioctl(d->fd, CDROMPLAYMSF, &msf)) {
       if (ioctl(d->fd, CDROMSTART))
         return (-1);
@@ -589,6 +581,5 @@ gen_eject(struct wm_drive *d)
   wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "ejecting?\n");
 
-  if (fstat(d->fd, &stbuf) != 0)
-    {
+  if (fstat(d->fd, &stbuf) != 0) {
       wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "that weird fstat() \
thingy\n");  return (-2);


[prev in list] [next in list] [prev in thread] [next in thread]