[PATCH 0/8] cleanups and a fix

List overview All Threads
Download

newer

older

[PATCH] packet.h: decrease packet...

iptraf-ng 1.1.3

Vitezslav Samel

28 May 2012 28 May '12

6:39 p.m.

Vitezslav Samel (8): iptraf.c: remove unused code fltmgr.h: remove unneded IGNORE_FILTER_PROTOTYPES #ifdef rename local variable exitloop in tui/*.c to endloop sanitize extern variables removeaport(): fix segfault when there are no ports to remove remove circular dependency between serv.h and options.h remove unused #ifndef conditionals use integer constant when dealing with integer variables

-- 1.7.8.4

Show replies by date

Vitezslav Samel

28 May 28 May

6:39 p.m.

New subject: [PATCH 1/8] iptraf.c: remove unused code

Signed-off-by: Vitezslav Samel vitezslav@samel.cz --- src/iptraf.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/iptraf.c b/src/iptraf.c index 08ddeb5..b3412f2 100644 --- a/src/iptraf.c +++ b/src/iptraf.c @@ -450,12 +450,6 @@ int main(int argc, char **argv) exit(0); } } -#ifdef SIMDAEMON - daemonized = 1; - freopen("/dev/null", "w", stdout); /* redirect std output */ - freopen("/dev/null", "r", stdin); - freopen("/dev/null", "w", stderr); -#endif

sanitize_dir(LOCKDIR); sanitize_dir(WORKDIR);

-- 1.7.8.4

Vitezslav Samel

6:39 p.m.

New subject: [PATCH 2/8] fltmgr.h: remove unneded IGNORE_FILTER_PROTOTYPES #ifdef

Signed-off-by: Vitezslav Samel vitezslav@samel.cz --- src/fltmgr.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/fltmgr.h b/src/fltmgr.h index d9c9cd6..c40b2ff 100644 --- a/src/fltmgr.h +++ b/src/fltmgr.h @@ -18,7 +18,6 @@ struct ffnode { struct ffnode *prev_entry; };

-#ifndef IGNORE_FILTER_PROTOTYPES void makestdfiltermenu(struct MENU *menu); void makemainfiltermenu(struct MENU *menu); int loadfilterlist(struct ffnode **fltfile); @@ -33,6 +32,5 @@ unsigned long int nametoaddr(char *ascname, int *err); void listfileerr(int code); int mark_filter_change(void); void clear_flt_tag(void); -#endif

#endif /* IPTRAF_NG_FLTMGR_H */

-- 1.7.8.4

Vitezslav Samel

6:39 p.m.

New subject: [PATCH 3/8] rename local variable exitloop in tui/*.c to endloop

Rename it to avoid clash with global exitloop.

Signed-off-by: Vitezslav Samel vitezslav@samel.cz --- src/tui/input.c | 8 ++++---- src/tui/listbox.c | 8 ++++---- src/tui/menurt.c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/tui/input.c b/src/tui/input.c index 1dc129f..e363722 100644 --- a/src/tui/input.c +++ b/src/tui/input.c @@ -139,7 +139,7 @@ void tx_fillfields(struct FIELDLIST *list, int *aborted) { struct FIELD *field; int exitkey; - int exitloop = 0; + int endloop = 0;

field = list->list;

@@ -158,15 +158,15 @@ void tx_fillfields(struct FIELDLIST *list, int *aborted) case 13: case 10: *aborted = 0; - exitloop = 1; + endloop = 1; break; case 27: case 24: *aborted = 1; - exitloop = 1; + endloop = 1; break; } - } while (!exitloop); + } while (!endloop);

curs_set(0); } diff --git a/src/tui/listbox.c b/src/tui/listbox.c index 3574626..a9d528c 100644 --- a/src/tui/listbox.c +++ b/src/tui/listbox.c @@ -81,7 +81,7 @@ void tx_show_listbox(struct scroll_list *list) void tx_operate_listbox(struct scroll_list *list, int *keystroke, int *aborted) { int ch; - int exitloop = 0; + int endloop = 0; int row = 0; char padding[MAX_TEXT_LENGTH]; char sp_buf[10]; @@ -98,7 +98,7 @@ void tx_operate_listbox(struct scroll_list *list, int *keystroke, int *aborted) update_panels(); doupdate();

- while (!exitloop) { + while (!endloop) { snprintf(sp_buf, 9, "%%%zuc", list->width - strlen(list->textptr->text) - 3); snprintf(padding, MAX_TEXT_LENGTH - 1, sp_buf, ' '); @@ -145,14 +145,14 @@ void tx_operate_listbox(struct scroll_list *list, int *keystroke, int *aborted) break; case 13: *aborted = 0; - exitloop = 1; + endloop = 1; break; case 27: case 'x': case 'X': case 24: *aborted = 1; - exitloop = 1; + endloop = 1; case 12: case 'l': case 'L': diff --git a/src/tui/menurt.c b/src/tui/menurt.c index 3d118cf..265e297 100644 --- a/src/tui/menurt.c +++ b/src/tui/menurt.c @@ -179,7 +179,7 @@ void tx_operatemenu(struct MENU *menu, int *position, int *aborted) { struct ITEM *itemptr; int row = *position; - int exitloop = 0; + int endloop = 0; int ch; char *keyptr;

@@ -240,9 +240,9 @@ void tx_operatemenu(struct MENU *menu, int *position, int *aborted) tx_refresh_screen(); break; case 13: - exitloop = 1; + endloop = 1; break; - /* case 27: exitloop = 1;*aborted = 1;row=menu->itemcount;break; */ + /* case 27: endloop = 1;*aborted = 1;row=menu->itemcount;break; */ case '^': break; /* ignore caret key */ default: @@ -250,10 +250,10 @@ void tx_operatemenu(struct MENU *menu, int *position, int *aborted) if ((keyptr != NULL) && keyptr - menu->shortcuts < menu->itemcount) { row = keyptr - menu->shortcuts + 1; - exitloop = 1; + endloop = 1; } } - } while (!(exitloop)); + } while (!endloop);

