Changeset 4260:73d7bdb1a9c5 in roaraudio

Timestamp:

08/27/10 04:41:26 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

better NULL checking

File:

• libroar/vs.c (modified) (15 diffs)

libroar/vs.c

@@ -45 +45 @@
 #define _seterrre() do { _seterr(roar_errno); } while(0)
 #define _seterrse() do { roar_err_from_errno(); _seterr(roar_errno); } while(0)
+#define _ckvss(ret) do { if ( vss == NULL ) { _seterr(ROAR_ERROR_INVAL); return (ret); } } while(0)
 
 struct roar_vs {
@@ -143 +144 @@
  int ret;
 
+ _ckvss(-1);
+
  if ( vss->flags & FLAG_STREAM ) {
   _seterr(ROAR_ERROR_INVAL);
@@ -203 +206 @@
  }
 
+ _ckvss(-1);
+
  if ( vss->flags & FLAG_STREAM ) {
   if ( killit == ROAR_VS_TRUE ) {
@@ -221 +226 @@
 ssize_t roar_vs_write(roar_vs_t * vss, const void * buf, size_t len, int * error) {
  ssize_t ret;
+
+ _ckvss(-1);
 
  if ( !(vss->flags & FLAG_STREAM) ) {
@@ -253 +260 @@
  ssize_t ret;
 
+ _ckvss(-1);
+
  if ( !(vss->flags & FLAG_STREAM) ) {
   _seterr(ROAR_ERROR_INVAL);
@@ -272 +281 @@
 
 int     roar_vs_sync (roar_vs_t * vss, int wait, int * error) {
+ _ckvss(-1);
+
  if ( !(vss->flags & FLAG_STREAM) ) {
   _seterr(ROAR_ERROR_INVAL);
@@ -294 +305 @@
 int     roar_vs_blocking (roar_vs_t * vss, int val, int * error) {
  int old = -1;
+
+ _ckvss(-1);
 
   if ( !(vss->flags & FLAG_STREAM) ) {
@@ -380 +393 @@
  size_t offset;
 
+ _ckvss(-1);
+
  if ( !(vss->flags & FLAG_STREAM) ) {
   _seterr(ROAR_ERROR_INVAL);
@@ -434 +449 @@
  _initerr();
 
+ _ckvss(-1);
+
  if (pos == -1) {
   _seterrre();
@@ -479 +496 @@
  struct roar_stream_info info;
  int old = -1;
+
+ _ckvss(-1);
 
  if ( !(vss->flags & FLAG_STREAM) ) {
@@ -530 +549 @@
  int oldchannels;
  int handled;
+
+ _ckvss(-1);
 
  if ( !(vss->flags & FLAG_STREAM) ) {
@@ -652 +673 @@
  int ret = 0;
 
+ _ckvss(-1);
+
  if ( !(vss->flags & FLAG_STREAM) ) {
   _seterr(ROAR_ERROR_INVAL);
@@ -691 +714 @@
 
 int     roar_vs_role          (roar_vs_t * vss, int role, int * error) {
+ _ckvss(-1);
+
  if ( !(vss->flags & FLAG_STREAM) ) {
   _seterr(ROAR_ERROR_INVAL);
@@ -707 +732 @@
 
 struct roar_connection * roar_vs_connection_obj(roar_vs_t * vss, int * error) {
+ _ckvss(NULL);
+
  return vss->con;
 }
 
 struct roar_stream     * roar_vs_stream_obj    (roar_vs_t * vss, int * error) {
+ _ckvss(NULL);
+
  if ( !(vss->flags & FLAG_STREAM) ) {
   _seterr(ROAR_ERROR_INVAL);
@@ -720 +749 @@
 
 struct roar_vio_calls  * roar_vs_vio_obj       (roar_vs_t * vss, int * error) {
+ _ckvss(NULL);
+
  if ( !(vss->flags & FLAG_STREAM) ) {
   _seterr(ROAR_ERROR_INVAL);