[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1438863876-1935-3-git-send-email-phil@nwl.cc>
Date: Thu, 6 Aug 2015 14:24:33 +0200
From: Phil Sutter <phil@....cc>
To: Stephen Hemminger <shemming@...cade.com>
Cc: netdev@...r.kernel.org
Subject: [PATCH 3/6] misc/ss: simplify buffer realloc, fix checking realloc failure
Signed-off-by: Phil Sutter <phil@....cc>
---
misc/ss.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/misc/ss.c b/misc/ss.c
index af5a3c2..e77655a 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -550,7 +550,7 @@ static int find_entry(unsigned ino, char **buf, int type)
struct user_ent *p;
int cnt = 0;
char *ptr;
- char **new_buf = buf;
+ char *new_buf;
int len, new_buf_len;
int buf_used = 0;
int buf_len = 0;
@@ -592,12 +592,12 @@ static int find_entry(unsigned ino, char **buf, int type)
if (len < 0 || len >= buf_len - buf_used) {
new_buf_len = buf_len + ENTRY_BUF_SIZE;
- *new_buf = realloc(*buf, new_buf_len);
+ new_buf = realloc(*buf, new_buf_len);
if (!new_buf) {
fprintf(stderr, "ss: failed to malloc buffer\n");
abort();
}
- *buf = *new_buf;
+ *buf = new_buf;
buf_len = new_buf_len;
continue;
} else {
--
2.1.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists