Changeset 5554:974f701cf7b5 in roaraudio for libroar/socket.c

Timestamp:

07/07/12 13:55:15 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to convert EAI_* error codes (Closes: #255)

File:

• libroar/socket.c (modified) (1 diff)

libroar/socket.c

@@ -686 +686 @@
 
   ret = getaddrinfo(host, port_as_string, &hints, &res);
-  switch (ret) {
-   case 0: /* no error */; break;
-#ifdef EAI_ADDRFAMILY
-   case EAI_ADDRFAMILY: roar_err_set(ROAR_ERROR_NOENT);    break;
-#endif
-   case EAI_AGAIN:      roar_err_set(ROAR_ERROR_AGAIN);    break;
-   case EAI_BADFLAGS:   roar_err_set(ROAR_ERROR_INVAL);    break;
-   case EAI_FAIL:       roar_err_set(ROAR_ERROR_RIO);      break;
-   case EAI_FAMILY:     roar_err_set(ROAR_ERROR_AFNOTSUP); break;
-   case EAI_MEMORY:     roar_err_set(ROAR_ERROR_NOMEM);    break;
-#ifdef EAI_NODATA
-   case EAI_NODATA:     roar_err_set(ROAR_ERROR_NODATA);   break;
-#endif
-   case EAI_NONAME:     roar_err_set(ROAR_ERROR_NOENT);    break;
-   case EAI_SERVICE:    roar_err_set(ROAR_ERROR_PROTONOSUP); break;
-   case EAI_SOCKTYPE:   roar_err_set(ROAR_ERROR_INVAL);    break;
-   case EAI_SYSTEM:     roar_err_from_errno();             break;
-   default:
-     roar_err_set(ROAR_ERROR_UNKNOWN);
-    break;
-  }
-  if ( ret != 0 )
-   return -1;
+  if ( ret == EAI_SYSTEM ) {
+   roar_err_from_errno();
+   return -1;
+  } else if ( ret != 0 ) {
+   roar_err_convert(&roar_error, ROAR_ERROR_TYPE_ROARAUDIO, ret, ROAR_ERROR_TYPE_EAI);
+   return -1;
+  }
 
   if ( af_guessed ) {