Changes in uspace/app/websrv/websrv.c [d5c1051:b7fd2a0] in mainline

File:

• uspace/app/websrv/websrv.c (modified) (11 diffs)

uspace/app/websrv/websrv.c

@@ -134 +134 @@
 
 
-static int recv_create(tcp_conn_t *conn, recv_t **rrecv)
+static errno_t recv_create(tcp_conn_t *conn, recv_t **rrecv)
 {
         recv_t *recv;
@@ -157 +157 @@
 
 /** Receive one character (with buffering) */
-static int recv_char(recv_t *recv, char *c)
+static errno_t recv_char(recv_t *recv, char *c)
 {
         size_t nrecv;
-        int rc;
+        errno_t rc;
         
         if (recv->rbuf_out == recv->rbuf_in) {
@@ -180 +180 @@
 
 /** Receive one line with length limit */
-static int recv_line(recv_t *recv, char **rbuf)
+static errno_t recv_line(recv_t *recv, char **rbuf)
 {
         char *bp = recv->lbuf;
@@ -187 +187 @@
         while (bp < recv->lbuf + BUFFER_SIZE) {
                 char prev = c;
-                int rc = recv_char(recv, &c);
+                errno_t rc = recv_char(recv, &c);
                 
                 if (rc != EOK)
@@ -226 +226 @@
 }
 
-static int send_response(tcp_conn_t *conn, const char *msg)
+static errno_t send_response(tcp_conn_t *conn, const char *msg)
 {
         size_t response_size = str_size(msg);
@@ -233 +233 @@
             fprintf(stderr, "Sending response\n");
         
-        int rc = tcp_conn_send(conn, (void *) msg, response_size);
+        errno_t rc = tcp_conn_send(conn, (void *) msg, response_size);
         if (rc != EOK) {
                 fprintf(stderr, "tcp_conn_send() failed\n");
@@ -242 +242 @@
 }
 
-static int uri_get(const char *uri, tcp_conn_t *conn)
+static errno_t uri_get(const char *uri, tcp_conn_t *conn)
 {
         char *fbuf = NULL;
         char *fname = NULL;
-        int rc;
+        errno_t rc;
         size_t nr;
         int fd = -1;
@@ -302 +302 @@
 }
 
-static int req_process(tcp_conn_t *conn, recv_t *recv)
+static errno_t req_process(tcp_conn_t *conn, recv_t *recv)
 {
         char *reqline = NULL;
 
-        int rc = recv_line(recv, &reqline);
+        errno_t rc = recv_line(recv, &reqline);
         if (rc != EOK) {
                 fprintf(stderr, "recv_line() failed\n");
@@ -355 +355 @@
 }
 
-static int parse_option(int argc, char *argv[], int *index)
+static errno_t parse_option(int argc, char *argv[], int *index)
 {
         int value;
-        int rc;
+        errno_t rc;
         
         switch (argv[*index][1]) {
@@ -403 +403 @@
 static void websrv_new_conn(tcp_listener_t *lst, tcp_conn_t *conn)
 {
-        int rc;
+        errno_t rc;
         recv_t *recv = NULL;
         
@@ -443 +443 @@
         tcp_listener_t *lst;
         tcp_t *tcp;
-        int rc;
+        errno_t rc;
         
         /* Parse command line arguments */