Changeset 727f04f in mainline

Timestamp:

2010-12-27T19:30:20Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45bb1d2

Parents:

d493830e

Message:

recv() and recvfrom() should return ssize_t.

Location:

uspace/lib/c

Files:

• generic/net/socket_client.c (modified) (8 diffs)
• include/net/socket.h (modified) (1 diff)

uspace/lib/c/generic/net/socket_client.c

@@ -966 +966 @@
  *                      read. The actual address length is set. Used only if
  *                      fromaddr is not NULL.
- * @return              EOK on success.
+ * @return              Positive received message size in bytes on success.
+ * @return              Zero if no more data (other side closed the connection).
  * @return              ENOTSOCK if the socket is not found.
  * @return              EBADMEM if the data parameter is NULL.
@@ -972 +973 @@
  * @return              Other error codes as defined for the spcific message.
  */
-static int
+static ssize_t
 recvfrom_core(sysarg_t message, int socket_id, void *data, size_t datalength,
     int flags, struct sockaddr *fromaddr, socklen_t *addrlen)
@@ -984 +985 @@
         size_t index;
         ipc_call_t answer;
+        ssize_t retval;
 
         if (!data)
@@ -1083 +1085 @@
                 dyn_fifo_pop(&socket->received);
                 // return read data length
-                result = SOCKET_GET_READ_DATA_LENGTH(answer);
+                retval = SOCKET_GET_READ_DATA_LENGTH(answer);
                 // set address length
                 if (fromaddr && addrlen)
                         *addrlen = SOCKET_GET_ADDRESS_LENGTH(answer);
+        } else {
+                retval = (ssize_t) result;
         }
 
         fibril_mutex_unlock(&socket->receive_lock);
         fibril_rwlock_read_unlock(&socket_globals.lock);
-        return result;
+        return retval;
 }
 
@@ -1100 +1104 @@
  * @param[in] datalength The data length.
  * @param[in] flags     Various receive flags.
- * @return              EOK on success.
+ * @return              Positive received message size in bytes on success.
+ * @return              Zero if no more data (other side closed the connection).
  * @return              ENOTSOCK if the socket is not found.
  * @return              EBADMEM if the data parameter is NULL.
@@ -1107 +1112 @@
  *                      message.
  */
-int recv(int socket_id, void *data, size_t datalength, int flags)
+ssize_t recv(int socket_id, void *data, size_t datalength, int flags)
 {
         // without the address
@@ -1123 +1128 @@
  * @param[in,out] addrlen The address length. The maximum address length is
  *                      read. The actual address length is set.
- * @return              EOK on success.
+ * @return              Positive received message size in bytes on success.
+ * @return              Zero if no more data (other side closed the connection).
  * @return              ENOTSOCK if the socket is not found.
  * @return              EBADMEM if the data or fromaddr parameter is NULL.
@@ -1130 +1136 @@
  *                      message.
  */
-int
+ssize_t
 recvfrom(int socket_id, void *data, size_t datalength, int flags,
     struct sockaddr *fromaddr, socklen_t *addrlen)

uspace/lib/c/include/net/socket.h

@@ -60 +60 @@
 extern int sendto(int, const void *, size_t, int, const struct sockaddr *,
     socklen_t);
-extern int recv(int, void *, size_t, int);
-extern int recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
+extern ssize_t recv(int, void *, size_t, int);
+extern ssize_t recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
 extern int getsockopt(int, int, int, void *, size_t *);
 extern int setsockopt(int, int, int, const void *, size_t);