From 6b4fd0295a378a4d1d0a05fbb3c3bc911ea0f1d6 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 10 Feb 2015 12:08:58 -0800 Subject: [PATCH] commit --- meta | 3 +-- patches/setfl | 58 --------------------------------------------------- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 patches/setfl diff --git a/meta b/meta index 2ee7d0c6..45d656d7 100644 --- a/meta +++ b/meta @@ -1,8 +1,7 @@ Version: 1 -Previous: d851f503af367fa6f59c67baaac8b36c2e596c8b +Previous: 2f68237e4f48ea5fff0a584305d343ae9a3adba1 Head: 5e78ef2974ae364cf7682919e5120a1e1bc2a807 Applied: - setfl: 5e78ef2974ae364cf7682919e5120a1e1bc2a807 Unapplied: old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c diff --git a/patches/setfl b/patches/setfl deleted file mode 100644 index 6145754a..00000000 --- a/patches/setfl +++ /dev/null @@ -1,58 +0,0 @@ -Bottom: 4b3715465e5fbbc65460a5c47049ba42e48710f2 -Top: cc9fe9e0f61b120af8e519dd3c5c3802a7170a6e -Author: Sean Hefty -Date: 2015-02-10 11:55:12 -0800 - -rsockets: Fix F_SETFL to use an int rather than long - -The flags are specified as an int, not a long. The -rsocket code handles the flag incorrectly. - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/src/rsocket.c b/src/rsocket.c -index 6e8f375..1055728 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -352,7 +352,7 @@ struct rsocket { - }; - - int opts; -- long fd_flags; -+ int fd_flags; - uint64_t so_opts; - uint64_t ipv6_opts; - void *optval; -@@ -610,7 +610,7 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs, int type) - return rs; - } - --static int rs_set_nonblocking(struct rsocket *rs, long arg) -+static int rs_set_nonblocking(struct rsocket *rs, int arg) - { - struct ds_qp *qp; - int ret = 0; -@@ -3683,7 +3683,7 @@ int rfcntl(int socket, int cmd, ... /* arg */ ) - { - struct rsocket *rs; - va_list args; -- long param; -+ int param; - int ret = 0; - - rs = idm_lookup(&idm, socket); -@@ -3692,10 +3692,10 @@ int rfcntl(int socket, int cmd, ... /* arg */ ) - va_start(args, cmd); - switch (cmd) { - case F_GETFL: -- ret = (int) rs->fd_flags; -+ ret = rs->fd_flags; - break; - case F_SETFL: -- param = va_arg(args, long); -+ param = va_arg(args, int); - if ((rs->fd_flags & O_NONBLOCK) != (param & O_NONBLOCK)) - ret = rs_set_nonblocking(rs, param & O_NONBLOCK); -- 2.41.0