[PATCH 0/9] iptraf-ng: treewide: lists deletion simplification

[Vitezslav Samel]

Vitezslav Samel (9):
  ipfrag.c: kill unused variable from struct fragent
  tui/winops.c: simplify tx_colorwin() and tx_wcoloreol()
  tui/input.c: simplify tx_destroyfields()
  tui/menurt.c: simplify tx_destroymenu()
  fltedit.c: simplify destroyfilter()
  fltmgr.c: simplify destroyfilterlist()
  hostmon.c: simplify destroyethtab()
  ipfrag.c: simplify destroyholes()
  othptab.c: simplify destroyothptable()

 src/fltedit.c    | 26 +++++++++-----------------
 src/fltmgr.c     | 14 ++++----------
 src/hostmon.c    | 11 +++--------
 src/ipfrag.c     | 21 +++++----------------
 src/othptab.c    | 17 +++++------------
 src/tui/input.c  | 19 ++++++++-----------
 src/tui/menurt.c | 21 ++++++++-------------
 src/tui/winops.c | 28 +++++-----------------------
 8 files changed, 47 insertions(+), 110 deletions(-)

-- 
1.9.1

[PATCH 1/9] ipfrag.c: kill unused variable from struct fragent

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/ipfrag.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ipfrag.c b/src/ipfrag.c
index 8038cd0..46afdb1 100644
--- a/src/ipfrag.c
+++ b/src/ipfrag.c
@@ -36,7 +36,6 @@ struct fragent {
 	unsigned int id;
 	unsigned int protocol;
 	int firstin;
-	time_t starttime;
 	struct fragdescent *fragdesclist;
 	struct fragdescent *fragdesctail;
 	unsigned int bcount;
-- 
1.9.1

[PATCH 2/9] tui/winops.c: simplify tx_colorwin() and tx_wcoloreol()

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/tui/winops.c | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/tui/winops.c b/src/tui/winops.c
index e323631..d866281 100644
--- a/src/tui/winops.c
+++ b/src/tui/winops.c
@@ -24,36 +24,18 @@ void tx_refresh_screen(void)
 	curs_set(0);
 }
 
-void tx_colorwin(WINDOW * win)
+void tx_colorwin(WINDOW *win)
 {
-	int ctr;
-	char *blankpad;
-	blankpad = (char *) xmalloc(sizeof(char) * (getmaxx(win) + 1));
-
-	strcpy(blankpad, "");
-
-	for (ctr = 0; ctr < getmaxx(win); ctr++) {
-		strcat(blankpad, " ");
-	}
-
 	scrollok(win, 0);
-	for (ctr = 0; ctr < getmaxy(win); ctr++) {
-		mvwprintw(win, ctr, 0, "%s", blankpad);
-	}
+	for (int row = 0; row < getmaxy(win); row++)
+		mvwprintw(win, row, 0, "%*c", getmaxx(win), ' ');
 	scrollok(win, 1);
-	free(blankpad);
 }
 
-void tx_wcoloreol(WINDOW * win)
+void tx_wcoloreol(WINDOW *win)
 {
-	int x, curx;
-	int y __unused;
-	int cury __unused;
-
-	getyx(win, cury, curx);
-	getmaxyx(win, y, x);
 	scrollok(win, 0);
-	wprintw(win, "%*c", x - curx - 1, ' ');
+	wprintw(win, "%*c", getmaxx(win) - getcurx(win) - 1, ' ');
 }
 
 /*
-- 
1.9.1

[PATCH 3/9] tui/input.c: simplify tx_destroyfields()

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/tui/input.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/tui/input.c b/src/tui/input.c
index d45ae0d..8ed6081 100644
--- a/src/tui/input.c
+++ b/src/tui/input.c
@@ -163,21 +163,18 @@ void tx_fillfields(struct FIELDLIST *list, int *aborted)
 
 void tx_destroyfields(struct FIELDLIST *list)
 {
-	struct FIELD *ptmp;
-	struct FIELD *pnext;
+	struct FIELD *ptmp = list->list;
 
-	list->list->prevfield->nextfield = NULL;
-	ptmp = list->list;
-	pnext = list->list->nextfield;
+	/* break the circular list */
+	if (ptmp != NULL)
+		ptmp->prevfield->nextfield = NULL;
 
-	do {
-		free(ptmp);
+	while (ptmp != NULL) {
+		struct FIELD *pnext = ptmp->nextfield;
 
+		free(ptmp);
 		ptmp = pnext;
-		if (pnext != NULL) {
-			pnext = pnext->nextfield;
-		}
-	} while (ptmp != NULL);
+	}
 
 	del_panel(list->fieldpanel);
 	delwin(list->fieldwin);
