Nir Soffer
2021-Nov-10 16:00 UTC
[Libguestfs] [PATCH libnbd] common/utils/vector.c: Improve whitespace
- Indent the pseudo code to separate it from the comment text
- Add missing blank line after return to make the flow more clear
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
common/utils/vector.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/common/utils/vector.c b/common/utils/vector.c
index b145e7d..550e624 100644
--- a/common/utils/vector.c
+++ b/common/utils/vector.c
@@ -46,8 +46,8 @@ generic_vector_reserve (struct generic_vector *v, size_t n,
size_t itemsize)
size_t reqcap, reqbytes, newcap, newbytes, t;
/* New capacity requested. We must allocate this minimum (or fail).
- * reqcap = v->cap + n
- * reqbytes = reqcap * itemsize
+ * reqcap = v->cap + n
+ * reqbytes = reqcap * itemsize
*/
if (ADD_SIZE_T_OVERFLOW (v->cap, n, &reqcap) ||
MUL_SIZE_T_OVERFLOW (reqcap, itemsize, &reqbytes)) {
@@ -57,8 +57,8 @@ generic_vector_reserve (struct generic_vector *v, size_t n,
size_t itemsize)
/* However for the sake of optimization, scale buffer by 3/2 so that
* repeated reservations don't call realloc often.
- * newcap = v->cap + (v->cap + 1) / 2
- * newbytes = newcap * itemsize
+ * newcap = v->cap + (v->cap + 1) / 2
+ * newbytes = newcap * itemsize
*/
if (ADD_SIZE_T_OVERFLOW (v->cap, 1, &t) ||
ADD_SIZE_T_OVERFLOW (v->cap, t/2, &newcap) ||
@@ -74,6 +74,7 @@ generic_vector_reserve (struct generic_vector *v, size_t n,
size_t itemsize)
newptr = realloc (v->ptr, newbytes);
if (newptr == NULL)
return -1;
+
v->ptr = newptr;
v->cap = newcap;
return 0;
--
2.31.1
Richard W.M. Jones
2021-Nov-10 16:56 UTC
[Libguestfs] [PATCH libnbd] common/utils/vector.c: Improve whitespace
On Wed, Nov 10, 2021 at 06:00:17PM +0200, Nir Soffer wrote:> - Indent the pseudo code to separate it from the comment text > - Add missing blank line after return to make the flow more clear > > Signed-off-by: Nir Soffer <nsoffer at redhat.com> > --- > common/utils/vector.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/common/utils/vector.c b/common/utils/vector.c > index b145e7d..550e624 100644 > --- a/common/utils/vector.c > +++ b/common/utils/vector.c > @@ -46,8 +46,8 @@ generic_vector_reserve (struct generic_vector *v, size_t n, size_t itemsize) > size_t reqcap, reqbytes, newcap, newbytes, t; > > /* New capacity requested. We must allocate this minimum (or fail). > - * reqcap = v->cap + n > - * reqbytes = reqcap * itemsize > + * reqcap = v->cap + n > + * reqbytes = reqcap * itemsize > */ > if (ADD_SIZE_T_OVERFLOW (v->cap, n, &reqcap) || > MUL_SIZE_T_OVERFLOW (reqcap, itemsize, &reqbytes)) { > @@ -57,8 +57,8 @@ generic_vector_reserve (struct generic_vector *v, size_t n, size_t itemsize) > > /* However for the sake of optimization, scale buffer by 3/2 so that > * repeated reservations don't call realloc often. > - * newcap = v->cap + (v->cap + 1) / 2 > - * newbytes = newcap * itemsize > + * newcap = v->cap + (v->cap + 1) / 2 > + * newbytes = newcap * itemsize > */ > if (ADD_SIZE_T_OVERFLOW (v->cap, 1, &t) || > ADD_SIZE_T_OVERFLOW (v->cap, t/2, &newcap) || > @@ -74,6 +74,7 @@ generic_vector_reserve (struct generic_vector *v, size_t n, size_t itemsize) > newptr = realloc (v->ptr, newbytes); > if (newptr == NULL) > return -1; > + > v->ptr = newptr; > v->cap = newcap; > return 0;ACK, thanks Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html