diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:20:09 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:20:09 +0200 |
commit | bad63eb735b13e1f009a19af1dd810f7279c2ba1 (patch) | |
tree | 34bcc61fd5814931f3472a594802606316c888a8 /package/iptraf | |
parent | 57f1ccba214ee4d658fe2bcd61ef51651ade3225 (diff) |
gcc 4.4 compatibility patches
* add the rest of the patches missed by the last commit
Diffstat (limited to 'package/iptraf')
-rw-r--r-- | package/iptraf/patches/patch-src_bar_c | 12 | ||||
-rw-r--r-- | package/iptraf/patches/patch-src_ifstats_c | 30 | ||||
-rw-r--r-- | package/iptraf/patches/patch-src_ipfrag_c | 12 | ||||
-rw-r--r-- | package/iptraf/patches/patch-src_iptraf_c | 12 | ||||
-rw-r--r-- | package/iptraf/patches/patch-src_revname_c | 12 | ||||
-rw-r--r-- | package/iptraf/patches/patch-src_rvnamed_c | 39 | ||||
-rw-r--r-- | package/iptraf/patches/patch-src_serv_c | 12 | ||||
-rw-r--r-- | package/iptraf/patches/patch-src_servname_c | 12 | ||||
-rw-r--r-- | package/iptraf/patches/patch-src_tr_c | 12 | ||||
-rw-r--r-- | package/iptraf/patches/patch-support_input_c | 12 | ||||
-rw-r--r-- | package/iptraf/patches/patch-support_listbox_c | 21 |
11 files changed, 186 insertions, 0 deletions
diff --git a/package/iptraf/patches/patch-src_bar_c b/package/iptraf/patches/patch-src_bar_c new file mode 100644 index 000000000..09ca6aef0 --- /dev/null +++ b/package/iptraf/patches/patch-src_bar_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/bar.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/bar.c 2009-05-21 23:04:49.000000000 +0200 +@@ -26,7 +26,7 @@ void set_barptr(char **barptr, char *ent + { + *barptr = entry; + *starttime = time(NULL); +- bzero(spanbr, size); ++ memset(spanbr, 0, size); + + if (!(*cleared)) { + wattrset(win, IPSTATATTR); diff --git a/package/iptraf/patches/patch-src_ifstats_c b/package/iptraf/patches/patch-src_ifstats_c new file mode 100644 index 000000000..555c93075 --- /dev/null +++ b/package/iptraf/patches/patch-src_ifstats_c @@ -0,0 +1,30 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/ifstats.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/ifstats.c 2009-05-21 23:05:17.000000000 +0200 +@@ -167,7 +167,7 @@ void initiflist(struct iflist **list) + */ + + itmp = malloc(sizeof(struct iflist)); +- bzero(itmp, sizeof(struct iflist)); ++ memset(itmp, 0, sizeof(struct iflist)); + strcpy(itmp->ifname, ifname); + index++; + itmp->index = index; +@@ -208,7 +208,7 @@ void positionptr(struct iftab *table, st + + if (*ptmp == NULL) { + *ptmp = malloc(sizeof(struct iflist)); +- bzero(*ptmp, sizeof(struct iflist)); ++ memset(*ptmp, 0, sizeof(struct iflist)); + (*ptmp)->index = plast->index + 1; + plast->next_entry = *ptmp; + (*ptmp)->prev_entry = plast; +@@ -879,7 +879,7 @@ void detstats(char *iface, const struct + update_panels(); + doupdate(); + +- bzero(&totals, sizeof(struct iftotals)); ++ memset(&totals, 0, sizeof(struct iftotals)); + + if (logging) { + if (strcmp(current_logfile, "") == 0) { diff --git a/package/iptraf/patches/patch-src_ipfrag_c b/package/iptraf/patches/patch-src_ipfrag_c new file mode 100644 index 000000000..2482cfaa6 --- /dev/null +++ b/package/iptraf/patches/patch-src_ipfrag_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/ipfrag.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/ipfrag.c 2009-05-21 23:04:36.000000000 +0200 +@@ -51,7 +51,7 @@ struct fragent *addnewdgram(struct iphdr + fragtail->next_entry = ptmp; + ptmp->prev_entry = fragtail; + } +- bzero(ptmp, sizeof(struct fragent)); ++ memset(ptmp, 0, sizeof(struct fragent)); + ptmp->fragdesclist = malloc(sizeof(struct fragdescent)); + ptmp->fragdesclist->min = 0; + ptmp->fragdesclist->max = 65535; diff --git a/package/iptraf/patches/patch-src_iptraf_c b/package/iptraf/patches/patch-src_iptraf_c new file mode 100644 index 000000000..a9d751c46 --- /dev/null +++ b/package/iptraf/patches/patch-src_iptraf_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/iptraf.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/iptraf.c 2009-05-21 23:02:08.000000000 +0200 +@@ -559,7 +559,7 @@ int main(int argc, char **argv) + exit(1); + } else if (opt != -1) { + if (optarg != 0) { +- bzero(keyparm, 12); ++ memset(keyparm, 0, 12); + strncpy(keyparm, optarg, 11); + } else + strcpy(keyparm, ""); diff --git a/package/iptraf/patches/patch-src_revname_c b/package/iptraf/patches/patch-src_revname_c new file mode 100644 index 000000000..97aae6f8c --- /dev/null +++ b/package/iptraf/patches/patch-src_revname_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/revname.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/revname.c 2009-05-21 23:03:07.000000000 +0200 +@@ -164,7 +164,7 @@ int revname(int *lookup, struct in_addr + struct timeval tv; + int sstat = 0; + +- bzero(target, 45); ++ memset(target, 0, 45); + if (*lookup) { + if (rvnfd > 0) { + su.sun_family = AF_UNIX; diff --git a/package/iptraf/patches/patch-src_rvnamed_c b/package/iptraf/patches/patch-src_rvnamed_c new file mode 100644 index 000000000..0b146369c --- /dev/null +++ b/package/iptraf/patches/patch-src_rvnamed_c @@ -0,0 +1,39 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/rvnamed.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/rvnamed.c 2009-05-21 23:03:43.000000000 +0200 +@@ -99,7 +99,7 @@ void process_rvn_packet(struct rvn *rvnp + if (he == NULL) + strcpy(rvnpacket->fqdn, inet_ntoa(rvnpacket->saddr)); + else { +- bzero(rvnpacket->fqdn, 45); ++ memset(rvnpacket->fqdn, 0, 45); + strncpy(rvnpacket->fqdn, he->h_name, 44); + } + +@@ -306,7 +306,7 @@ int main(void) + } + + if (hi == lastfree) { /* Address not in cache */ +- bzero(&(hostlist[hi]), sizeof(struct hosts)); ++ memset(&(hostlist[hi]), 0, sizeof(struct hosts)); + hi = hostindex; + hostindex++; + if (hostindex == NUM_CACHE_ENTRIES) +@@ -359,7 +359,7 @@ int main(void) + name_resolved(&rvnpacket, hostlist, lastfree); + if (readyidx >= 0) { + rvnpacket.type = RVN_REPLY; +- bzero(rvnpacket.fqdn, 45); ++ memset(rvnpacket.fqdn, 0, 45); + strncpy(rvnpacket.fqdn, hostlist[readyidx].fqdn, + 44); + rvnpacket.ready = RESOLVED; +@@ -454,7 +454,7 @@ int main(void) + } + } + rvnpacket.type = RVN_REPLY; +- bzero(rvnpacket.fqdn, 45); ++ memset(rvnpacket.fqdn, 0, 45); + strcpy(rvnpacket.fqdn, inet_ntoa(rvnpacket.saddr)); + rvnpacket.ready = RESOLVING; + diff --git a/package/iptraf/patches/patch-src_serv_c b/package/iptraf/patches/patch-src_serv_c new file mode 100644 index 000000000..7d1911924 --- /dev/null +++ b/package/iptraf/patches/patch-src_serv_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/serv.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/serv.c 2009-05-21 23:04:11.000000000 +0200 +@@ -713,7 +713,7 @@ void update_serv_rates(struct portlist * + mvwprintw(win, 0, 46, "%10.2f", outrate); + mvwprintw(win, 0, 61, "%10.2f", totalrate); + +- bzero(&(list->barptr->spans), sizeof(struct serv_spans)); ++ memset(&(list->barptr->spans), 0, sizeof(struct serv_spans)); + list->barptr->starttime = time(NULL); + *cleared = 0; + } diff --git a/package/iptraf/patches/patch-src_servname_c b/package/iptraf/patches/patch-src_servname_c new file mode 100644 index 000000000..d0e37bb80 --- /dev/null +++ b/package/iptraf/patches/patch-src_servname_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/servname.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/servname.c 2009-05-21 23:04:24.000000000 +0200 +@@ -27,7 +27,7 @@ void servlook(int servnames, unsigned in + { + static struct servent *sve; + +- bzero(target, maxlen + 1); ++ memset(target, 0, maxlen + 1); + + if (servnames) { + if (protocol == IPPROTO_TCP) diff --git a/package/iptraf/patches/patch-src_tr_c b/package/iptraf/patches/patch-src_tr_c new file mode 100644 index 000000000..391c26e6c --- /dev/null +++ b/package/iptraf/patches/patch-src_tr_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/src/tr.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.0/src/tr.c 2009-05-21 22:59:57.000000000 +0200 +@@ -6,7 +6,7 @@ + * Copyright (c) Gerard Paul Java 2002 + */ + +-#include <asm/types.h> ++#include <sys/types.h> + #include <linux/if_tr.h> + #include <netinet/in.h> + diff --git a/package/iptraf/patches/patch-support_input_c b/package/iptraf/patches/patch-support_input_c new file mode 100644 index 000000000..733b564db --- /dev/null +++ b/package/iptraf/patches/patch-support_input_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/support/input.c 2002-12-26 03:11:22.000000000 +0100 ++++ iptraf-3.0.0/support/input.c 2009-05-21 23:05:37.000000000 +0200 +@@ -55,7 +55,7 @@ void tx_addfield(struct FIELDLIST *list, + newfield->len = len; + newfield->tlen = strlen(initstr); + newfield->buf = malloc(len + 1); +- bzero(newfield->buf, len + 1); ++ memset(newfield->buf, 0, len + 1); + strncpy(newfield->buf, initstr, len); + + if (newfield->tlen > (len)) diff --git a/package/iptraf/patches/patch-support_listbox_c b/package/iptraf/patches/patch-support_listbox_c new file mode 100644 index 000000000..df5521b7f --- /dev/null +++ b/package/iptraf/patches/patch-support_listbox_c @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iptraf-3.0.0.orig/support/listbox.c 2002-07-19 18:48:11.000000000 +0200 ++++ iptraf-3.0.0/support/listbox.c 2009-05-21 23:06:00.000000000 +0200 +@@ -19,7 +19,7 @@ void tx_init_listbox(struct scroll_list + int mainattr, int borderattr, int selectattr, + int keyattr) + { +- bzero(list, sizeof(struct scroll_list)); ++ memset(list, 0, sizeof(struct scroll_list)); + list->borderwin = newwin(height, width, starty, startx); + list->borderpanel = new_panel(list->borderwin); + wattrset(list->borderwin, borderattr); +@@ -50,7 +50,7 @@ void tx_add_list_entry(struct scroll_lis + struct textlisttype *ptmp; + + ptmp = malloc(sizeof(struct textlisttype)); +- bzero(ptmp, sizeof(struct textlisttype)); ++ memset(ptmp, 0, sizeof(struct textlisttype)); + + strncpy(ptmp->text, text, MAX_TEXT_LENGTH); + ptmp->nodeptr = node; |