Changeset 4873:98d17d4deeec in roaraudio for libroar/proto.c

Timestamp:

04/26/11 11:03:46 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make use of new error stuff

File:

• libroar/proto.c (modified) (12 diffs)

libroar/proto.c

@@ -65 +65 @@
  char * bufptr;
 
- roar_errno = ROAR_ERROR_UNKNOWN;
+ roar_err_set(ROAR_ERROR_UNKNOWN);
 
  ROAR_DBG("roar_send_message(*): try to send an request...");
@@ -87 +87 @@
     buf[2]              = (unsigned char)  mes->cmd;
     // ...
-    roar_errno = ROAR_ERROR_NOTSUP;
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
    break;
@@ -107 +107 @@
    break;
   default:
-    roar_errno = ROAR_ERROR_NOTSUP;
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
  }
 
  if ( roar_vio_write(vio, buf, headerlen) != headerlen ) {
-  roar_errno = ROAR_ERROR_PIPE;
   return -1;
  }
@@ -118 +117 @@
  if ( mes->datalen != 0 ) {
   if ( roar_vio_write(vio, data == NULL ? mes->data : data, mes->datalen) != mes->datalen ) {
-   roar_errno = ROAR_ERROR_PIPE;
    return -1;
   }
@@ -125 +123 @@
  if ( crclen != 0 ) {
   if ( roar_vio_write(vio, crc, crclen) != crclen ) {
-   roar_errno = ROAR_ERROR_PIPE;
-   return -1;
-  }
- }
-
- roar_errno = ROAR_ERROR_NONE;
+   return -1;
+  }
+ }
+
+ roar_err_clear();
 
  ROAR_DBG("roar_send_message(*) = 0");
@@ -154 +151 @@
  char * bufptr;
 
- roar_errno = ROAR_ERROR_UNKNOWN;
+ roar_err_set(ROAR_ERROR_UNKNOWN);
 
  ROAR_DBG("roar_recv_message(*): try to get a response form the server...");
@@ -167 +164 @@
 
  if ( roar_vio_read(vio, buf, _ROAR_MESS_BUF_LEN_V0) != _ROAR_MESS_BUF_LEN_V0 ) {
-  roar_errno = ROAR_ERROR_PROTO;
+  roar_err_set(ROAR_ERROR_PROTO);
   return -1;
  }
@@ -195 +192 @@
    break;
   default:
-    roar_errno = ROAR_ERROR_PROTO;
+    roar_err_set(ROAR_ERROR_PROTO);
     return -1;
    break;
@@ -205 +202 @@
   needlen = headerlen - _ROAR_MESS_BUF_LEN_V0;
   if ( roar_vio_read(vio, buf+_ROAR_MESS_BUF_LEN_V0, needlen) != (ssize_t)needlen ) {
-   roar_errno = ROAR_ERROR_PROTO;
+   roar_err_set(ROAR_ERROR_PROTO);
    return -1;
   }
@@ -235 +232 @@
   ROAR_DBG("roar_recv_message(*): no data in this pkg");
   ROAR_DBG("roar_recv_message(*) = 0");
-  roar_errno = ROAR_ERROR_NONE;
+  roar_err_clear();
   return 0;
  }
@@ -243 +240 @@
    ROAR_DBG("roar_recv_message(*): Got data!");
    ROAR_DBG("roar_recv_message(*) = 0");
-   roar_errno = ROAR_ERROR_NONE;
+   roar_err_clear();
    return 0;
   }
 
-  roar_errno = ROAR_ERROR_PIPE;
   return -1;
  } else {
   if ( data == NULL ) {
-   roar_errno = ROAR_ERROR_MSGSIZE;
+   roar_err_set(ROAR_ERROR_MSGSIZE);
    return -1;
   }
 
   if ( (*data = malloc(mes->datalen)) == NULL ) {
-   roar_errno = ROAR_ERROR_NOMEM;
+   roar_err_set(ROAR_ERROR_NOMEM);
    return -1;
   }
 
   if ( mes->datalen == 0 ) {
-   roar_errno = ROAR_ERROR_NONE;
+   roar_err_clear();
    return 0;
   }
@@ -268 +264 @@
    ROAR_DBG("roar_recv_message(*): Got data!");
    ROAR_DBG("roar_recv_message(*) = 0");
-   roar_errno = ROAR_ERROR_NONE;
+   roar_err_clear();
    return 0;
   }
 
-  roar_errno = ROAR_ERROR_PIPE;
+  roar_err_set(ROAR_ERROR_PIPE);
   return -1;
  }