Version: 1
-Previous: 2469694837d42ebadfe7a6fe7636f91b3dccbe91
-Head: 272d6f57226a2710fcc94755e4bc23a2d66d9cc6
+Previous: 18049648a28f47ab35ee2e1991ecddc818f1a791
+Head: cc1a06a1bc1788ff8b57c54ec28f5544228b65a9
Applied:
lazy-init: f306625fe8cafef70e3d60fddd7e685bc0696047
rs-inline: 4243da0ad9206c662b3a3c8ba7a9f4b2b7269d3f
fixed-ctrl: fa7872e54b5ef5a986cdfcc4d2a895c3a0c733c8
rs-ctrl: 5039c0e317d5507a0df5afc07e3783a650cab8e6
- inline0: f711acc3e13b88ef6d66125ab95f77034cca4a0d
- refresh-temp: 272d6f57226a2710fcc94755e4bc23a2d66d9cc6
+ inline0: cc1a06a1bc1788ff8b57c54ec28f5544228b65a9
Unapplied:
old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c
Bottom: cfb4e06d73107deeb818771d285c201b7e0eb692
-Top: 249d637d5f2c73789cfc1db5cdf82861f2b12641
+Top: ed641761946bf49be187e237b92349aa8a4c29d0
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2014-04-16 22:01:51 -0700
---
diff --git a/src/rsocket.c b/src/rsocket.c
-index 77b3979..3d80690 100644
+index 77b3979..3a9ff7d 100644
--- a/src/rsocket.c
+++ b/src/rsocket.c
@@ -61,7 +61,7 @@
+ total_sbuf_size = rs->sbuf_size;
+ if (rs->sq_inline < RS_MAX_CTRL_MSG)
+ total_sbuf_size += RS_MAX_CTRL_MSG * RS_QP_CTRL_SIZE;
-+ rs->sbuf = calloc(total_sbuf_size sizeof(*rs->sbuf));
++ rs->sbuf = calloc(total_sbuf_size, 1);
if (!rs->sbuf)
return ERR(ENOMEM);
+++ /dev/null
-Bottom: 249d637d5f2c73789cfc1db5cdf82861f2b12641
-Top: ed641761946bf49be187e237b92349aa8a4c29d0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2014-04-17 23:19:51 -0700
-
-Refresh of inline0
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 3d80690..3a9ff7d 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -685,7 +685,7 @@ static int rs_init_bufs(struct rsocket *rs)
- total_sbuf_size = rs->sbuf_size;
- if (rs->sq_inline < RS_MAX_CTRL_MSG)
- total_sbuf_size += RS_MAX_CTRL_MSG * RS_QP_CTRL_SIZE;
-- rs->sbuf = calloc(total_sbuf_size sizeof(*rs->sbuf));
-+ rs->sbuf = calloc(total_sbuf_size, 1);
- if (!rs->sbuf)
- return ERR(ENOMEM);