Changeset 5105:7944090a279a in roaraudio


Ignore:
Timestamp:
07/25/11 01:50:35 (13 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

comply with coding styles

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roard/driver_sndio.c

    r5012 r5105  
    4444} 
    4545 
    46 #define er() if ( self->shandle ) sio_close(self->shandle);   \ 
    47              if ( self->mhandle ) mio_close(self->mhandle);   \ 
    48              if ( self->device ) roar_mm_free(self->device); \ 
    49              roar_mm_free(self);                              \ 
    50              return -1 
     46#define _err() if ( self->shandle != NULL ) sio_close(self->shandle);   \ 
     47               if ( self->mhandle != NULL ) mio_close(self->mhandle);   \ 
     48               if ( self->device  != NULL ) roar_mm_free(self->device); \ 
     49               roar_mm_free(self);                              \ 
     50               return -1 
    5151 
    5252int driver_sndio_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 
     
    8181    break; 
    8282   default: 
    83      er(); 
     83     _err(); 
    8484  } 
    8585 } 
     
    9090 if ( driver_sndio_init_vio(inst, self) == -1 ) { 
    9191  ROAR_ERR("driver_sndio_open(*): Can not init vio interface"); 
    92   er(); 
     92  _err(); 
    9393 } 
    9494 
    9595 if ( driver_sndio_open_device(self) == -1 ) { 
    9696  ROAR_ERR("driver_sndio_open(*): Can not open audio device"); 
    97   er(); 
     97  _err(); 
    9898 } 
    9999 
Note: See TracChangeset for help on using the changeset viewer.