From ad7c87d97197e54a7fe7ca7fd20474f7bc9a6724 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 5 Nov 2012 11:57:11 -0800 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 ++-- patches/refresh-temp | 66 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 94311617..2188c4a2 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: d2b0a0c7235469f329ed420b081fe8ba2578dbcb -Head: 3c399f2731b8050506af496bb4ec2d190d448faf +Previous: 405778be70a97aeac133d3cadf7c6f92d18c5d14 +Head: 927b85bfdb795645bdbd20cd1be46096cc500c01 Applied: rs-iomap: bb9fcba81acdfe34ea5df3bb23a45e0a486207da riostream: 7d92d0106f50e0371256e74863963a0e2e99a5c8 fscanf: 3c399f2731b8050506af496bb4ec2d190d448faf + refresh-temp: 927b85bfdb795645bdbd20cd1be46096cc500c01 Unapplied: iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..28a77e48 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,66 @@ +Bottom: 59dfa020a0be74bc45df6be3de00c8ca1f997348 +Top: 92d2aab8615c3d1003fee963587c4078b732e465 +Author: Sean Hefty +Date: 2012-11-05 11:57:11 -0800 + +Refresh of fscanf + +--- + +diff --git a/src/rsocket.c b/src/rsocket.c +index 74dbcc7..58fcb8e 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -256,12 +256,12 @@ void rs_configure(void) + goto out; + + if ((f = fopen(RS_CONF_DIR "/polling_time", "r"))) { +- fscanf(f, "%u", &polling_time); ++ (void) fscanf(f, "%u", &polling_time); + fclose(f); + } + + if ((f = fopen(RS_CONF_DIR "/inline_default", "r"))) { +- fscanf(f, "%hu", &def_inline); ++ (void) fscanf(f, "%hu", &def_inline); + fclose(f); + + if (def_inline < RS_MIN_INLINE) +@@ -269,17 +269,17 @@ void rs_configure(void) + } + + if ((f = fopen(RS_CONF_DIR "/sqsize_default", "r"))) { +- fscanf(f, "%hu", &def_sqsize); ++ (void) fscanf(f, "%hu", &def_sqsize); + fclose(f); + } + + if ((f = fopen(RS_CONF_DIR "/rqsize_default", "r"))) { +- fscanf(f, "%hu", &def_rqsize); ++ (void) fscanf(f, "%hu", &def_rqsize); + fclose(f); + } + + if ((f = fopen(RS_CONF_DIR "/mem_default", "r"))) { +- fscanf(f, "%u", &def_mem); ++ (void) fscanf(f, "%u", &def_mem); + fclose(f); + + if (def_mem < 1) +@@ -287,14 +287,14 @@ void rs_configure(void) + } + + if ((f = fopen(RS_CONF_DIR "/wmem_default", "r"))) { +- fscanf(f, "%u", &def_wmem); ++ (void) fscanf(f, "%u", &def_wmem); + fclose(f); + if (def_wmem < RS_SNDLOWAT) + def_wmem = RS_SNDLOWAT << 1; + } + + if ((f = fopen(RS_CONF_DIR "/iomap_size", "r"))) { +- fscanf(f, "%hu", &def_iomap_size); ++ (void) fscanf(f, "%hu", &def_iomap_size); + fclose(f); + + /* round to supported values */ -- 2.41.0