Changeset e98b1d5 in mainline for uspace/lib

Timestamp:

2010-09-26T11:37:37Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c5b59ce

Parents:

29fa68b

Message:

Include socket and networking error codes in the standard library's errno.h.

Location:

uspace/lib

Files:

• c/include/errno.h (modified) (1 diff)
• net/il/ip_client.c (modified) (1 diff)
• net/tl/tl_common.c (modified) (2 diffs)
• socket/generic/socket_client.c (modified) (2 diffs)
• socket/generic/socket_core.c (modified) (2 diffs)
• socket/include/socket.h (modified) (1 diff)
• socket/include/socket_errno.h (deleted)

uspace/lib/c/include/errno.h

@@ -56 +56 @@
 #define EMLINK        (-266)
 
+/** An API function is called while another blocking function is in progress. */
+#define EINPROGRESS     (-10036)
+
+/** The socket identifier is not valid. */
+#define ENOTSOCK        (-10038)
+
+/** The destination address required. */
+#define EDESTADDRREQ    (-10039)
+
+/** Protocol is not supported.  */
+#define EPROTONOSUPPORT (-10043)
+
+/** Socket type is not supported. */
+#define ESOCKTNOSUPPORT (-10044)
+
+/** Protocol family is not supported. */
+#define EPFNOSUPPORT    (-10046)
+
+/** Address family is not supported. */
+#define EAFNOSUPPORT    (-10047)
+
+/** Address is already in use. */
+#define EADDRINUSE      (-10048)
+
+/** The socket is not connected or bound. */
+#define ENOTCONN        (-10057)
+
+/** The requested operation was not performed.
+ *  Try again later.
+ */
+#define TRY_AGAIN       (-11002)
+
+/** No data.
+ */
+#define NO_DATA         (-11004)
+
 #endif
 

uspace/lib/net/il/ip_client.c

@@ -40 +40 @@
 
 #include <ip_client.h>
-#include <socket_errno.h>
 #include <packet/packet.h>
 #include <packet/packet_client.h>

uspace/lib/net/tl/tl_common.c

@@ -38 +38 @@
 #include <async.h>
 #include <ipc/services.h>
+#include <errno.h>
 
 #include <net_err.h>
@@ -51 +52 @@
 #include <ip_remote.h>
 #include <socket_codes.h>
-#include <socket_errno.h>
 #include <ip_interface.h>
 #include <tl_interface.h>

uspace/lib/socket/generic/socket_client.c

@@ -42 +42 @@
 #include <stdint.h>
 #include <stdlib.h>
+#include <errno.h>
 
 #include <ipc/services.h>
@@ -49 +50 @@
 #include <in.h>
 #include <socket.h>
-#include <socket_errno.h>
 #include <adt/dynamic_fifo.h>
 #include <adt/int_map.h>

uspace/lib/socket/generic/socket_core.c

@@ -37 +37 @@
 #include <stdint.h>
 #include <stdlib.h>
+#include <errno.h>
 
 #include <net_err.h>
@@ -42 +43 @@
 #include <inet.h>
 #include <socket_codes.h>
-#include <socket_errno.h>
 #include <adt/dynamic_fifo.h>
 #include <adt/int_map.h>

uspace/lib/socket/include/socket.h

@@ -45 +45 @@
 #include <inet.h>
 #include <socket_codes.h>
-#include <socket_errno.h>
+#include <errno.h>
 
 /** @name Socket application programming interface