There are three versions of the same function. Unify it
by making only one in utils.c and use only this one.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/ifaces.c | 11 ++---------
src/ipfilter.c | 3 ++-
src/iptraf-ng-compat.h | 8 --------
src/parseproto.c | 10 ++--------
src/tui/input.c | 10 ----------
src/tui/labels.h | 1 -
src/utils.c | 10 ++++++++++
src/utils.h | 3 +++
8 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/src/ifaces.c b/src/ifaces.c
index e4782d5..9e51447 100644
--- a/src/ifaces.c
+++ b/src/ifaces.c
@@ -20,14 +20,7 @@ details.
#include "iptraf-ng-compat.h"
#include "error.h"
-
-char *ltrim(char *buf)
-{
- while ((*buf == ' ') || (*buf == '\t'))
- buf++;
-
- return buf;
-}
+#include "utils.h"
/*
* Open /proc/net/dev and move file pointer past the two table header lines
@@ -67,7 +60,7 @@ int get_next_iface(FILE * fd, char *ifname, int n)
fgets(buf, 160, fd);
if (strcmp(buf, "") != 0) {
memset(ifname, 0, n);
- strncpy(ifname, ltrim(strtok(buf, ":")), n);
+ strncpy(ifname, skip_whitespace(strtok(buf, ":")), n);
if (ifname[n - 1] != '\0')
strcpy(ifname, "");
return 1;
diff --git a/src/ipfilter.c b/src/ipfilter.c
index d5b7dd6..d079123 100644
--- a/src/ipfilter.c
+++ b/src/ipfilter.c
@@ -31,6 +31,7 @@ details.
#include "getpath.h"
#include "parseproto.h"
#include "cidr.h"
+#include "utils.h"
void gethostparams(struct hostparams *data, char *init_saddr, char *init_smask,
char *init_sport1, char *init_sport2, char *init_daddr,
@@ -121,7 +122,7 @@ void gethostparams(struct hostparams *data, char *init_saddr, char
*init_smask,
tx_addfield(&fields, 1, 12, 10, (data->filters[F_IPSEC_AH]) ? "Y" :
"");
tx_addfield(&fields, 1, 12, 23, (data->filters[F_IPSEC_ESP]) ? "Y" :
"");
- cptr = tx_ltrim(data->protolist);
+ cptr = skip_whitespace(data->protolist);
tx_addfield(&fields, 54, 15, 1, cptr);
tx_addfield(&fields, 1, 17, 1, initinex);
tx_addfield(&fields, 1, 17, 32, initmatchop);
diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
index fec6c1f..7ccc298 100644
--- a/src/iptraf-ng-compat.h
+++ b/src/iptraf-ng-compat.h
@@ -92,14 +92,6 @@ extern void die(const char *err, ...);
extern void die_errno(const char *err) __noreturn;
extern void error(const char *err, ...);
-static inline char *skip_whitespace(const char *str)
-{
- while (isspace(*str))
- ++str;
-
- return (char *) str;
-}
-
#if 0
static inline int strtoul_ui(char const *s, int base, unsigned int *result)
{
diff --git a/src/parseproto.c b/src/parseproto.c
index 2c8d726..3ed8b68 100644
--- a/src/parseproto.c
+++ b/src/parseproto.c
@@ -19,7 +19,7 @@
#include <ctype.h>
#include <stdlib.h>
#include "parseproto.h"
-
+#include "utils.h"
/*
* Extracts next token from the buffer.
@@ -31,13 +31,7 @@ static char *get_next_token(char **cptr)
i = 0;
-
- /*
- * Skip over leading whitespace
- */
-
- while (isspace(**cptr))
- (*cptr)++;
+ *cptr = skip_whitespace(*cptr);
if (**cptr == ',' || **cptr == '-') {
rtoken[0] = **cptr;
diff --git a/src/tui/input.c b/src/tui/input.c
index 3206ddf..1620589 100644
--- a/src/tui/input.c
+++ b/src/tui/input.c
@@ -196,13 +196,3 @@ void tx_destroyfields(struct FIELDLIST *list)
del_panel(list->fieldpanel);
delwin(list->fieldwin);
}
-
-char *tx_ltrim(char *str)
-{
- char *cptr = str;
-
- while (isspace(*cptr))
- cptr++;
-
- return cptr;
-}
diff --git a/src/tui/labels.h b/src/tui/labels.h
index fb688e8..3073763 100644
--- a/src/tui/labels.h
+++ b/src/tui/labels.h
@@ -7,6 +7,5 @@ void tx_printkeyhelp(char *keytext, char *desc, WINDOW * win, int
highattr,
int textattr);
void tx_menukeyhelp(int textattr, int highattr);
void tx_listkeyhelp(int textattr, int highattr);
-char *tx_ltrim(char *str);
#endif /* IPTRAF_NG_TUI_LABELS_H */
diff --git a/src/utils.c b/src/utils.c
index 0fee777..1eed876 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -80,3 +80,13 @@ char *xstrdup(const char *s)
return t;
}
+
+char *skip_whitespace(char *str)
+{
+ char *ptr = str;
+
+ while (isspace(*ptr))
+ ptr++;
+
+ return ptr;
+}
diff --git a/src/utils.h b/src/utils.h
index b6301f3..96f1363 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,11 +1,14 @@
#ifndef IPTRAF_NG_UTILS_H
#define IPTRAF_NG_UTILS_H
+#include <stdarg.h>
+
void *xmalloc(size_t size);
void *xcalloc(size_t nmemb, size_t size);
void *xrealloc(void *ptr, size_t size);
char *xvasprintf(const char *format, va_list p);
void *xmallocz(size_t size);
char *xstrdup(const char *s);
+char *skip_whitespace(char *str);
#endif /* IPTRAF_NG_UTILS_H */
--
1.7.8.4