-- 
1.9.1

[PATCH 4/9] tui/menurt.c: simplify tx_destroymenu()

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/tui/menurt.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/tui/menurt.c b/src/tui/menurt.c
index b4c153a..fb3f002 100644
--- a/src/tui/menurt.c
+++ b/src/tui/menurt.c
@@ -261,26 +261,21 @@ void tx_operatemenu(struct MENU *menu, int *position, int *aborted)
 	doupdate();
 }
 
-
 void tx_destroymenu(struct MENU *menu)
 {
-	struct ITEM *tnode;
-	struct ITEM *tnextnode;
-
-	if (menu->itemlist != NULL) {
-		tnode = menu->itemlist;
-		tnextnode = menu->itemlist->next;
+	struct ITEM *tnode = menu->itemlist;
 
+	/* break the circular list */
+	if (tnode != NULL)
 		tnode->prev->next = NULL;
 
-		while (tnode != NULL) {
-			free(tnode);
-			tnode = tnextnode;
+	while (tnode != NULL) {
+		struct ITEM *tnextnode = tnode->next;
 
-			if (tnextnode != NULL)
-				tnextnode = tnextnode->next;
-		}
+		free(tnode);
+		tnode = tnextnode;
 	}
+
 	del_panel(menu->menupanel);
 	delwin(menu->menuwin);
 	update_panels();
-- 
1.9.1

[PATCH 5/9] fltedit.c: simplify destroyfilter()

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/fltedit.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/fltedit.c b/src/fltedit.c
index 50801ec..300487f 100644
--- a/src/fltedit.c
+++ b/src/fltedit.c
@@ -470,28 +470,20 @@ void modify_host_parameters(struct filterlist *fl)
 	doupdate();
 }
 
-/*
- * Remove a currently applied filter from memory
- */
-
+/* remove a currently applied filter from memory */
 void destroyfilter(struct filterlist *fl)
 {
-	struct filterent *fe;
-	struct filterent *cfe;
-
-	if (fl->head != NULL) {
-		fe = fl->head;
-		cfe = fl->head->next_entry;
+	struct filterent *fe = fl->head;
 
-		do {
-			free(fe);
-			fe = cfe;
-			if (cfe != NULL)
-				cfe = cfe->next_entry;
-		} while (fe != NULL);
+	while (fe != NULL) {
+		struct filterent *cfe = fe->next_entry;
 
-		fl->head = fl->tail = NULL;
+		free(fe);
+		fe = cfe;
 	}
+
+	fl->head = NULL;
+	fl->tail = NULL;
 }
 
 
-- 
1.9.1

[PATCH 6/9] fltmgr.c: simplify destroyfilterlist()

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/fltmgr.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/fltmgr.c b/src/fltmgr.c
index 370194c..e7c31e7 100644
--- a/src/fltmgr.c
+++ b/src/fltmgr.c
@@ -181,17 +181,11 @@ int loadfilterlist(struct ffnode **fltfile)
 
 void destroyfilterlist(struct ffnode *fltlist)
 {
-	struct ffnode *fftemp;
+	while (fltlist != NULL) {
+		struct ffnode *fftemp = fltlist->next_entry;
 
-	if (fltlist != NULL) {
-		fftemp = fltlist->next_entry;
-
-		do {
-			free(fltlist);
-			fltlist = fftemp;
-			if (fftemp != NULL)
-				fftemp = fftemp->next_entry;
-		} while (fltlist != NULL);
+		free(fltlist);
+		fltlist = fftemp;
 	}
 }
 
-- 
1.9.1

[PATCH 7/9] hostmon.c: simplify destroyethtab()

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/hostmon.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/hostmon.c b/src/hostmon.c
index dc34a94..76ddb46 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -371,21 +371,16 @@ static void printethent(struct ethtab *table, struct ethtabent
*entry)
 static void destroyethtab(struct ethtab *table)
 {
 	struct ethtabent *ptemp = table->head;
-	struct ethtabent *cnext = NULL;
-
-	if (table->head != NULL)
-		cnext = table->head->next_entry;
 
 	while (ptemp != NULL) {
+		struct ethtabent *next = ptemp->next_entry;
+
 		if (ptemp->type == 1) {
 			rate_destroy(&ptemp->un.figs.outrate);
 			rate_destroy(&ptemp->un.figs.inrate);
 		}
 		free(ptemp);
-		ptemp = cnext;
-
-		if (cnext != NULL)
-			cnext = cnext->next_entry;
+		ptemp = next;
 	}
 }
 
-- 
1.9.1

[PATCH v2 7/9] hostmon.c: simplify destroyethtab()

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/hostmon.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/hostmon.c b/src/hostmon.c
index 6299fc6..8711513 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -388,21 +388,16 @@ static void printethent(struct ethtab *table, struct ethtabent
*entry)
 static void destroyethtab(struct ethtab *table)
 {
 	struct ethtabent *ptemp = table->head;
-	struct ethtabent *cnext = NULL;
-
-	if (table->head != NULL)
-		cnext = table->head->next_entry;
 
 	while (ptemp != NULL) {
+		struct ethtabent *next = ptemp->next_entry;
+
 		if (ptemp->type == 1) {
 			rate_destroy(&ptemp->un.figs.outrate);
 			rate_destroy(&ptemp->un.figs.inrate);
 		}
 		free(ptemp);
-		ptemp = cnext;
-
-		if (cnext != NULL)
-			cnext = cnext->next_entry;
+		ptemp = next;
 	}
 
 	free_eth_desc(table->elist);
-- 
1.9.1

[PATCH 8/9] ipfrag.c: simplify destroyholes()

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/ipfrag.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/ipfrag.c b/src/ipfrag.c
index 46afdb1..5ba61e3 100644
--- a/src/ipfrag.c
+++ b/src/ipfrag.c
@@ -105,26 +105,16 @@ static void deldgram(struct fragent *ftmp)
 	free(ftmp);
 }
 
-
-/*
- * Destroy hole descriptor list
- */
-
+/* destroy hole descriptor list */
 static void destroyholes(struct fragent *ftmp)
 {
 	struct fragdescent *dtmp = ftmp->fragdesclist;
-	struct fragdescent *ntmp = NULL;
 
-	if (ftmp->fragdesclist != NULL) {
-		ntmp = dtmp->next_entry;
-
-		while (dtmp != NULL) {
-			free(dtmp);
-			dtmp = ntmp;
+	while (dtmp != NULL) {
+		struct fragdescent *ntmp = dtmp->next_entry;
 
-			if (ntmp != NULL)
-				ntmp = ntmp->next_entry;
-		}
+		free(dtmp);
+		dtmp = ntmp;
 	}
 }
 
-- 
1.9.1

[PATCH 9/9] othptab.c: simplify destroyothptable()

[Vitezslav Samel]

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/othptab.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/othptab.c b/src/othptab.c
index 2aa54f5..3d6c7bd 100644
--- a/src/othptab.c
+++ b/src/othptab.c
@@ -771,19 +771,12 @@ void refresh_othwindow(struct othptable *table)
 
 void destroyothptable(struct othptable *table)
 {
-	struct othptabent *ctemp;
-	struct othptabent *ctemp_next;
+	struct othptabent *ctemp = table->head;
 
-	if (table->head != NULL) {
-		ctemp = table->head;
-		ctemp_next = table->head->next_entry;
+	while (ctemp != NULL) {
+		struct othptabent *next = ctemp->next_entry;
 
-		while (ctemp != NULL) {
-			free(ctemp);
-			ctemp = ctemp_next;
-
-			if (ctemp_next != NULL)
-				ctemp_next = ctemp_next->next_entry;
-		}
+		free(ctemp);
+		ctemp = next;
 	}
 }
-- 
1.9.1

[Nikola Pajkovsky]

Vitezslav Samel <vitezslav(a)samel.cz&gt; writes:

>  Vitezslav Samel (9):
>    ipfrag.c: kill unused variable from struct fragent
>    tui/winops.c: simplify tx_colorwin() and tx_wcoloreol()
>    tui/input.c: simplify tx_destroyfields()
>    tui/menurt.c: simplify tx_destroymenu()
>    fltedit.c: simplify destroyfilter()
>    fltmgr.c: simplify destroyfilterlist()
>    hostmon.c: simplify destroyethtab()
>    ipfrag.c: simplify destroyholes()
>    othptab.c: simplify destroyothptable()
>
>   src/fltedit.c    | 26 +++++++++-----------------
>   src/fltmgr.c     | 14 ++++----------
>   src/hostmon.c    | 11 +++--------
>   src/ipfrag.c     | 21 +++++----------------
>   src/othptab.c    | 17 +++++------------
>   src/tui/input.c  | 19 ++++++++-----------
>   src/tui/menurt.c | 21 ++++++++-------------
>   src/tui/winops.c | 28 +++++-----------------------
>   8 files changed, 47 insertions(+), 110 deletions(-) 
All in and pushed. Thanks.

--
Nikola