github.com/PDP-10.klh10
1
0
Fork 0
mirror of https://github.com/PDP-10/klh10.git synced 2026-01-11 23:52:54 +00:00
Code Issues Releases Wiki Activity

Fix some more -Wall warnings

Browse Source 
(but there are many many more to go...)
This commit is contained in:
Olaf Seibert 2020-03-28 16:33:42 +01:00
parent f5e506cc10
commit ff749f6d2e
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dpimp.c
View File

@ -637,7 +637,7 @@ void
net_init(struct dpimp_s *dpimp)
{
struct ifreq ifr;
char *ifnam_for_ipaddr; /* which interface to ask IP addr/netmask */
char *ifnam_for_ipaddr = NULL;/* which interface to ask IP addr/netmask */
if (osn_iftab_init() <= 0)
esfatal(0, "Couldn't find interface information");
@ -824,7 +824,6 @@ struct bpf_program *
pfbuild(void *arg, struct in_addr *ipa)
{
struct dpimp_s *dpimp = (struct dpimp_s *)arg;
unsigned char *ucp = (unsigned char *)ipa;
struct bpf_program *pfp = &bpf_pfilter;
struct bpf_insn *p;
@ -1183,12 +1182,11 @@ arp_req(struct in_addr *ipa)
static int ethbuild = 0, arpbuild = 0;
static struct eth_header eh;
static struct offset_ether_arp arp;
struct arpent *at;
struct ether_addr ea;
/* Store request in cache */
memset((char *)&ea, 0, sizeof(ea));
at = arp_tnew(*ipa, &ea, 0); /* Say incomplete with 0 flag */
arp_tnew(*ipa, &ea, 0); /* Say incomplete with 0 flag */
/* Build ethernet header if haven't already */
if (!ethbuild) {
@ -1711,6 +1709,8 @@ hosttoimp(struct dpimp_s *dpimp)
kill(cpupid, swurgsig); /* Wake host (cpu) up */
}
# endif
#else
(void)res;
#endif
break;

18
src/osdnet.c
View File

@ -163,7 +163,6 @@ ip_adrsprint(char *cp, unsigned char *ia)
/* Our own internal table of interface entries.
*/
static int iftab_initf = 0;
static int iftab_nifs = 0;
static struct ifent iftab[NETIFC_MAX];
@ -449,6 +448,9 @@ osn_iflookup(char *ifnam)
int i = 0;
struct ifent *ife = iftab;
if (!ifnam)
return NULL;
for (; i < iftab_nifs; ++i, ++ife)
if (strcmp(ifnam, ife->ife_name) == 0)
return ife;
@ -895,7 +897,7 @@ osn_ifeaget2(char *ifnam, /* Interface name */
}
static struct eth_addr emguest_ea = /* Emulated guest ether addr for tap */
{ 0xf2, 0x0b, 0xa4, 0xff, 0xff, 0xff };
{{ 0xf2, 0x0b, 0xa4, 0xff, 0xff, 0xff }};
static
void
@ -918,8 +920,6 @@ osn_pfeaget(struct pfdata *pfdata, /* Packetfilter data */
char *ifnam, /* Interface name (sometimes needed) */
unsigned char *eap) /* Where to write ether address */
{
int fd = pfdata->pf_fd;
if (pfdata->pf_meth == PF_METH_TAP ||
pfdata->pf_meth == PF_METH_VDE) {
@ -1331,8 +1331,6 @@ osn_ifmcset(struct pfdata *pfdata,
}
} else {
/* Doing promiscuous stuff */
int flags;
if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
syserr(errno, "SIOCGIFFLAGS failed for interface \"%s\"", ifnam);
goto bad;
@ -2056,9 +2054,7 @@ pfopen_create(char *basename, struct tuntap_context *tt_ctx, struct osnpf *osnpf
int tapfd;
int res;
char cmdbuff[128];
struct ifent *ife;
int s;
int i;
char *ifnam = osnpf->osnpf_ifnam;
if (DP_DBGFLG)
@ -2172,16 +2168,16 @@ void
tap_bridge_close(struct tuntap_context *tt_ctx)
{
if (tt_ctx->my_tap) {
int s, res;
int s;
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
esfatal(1, "tap_bridge_close: socket() failed");
}
/* Destroy bridge */
res = ioctl(s, SIOCIFDESTROY, &tt_ctx->br_ifr);
ioctl(s, SIOCIFDESTROY, &tt_ctx->br_ifr);
/* Destroy tap */
res = ioctl(s, SIOCIFDESTROY, &tt_ctx->tap_ifr);
ioctl(s, SIOCIFDESTROY, &tt_ctx->tap_ifr);
close(s);
}