Add __must_check annotation for mark_fd_nonblocking() and mark_fd_blocking().

[paraslash.git] / net.c

diff --git a/net.c b/net.c
index 7f8d596d7d648511aa6478db75bc706159874be0..10fc121912b8d242b7ca15a8081c2e7e490e44c5 100644 (file)
--- a/net.c
+++ b/net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -147,10 +147,11 @@ int makesock(unsigned l3type, unsigned l4type, int passive,
 {
        struct addrinfo *local = NULL, *src,
                        *remote = NULL, *dst, hints;
-       char            *port = make_message("%u", port_number);
        int             rc, on = 1, sockfd = -1,
                        socktype = sock_type(l4type);
+       char port[6]; /* port number has at most 5 digits */
 
+       sprintf(port, "%u", port_number);
        /* Set up address hint structure */
        memset(&hints, 0, sizeof(hints));
        hints.ai_family = l3type;
@@ -331,7 +332,7 @@ char *remote_name(int sockfd)
  */
 struct in_addr extract_v4_addr(const struct sockaddr_storage *ss)
 {
-       struct in_addr ia = { 0 };
+       struct in_addr ia = {.s_addr = 0};
 
        if (ss->ss_family == AF_INET)
                 ia.s_addr = ((struct sockaddr_in *)ss)->sin_addr.s_addr;