Blame SOURCES/0089-sss_iobuf-fix-read-shadows-a-global-declaration.patch
|
 |
bb7cd1 |
From ce191dc1922d894573eee828c88c325f64515d3e Mon Sep 17 00:00:00 2001
|
|
|
bb7cd1 |
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
|
|
|
bb7cd1 |
Date: Tue, 28 Mar 2017 15:26:52 +0200
|
|
|
bb7cd1 |
Subject: [PATCH 89/90] sss_iobuf: fix 'read' shadows a global declaration
|
|
|
bb7cd1 |
MIME-Version: 1.0
|
|
|
bb7cd1 |
Content-Type: text/plain; charset=UTF-8
|
|
|
bb7cd1 |
Content-Transfer-Encoding: 8bit
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
|
bb7cd1 |
(cherry picked from commit 18e4fe9d836e8f7bee52724374ffc0011172329f)
|
|
|
bb7cd1 |
---
|
|
|
bb7cd1 |
src/util/sss_iobuf.c | 6 +++---
|
|
|
bb7cd1 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
diff --git a/src/util/sss_iobuf.c b/src/util/sss_iobuf.c
|
|
|
bb7cd1 |
index fc288d2df2bfaaba393dd490d4da8976de804cb5..518713e4cc3dd99627a3a4450f235cbbc69ed3a2 100644
|
|
|
bb7cd1 |
--- a/src/util/sss_iobuf.c
|
|
|
bb7cd1 |
+++ b/src/util/sss_iobuf.c
|
|
|
bb7cd1 |
@@ -188,15 +188,15 @@ errno_t sss_iobuf_read_len(struct sss_iobuf *iobuf,
|
|
|
bb7cd1 |
size_t len,
|
|
|
bb7cd1 |
uint8_t *_buf)
|
|
|
bb7cd1 |
{
|
|
|
bb7cd1 |
- size_t read;
|
|
|
bb7cd1 |
+ size_t read_bytes;
|
|
|
bb7cd1 |
errno_t ret;
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
- ret = sss_iobuf_read(iobuf, len, _buf, &read;;
|
|
|
bb7cd1 |
+ ret = sss_iobuf_read(iobuf, len, _buf, &read_bytes);
|
|
|
bb7cd1 |
if (ret != EOK) {
|
|
|
bb7cd1 |
return ret;
|
|
|
bb7cd1 |
}
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
- if (read != len) {
|
|
|
bb7cd1 |
+ if (read_bytes != len) {
|
|
|
bb7cd1 |
return ENOBUFS;
|
|
|
bb7cd1 |
}
|
|
|
bb7cd1 |
|
|
|
bb7cd1 |
--
|
|
|
bb7cd1 |
2.9.3
|
|
|
bb7cd1 |
|