matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "tc: Remove pointless assignments in batch()" 

This reverts commit 6358bbc381.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2019-07-31 17:16:54 -07:00
parent 432b21bec7
commit 11120881d9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tc/tc.c
View File

@ -326,11 +326,11 @@ static int batch(const char *name)
struct batch_buf *head = NULL, *tail = NULL, *buf_pool = NULL; struct batch_buf *head = NULL, *tail = NULL, *buf_pool = NULL;
char *largv[100], *largv_next[100]; char *largv[100], *largv_next[100];
char *line, *line_next = NULL; char *line, *line_next = NULL;
bool bs_enabled_next = false;
bool bs_enabled = false; bool bs_enabled = false;
bool lastline = false; bool lastline = false;
int largc, largc_next; int largc, largc_next;
bool bs_enabled_saved; bool bs_enabled_saved;
bool bs_enabled_next;
int batchsize = 0; int batchsize = 0;
size_t len = 0; size_t len = 0;
int ret = 0; int ret = 0;
@ -359,6 +359,7 @@ static int batch(const char *name)
goto Exit; goto Exit;
largc = makeargs(line, largv, 100); largc = makeargs(line, largv, 100);
bs_enabled = batchsize_enabled(largc, largv); bs_enabled = batchsize_enabled(largc, largv);
bs_enabled_saved = bs_enabled;
do { do {
if (getcmdline(&line_next, &len, stdin) == -1) if (getcmdline(&line_next, &len, stdin) == -1)
lastline = true; lastline = true;
@ -394,6 +395,7 @@ static int batch(const char *name)
len = 0; len = 0;
bs_enabled_saved = bs_enabled; bs_enabled_saved = bs_enabled;
bs_enabled = bs_enabled_next; bs_enabled = bs_enabled_next;
bs_enabled_next = false;
if (largc == 0) { if (largc == 0) {
largc = largc_next; largc = largc_next;