*position = row; /* position of executed option is in *position */ del_panel(menu->descpanel);

-- 1.7.8.4

Vitezslav Samel

6:39 p.m.

New subject: [PATCH 4/8] sanitize extern variables

diff --git a/src/deskman.h b/src/deskman.h index a5badee..a745f0c 100644 --- a/src/deskman.h +++ b/src/deskman.h @@ -6,6 +6,7 @@ */

void draw_desktop(void); +void about(void); void printipcerr(void); void printkeyhelp(char *keytext, char *desc, WINDOW * win, int highattr, int textattr); diff --git a/src/detstats.c b/src/detstats.c index e60f238..b707969 100644 --- a/src/detstats.c +++ b/src/detstats.c @@ -45,9 +45,6 @@ struct ifcounts { struct proto_counter other; };

-extern int exitloop; -extern int daemonized; - /* USR1 log-rotation signal handlers */ static void rotate_dstat_log(int s __unused) { diff --git a/src/error.c b/src/error.c index 45d8e8c..91fbd17 100644 --- a/src/error.c +++ b/src/error.c @@ -12,8 +12,6 @@ error.c - Error-handling subroutines #include "log.h" #include "tui/msgboxes.h"

-extern int daemonized; - void write_error(char *msg, ...) { va_list vararg; diff --git a/src/hostmon.c b/src/hostmon.c index 72b91f8..d3c4028 100644 --- a/src/hostmon.c +++ b/src/hostmon.c @@ -34,9 +34,6 @@ Discovers LAN hosts and displays packet statistics for them #define SCROLLUP 0 #define SCROLLDOWN 1

-extern int exitloop; -extern int daemonized; - struct ethtabent { int type; union { diff --git a/src/hostmon.h b/src/hostmon.h index 4f74d51..a943b21 100644 --- a/src/hostmon.h +++ b/src/hostmon.h @@ -4,6 +4,7 @@ #include "options.h" #include "fltselect.h"

+void convmacaddr(char *addr, char *result); void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr, struct filterstate *ofilter);

diff --git a/src/ifstats.c b/src/ifstats.c index d656d95..02c4f3a 100644 --- a/src/ifstats.c +++ b/src/ifstats.c @@ -65,9 +65,6 @@ struct iftab { PANEL *statpanel; };

-extern int exitloop; -extern int daemonized; - /* * USR1 log-rotation signal handlers */ diff --git a/src/instances.h b/src/instances.h index c2c87a4..47d1080 100644 --- a/src/instances.h +++ b/src/instances.h @@ -7,10 +7,6 @@ instances.h - header file for instances.c

***/

-#ifndef MAIN_MODULE -extern int is_first_instance; -#endif - void mark_facility(char *tagfile, char *facility, char *ifptr); void unmark_facility(char *tagfile, char *ifptr); int facility_active(char *tagfile, char *ifptr); diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h index 2d9da96..d252247 100644 --- a/src/iptraf-ng-compat.h +++ b/src/iptraf-ng-compat.h @@ -83,6 +83,9 @@ } \ } while (0)

+extern int is_first_instance; /* in iptraf.c */ +extern int daemonized; +extern int exitloop;

extern void *xmalloc(size_t size); extern void *xcalloc(size_t nmemb, size_t size); diff --git a/src/iptraf.c b/src/iptraf.c index b3412f2..11fbc42 100644 --- a/src/iptraf.c +++ b/src/iptraf.c @@ -6,8 +6,6 @@ IPTraf An IP Network Statistics Utility */

-#define MAIN_MODULE - #include "iptraf-ng-compat.h"

#include "tui/menurt.h" @@ -47,8 +45,6 @@ int facility_running = 0; int is_first_instance; char graphing_filter[80];

-extern void about(void); - static void press_enter_to_continue(void) { fprintf(stderr, "Press Enter to continue.\n"); diff --git a/src/itrafmon.c b/src/itrafmon.c index d8338d5..ce452ea 100644 --- a/src/itrafmon.c +++ b/src/itrafmon.c @@ -38,9 +38,6 @@ itrafmon.c - the IP traffic monitor module #define SCROLLUP 0 #define SCROLLDOWN 1

-extern int exitloop; -extern int daemonized; - static void rotate_ipmon_log(int s __unused) { rotate_flag = 1; @@ -491,7 +488,6 @@ static int checkrvnamed(void) { pid_t cpid = 0; int cstat; - extern int errno;

indicate("Trying to communicate with reverse lookup server"); if (!rvnamedactive()) { diff --git a/src/othptab.c b/src/othptab.c index 1181eb1..62ce73f 100644 --- a/src/othptab.c +++ b/src/othptab.c @@ -23,6 +23,7 @@ othptab.c - non-TCP protocol display module #include "servname.h" #include "addproto.h" #include "packet.h" +#include "hostmon.h"

#define MSGSTRING_MAX 240 #define SHORTSTRING_MAX 40 @@ -33,8 +34,6 @@ othptab.c - non-TCP protocol display module */ #define uninitialized_var(x) x = x

-void convmacaddr(char *addr, char *result); /* external; from hostmon.c */ - static void writeothplog(int logging, FILE *fd, char *protname, char *description, char *additional, int is_ip, int withmac, struct othptabent *entry) diff --git a/src/packet.c b/src/packet.c index f3e4304..c1baf3b 100644 --- a/src/packet.c +++ b/src/packet.c @@ -25,8 +25,6 @@ packet.c - routines to open the raw socket, read socket data and * Removed PPP, LINK_ISDN */

-extern int daemonized; - /* int isdnfd; struct isdntab isdntable; diff --git a/src/pktsize.c b/src/pktsize.c index af77ff5..03d92df 100644 --- a/src/pktsize.c +++ b/src/pktsize.c @@ -28,9 +28,6 @@ pktsize.c - the packet size breakdown facility #include "logvars.h" #include "promisc.h"

-extern int exitloop; -extern int daemonized; - struct ifstat_brackets { unsigned int floor; unsigned int ceil; diff --git a/src/serv.c b/src/serv.c index 9d29ff0..ea6435c 100644 --- a/src/serv.c +++ b/src/serv.c @@ -41,9 +41,6 @@ serv.c - TCP/UDP port statistics module #define LEFT 0 #define RIGHT 1

-extern int exitloop; -extern int daemonized; - struct serv_spans { int spanbr_in; int spanbr_out; diff --git a/src/tcptable.c b/src/tcptable.c index b0e5ccc..6012587 100644 --- a/src/tcptable.c +++ b/src/tcptable.c @@ -19,14 +19,13 @@ tcptable.c - table manipulation routines for the IP monitor #include "revname.h" #include "rvnamed.h" #include "servname.h" +#include "hostmon.h"

#define MSGSTRING_MAX 320

unsigned int bmaxy = 0; unsigned int imaxy = 0;

-void convmacaddr(char *addr, char *result); - static void setlabels(WINDOW *win, int mode) { wmove(win, 0, 42 * COLS / 80); diff --git a/src/tui/menurt.h b/src/tui/menurt.h index 0316cac..03c8b5a 100644 --- a/src/tui/menurt.h +++ b/src/tui/menurt.h @@ -45,13 +45,13 @@ struct MENU { char shortcuts[SHORTCUTSTRLEN_MAX]; };

-extern void tx_initmenu(struct MENU *menu, int y1, int x1, int y2, int x2, - int borderattr, int normalattr, int highattr, - int barnormalattr, int barhighattr, int descattr); -extern void tx_additem(struct MENU *menu, char *item, char *desc); -extern void tx_showitem(struct MENU *menu, struct ITEM *itemptr, int selected); -extern void tx_showmenu(struct MENU *menu); -extern void tx_operatemenu(struct MENU *menu, int *row, int *aborted); -extern void tx_destroymenu(struct MENU *menu); +void tx_initmenu(struct MENU *menu, int y1, int x1, int y2, int x2, + int borderattr, int normalattr, int highattr, + int barnormalattr, int barhighattr, int descattr); +void tx_additem(struct MENU *menu, char *item, char *desc); +void tx_showitem(struct MENU *menu, struct ITEM *itemptr, int selected); +void tx_showmenu(struct MENU *menu); +void tx_operatemenu(struct MENU *menu, int *row, int *aborted); +void tx_destroymenu(struct MENU *menu);

#endif /* IPTRAF_NG_TUI_MENURT_H */

-- 1.7.8.4

Vitezslav Samel

6:39 p.m.

New subject: [PATCH 5/8] removeaport(): fix segfault when there are no ports to remove

Signed-off-by: Vitezslav Samel vitezslav@samel.cz --- src/serv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/serv.c b/src/serv.c index ea6435c..8757436 100644 --- a/src/serv.c +++ b/src/serv.c @@ -1436,11 +1436,11 @@ static void delport(struct porttab **table, struct porttab *ptmp) void removeaport(struct porttab **table) { int aborted; - struct porttab *ptmp; + struct porttab *ptmp = NULL;

selectport(table, &ptmp, &aborted);

- if (!aborted) { + if (!aborted && ptmp) { delport(table, ptmp); saveportlist(*table); }

-- 1.7.8.4

Vitezslav Samel

6:39 p.m.

New subject: [PATCH 6/8] remove circular dependency between serv.h and options.h

diff --git a/src/iptraf.c b/src/iptraf.c index 11fbc42..a7335a5 100644 --- a/src/iptraf.c +++ b/src/iptraf.c @@ -132,7 +132,6 @@ static void program_interface(struct OPTIONS *options)

char ifname[IFNAMSIZ]; char *ifptr = NULL; - struct porttab *ports;

/* * Load saved filter or graphing filter if specified @@ -147,8 +146,6 @@ static void program_interface(struct OPTIONS *options) indicate(""); }

- loadaddports(&ports); - tx_initmenu(&menu, 15, 35, (LINES - 16) / 2, (COLS - 35) / 2, BOXATTR, STDATTR, HIGHATTR, BARSTDATTR, BARHIGHATTR, DESCATTR);

@@ -214,7 +211,7 @@ static void program_interface(struct OPTIONS *options) case 2: selectiface(ifname, WITHOUTALL, &aborted); if (!aborted) - servmon(ifname, ports, options, 0, + servmon(ifname, options, 0, &ofilter); break; case 4: @@ -237,7 +234,7 @@ static void program_interface(struct OPTIONS *options) savefilters(&ofilter); break; case 9: - setoptions(options, &ports); + setoptions(options); saveoptions(options); break; case 11: @@ -251,7 +248,6 @@ static void program_interface(struct OPTIONS *options)

tx_destroymenu(&menu);

- destroyporttab(ports); erase(); update_panels(); doupdate(); @@ -495,9 +491,7 @@ int main(int argc, char **argv)

struct filterstate ofilter; struct ffnode *fltfiles; - struct porttab *ports;

- loadaddports(&ports); /* * Load saved filter or graphing filter if specified */ @@ -534,7 +528,7 @@ int main(int argc, char **argv) else if (d_opt) detstats(d_opt, &options, facilitytime, &ofilter); else if (s_opt) - servmon(s_opt, ports, &options, facilitytime, &ofilter); + servmon(s_opt, &options, facilitytime, &ofilter); else if (z_opt) packet_size_breakdown(&options, z_opt, facilitytime, &ofilter); else diff --git a/src/options.c b/src/options.c index ee693de..fdbc608 100644 --- a/src/options.c +++ b/src/options.c @@ -246,7 +246,7 @@ static void settimeout(time_t *value, const char *units, int allow_zero, doupdate(); }

-void setoptions(struct OPTIONS *options, struct porttab **ports) +void setoptions(struct OPTIONS *options) { int row = 1; int trow = 1; /* row for timer submenu */ @@ -258,12 +258,17 @@ void setoptions(struct OPTIONS *options, struct porttab **ports) WINDOW *statwin; PANEL *statpanel;

+ struct porttab *ports; + if (!is_first_instance) { tui_error(ANYKEY_MSG, "Only the first instance of ipraf-ng" " can configure"); return; } + + loadaddports(&ports); + makeoptionmenu(&menu);

statwin = newwin(15, 35, (LINES - 19) / 2 - 1, (COLS - 40) / 16 + 40); @@ -365,10 +370,10 @@ void setoptions(struct OPTIONS *options, struct porttab **ports) doupdate(); break; case 12: - addmoreports(ports); + addmoreports(&ports); break; case 13: - removeaport(ports); + removeaport(&ports); break; case 15: manage_eth_desc(ARPHRD_ETHER); @@ -381,6 +386,7 @@ void setoptions(struct OPTIONS *options, struct porttab **ports) indicatesetting(row, options, statwin); } while (row != 18);

+ destroyporttab(ports); tx_destroymenu(&menu); del_panel(statpanel); delwin(statwin); diff --git a/src/options.h b/src/options.h index f43c90b..c997f44 100644 --- a/src/options.h +++ b/src/options.h @@ -12,9 +12,7 @@ struct OPTIONS {

#define DEFAULT_UPDATE_DELAY 50000 /* usec screen delay if update rate 0 */

-#include "serv.h" - -void setoptions(struct OPTIONS *options, struct porttab **ports); +void setoptions(struct OPTIONS *options); void loadoptions(struct OPTIONS *options); void saveoptions(struct OPTIONS *options);

diff --git a/src/serv.c b/src/serv.c index 8757436..b64acec 100644 --- a/src/serv.c +++ b/src/serv.c @@ -789,7 +789,7 @@ static void update_serv_rates(struct portlist *list, WINDOW * win, int actmode, * The TCP/UDP service monitor */

-void servmon(char *ifname, struct porttab *ports, const struct OPTIONS *options, +void servmon(char *ifname, const struct OPTIONS *options, time_t facilitytime, struct filterstate *ofilter) { int logging = options->logging; @@ -833,6 +833,8 @@ void servmon(char *ifname, struct porttab *ports, const struct OPTIONS *options,

int fd;

+ struct porttab *ports; + /* * Mark this facility */ @@ -850,6 +852,8 @@ void servmon(char *ifname, struct porttab *ports, const struct OPTIONS *options, return; }

+ loadaddports(&ports); + if ((first_active_facility()) && (options->promisc)) { init_promisc_list(&promisc_list); save_promisc_list(promisc_list); @@ -1172,6 +1176,7 @@ err: update_panels(); doupdate(); destroyportlist(&list); + destroyporttab(ports); pkt_cleanup(); strcpy(current_logfile, ""); } diff --git a/src/serv.h b/src/serv.h index b4e3101..78447ea 100644 --- a/src/serv.h +++ b/src/serv.h @@ -22,7 +22,7 @@ void removeaport(struct porttab **table); #include "options.h" #include "fltselect.h"

-void servmon(char *iface, struct porttab *ports, const struct OPTIONS *options, +void servmon(char *iface, const struct OPTIONS *options, time_t facilitytime, struct filterstate *ofilter);

#endif /* IPTRAF_NG_SERV_H */

-- 1.7.8.4

Vitezslav Samel

6:39 p.m.

New subject: [PATCH 7/8] remove unused #ifndef conditionals

Signed-off-by: Vitezslav Samel vitezslav@samel.cz --- src/iptraf.c | 5 ----- src/rvnamed.c | 4 ---- src/tui/input.c | 2 -- 3 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/src/iptraf.c b/src/iptraf.c index a7335a5..084385f 100644 --- a/src/iptraf.c +++ b/src/iptraf.c @@ -337,10 +337,8 @@ int main(int argc, char **argv) int command = 0; int current_log_interval = 0;

-#ifndef ALLOWUSERS if (geteuid() != 0) die("This program can be run only by the system administrator"); -#endif

/* * Parse command line @@ -464,10 +462,7 @@ int main(int argc, char **argv) noecho(); nonl(); cbreak(); - -#ifndef DEBUG curs_set(0); -#endif

/* * Set logfilename variable to NULL if -L was specified without an diff --git a/src/rvnamed.c b/src/rvnamed.c index 6171f17..0fe8ea7 100644 --- a/src/rvnamed.c +++ b/src/rvnamed.c @@ -208,7 +208,6 @@ int main(void)

/* Daemonization Sequence */

-#ifndef DEBUG switch (fork()) { case -1: exit(1); @@ -222,7 +221,6 @@ int main(void) int i = chdir("/");

(void) i; -#endif

signal(SIGCHLD, childreap);

@@ -358,7 +356,6 @@ int main(void) strlen(fromaddr.sun_path)); break; case RVN_QUIT: -#ifndef DEBUG writervnlog(logfile, "Received quit instruction"); writervnlog(logfile, "Closing sockets"); @@ -376,7 +373,6 @@ int main(void) "******** rvnamed terminated ********"); fclose(logfile); exit(0); -#endif case RVN_REQUEST: readyidx = name_resolved(&rvnpacket, hostlist, diff --git a/src/tui/input.c b/src/tui/input.c index e363722..b0742c3 100644 --- a/src/tui/input.c +++ b/src/tui/input.c @@ -84,9 +84,7 @@ void tx_getinput(struct FIELDLIST *list, struct FIELD *field, int *exitkey) do { ch = wgetch(list->fieldwin); switch (ch) { -#ifndef DISABLEBS case KEY_BACKSPACE: -#endif case 7: case 8: case KEY_DC:

-- 1.7.8.4

Vitezslav Samel

6:39 p.m.

New subject: [PATCH 8/8] use integer constant when dealing with integer variables

unow is "unsigned long long", so use 1000000ULL instead of 1e+06 (the last remaining leftover)

Signed-off-by: Vitezslav Samel vitezslav@samel.cz --- src/itrafmon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/itrafmon.c b/src/itrafmon.c index ce452ea..fe52dc2 100644 --- a/src/itrafmon.c +++ b/src/itrafmon.c @@ -746,7 +746,7 @@ void ipmon(struct OPTIONS *options, struct filterstate *ofilter,

gettimeofday(&tv, NULL); now = tv.tv_sec; - unow = tv.tv_sec * 1e+06 + tv.tv_usec; + unow = tv.tv_sec * 1000000ULL + tv.tv_usec;

/* * Print timer at bottom of screen

-- 1.7.8.4

Nikola Pajkovsky

29 May 29 May

3:21 p.m.

Vitezslav Samel vitezslav@samel.cz writes:

...

Vitezslav Samel (8): iptraf.c: remove unused code fltmgr.h: remove unneded IGNORE_FILTER_PROTOTYPES #ifdef rename local variable exitloop in tui/*.c to endloop sanitize extern variables removeaport(): fix segfault when there are no ports to remove remove circular dependency between serv.h and options.h remove unused #ifndef conditionals use integer constant when dealing with integer variables

src/deskman.h | 1 + src/detstats.c | 3 --- src/error.c | 2 -- src/fltmgr.h | 2 -- src/hostmon.c | 3 --- src/hostmon.h | 1 + src/ifstats.c | 3 --- src/instances.h | 4 ---- src/iptraf-ng-compat.h | 3 +++ src/iptraf.c | 27 +++------------------------ src/itrafmon.c | 6 +----- src/options.c | 12 +++++++++--- src/options.h | 4 +--- src/othptab.c | 3 +-- src/packet.c | 2 -- src/pktsize.c | 3 --- src/rvnamed.c | 4 ---- src/serv.c | 14 ++++++++------ src/serv.h | 2 +- src/tcptable.c | 3 +-- src/tui/input.c | 10 ++++------ src/tui/listbox.c | 8 ++++---- src/tui/menurt.c | 10 +++++----- src/tui/menurt.h | 16 ++++++++-------- 24 files changed, 51 insertions(+), 95 deletions(-)

applied. thanks.

-- Nikola

4494

Age (days ago)

4495

Last active (days ago)

iptraf-ng@lists.fedorahosted.org

9 comments

2 participants

tags (0)

participants (2)

Nikola Pajkovsky
Vitezslav Samel