projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Make some functions return void.
[paraslash.git]
/
udp_send.c
diff --git
a/udp_send.c
b/udp_send.c
index b4494eb7edb9e9fd26c1f4d20e9b81b06472c625..3e3950f90d232794df915e45c39d2e8ad031d44f 100644
(file)
--- a/
udp_send.c
+++ b/
udp_send.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-201
1
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-201
2
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-9,12
+9,10
@@
#include <regex.h>
#include <sys/time.h>
#include <regex.h>
#include <sys/time.h>
-#include <dirent.h>
#include <sys/socket.h>
#include <netinet/udp.h>
#include <net/if.h>
#include <osl.h>
#include <sys/socket.h>
#include <netinet/udp.h>
#include <net/if.h>
#include <osl.h>
-#include <stdbool.h>
#include "server.cmdline.h"
#include "para.h"
#include "server.cmdline.h"
#include "para.h"
@@
-25,11
+23,11
@@
#include "server.h"
#include "list.h"
#include "send.h"
#include "server.h"
#include "list.h"
#include "send.h"
+#include "sched.h"
#include "vss.h"
#include "portable_io.h"
#include "net.h"
#include "fd.h"
#include "vss.h"
#include "portable_io.h"
#include "net.h"
#include "fd.h"
-#include "sched.h"
#include "close_on_fork.h"
/**
#include "close_on_fork.h"
/**
@@
-279,18
+277,18
@@
static int udp_check_socket_state(struct sender_client *sc)
return -ERRNO_TO_PARA_ERROR(ret);
}
return -ERRNO_TO_PARA_ERROR(ret);
}
-static
int
udp_send_fec(struct sender_client *sc, char *buf, size_t len)
+static
void
udp_send_fec(struct sender_client *sc, char *buf, size_t len)
{
int ret;
if (sender_status == SENDER_OFF)
{
int ret;
if (sender_status == SENDER_OFF)
- return
0
;
+ return;
if (len == 0)
if (len == 0)
- return
0
;
+ return;
ret = udp_check_socket_state(sc);
if (ret < 0)
goto fail;
ret = udp_check_socket_state(sc);
if (ret < 0)
goto fail;
- ret =
write_nonblock
(sc->fd, buf, len);
+ ret =
xwrite
(sc->fd, buf, len);
if (ret == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) {
/*
* Happens if meanwhile an ICMP Destination / Port Unreachable
if (ret == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) {
/*
* Happens if meanwhile an ICMP Destination / Port Unreachable
@@
-300,10
+298,9
@@
static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
}
if (ret < 0)
goto fail;
}
if (ret < 0)
goto fail;
- return
1
;
+ return;
fail:
udp_delete_target(sc, para_strerror(-ret));
fail:
udp_delete_target(sc, para_strerror(-ret));
- return ret;
}
static int udp_com_add(struct sender_command_data *scd)
}
static int udp_com_add(struct sender_command_data *scd)