diff options
Diffstat (limited to 'netrom')
-rw-r--r-- | netrom/netromd.c | 13 | ||||
-rw-r--r-- | netrom/netromr.c | 15 | ||||
-rw-r--r-- | netrom/netromt.c | 18 | ||||
-rw-r--r-- | netrom/nodesave.c | 3 | ||||
-rw-r--r-- | netrom/nrattach.c | 33 | ||||
-rw-r--r-- | netrom/nrparms.c | 9 | ||||
-rw-r--r-- | netrom/nrsdrv.c | 15 |
7 files changed, 71 insertions, 35 deletions
diff --git a/netrom/netromd.c b/netrom/netromd.c index 13737d8..dccba71 100644 --- a/netrom/netromd.c +++ b/netrom/netromd.c @@ -57,13 +57,15 @@ static int bcast_config_load_ports(void) char buffer[255], port[32], *s; FILE *fp; - if ((fp = fopen(CONF_NETROMD_FILE, "r")) == NULL) { + fp = fopen(CONF_NETROMD_FILE, "r"); + if (fp == NULL) { fprintf(stderr, "netromd: cannot open config file\n"); return -1; } while (fgets(buffer, 255, fp) != NULL) { - if ((s = strchr(buffer, '\n')) != NULL) + s = strchr(buffer, '\n'); + if (s != NULL) *s = '\0'; if (strlen(buffer) == 0 || buffer[0] == '#') @@ -198,7 +200,8 @@ int main(int argc, char **argv) ax25_aton_entry(nr_config_get_addr(NULL), (char *)&my_call); ax25_aton_entry("NODES", (char *)&node_call); - if ((s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_AX25))) == -1) { + s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_AX25)); + if (s == -1) { perror("netromd: socket"); return 1; } @@ -226,7 +229,9 @@ int main(int argc, char **argv) if (FD_ISSET(s, &fdset)) { asize = sizeof(sa); - if ((size = recvfrom(s, buffer, sizeof(buffer), 0, &sa, &asize)) == -1) { + size = recvfrom(s, buffer, sizeof(buffer), 0, &sa, + &asize); + if (size == -1) { if (logging) { syslog(LOG_ERR, "recvfrom: %m"); closelog(); diff --git a/netrom/netromr.c b/netrom/netromr.c index 63ac2bd..ccf6cd2 100644 --- a/netrom/netromr.c +++ b/netrom/netromr.c @@ -73,7 +73,8 @@ static int add_node(int s, unsigned char *buffer, struct nr_route_struct *nr_nod best_quality = buffer[20]; nr_node->mnemonic[MNEMONIC_LEN] = '\0'; - if ((p = strchr(nr_node->mnemonic, ' ')) != NULL) + p = strchr(nr_node->mnemonic, ' '); + if (p != NULL) *p = '\0'; if (!validcallsign(&nr_node->callsign)) { @@ -147,7 +148,8 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i sprintf(neigh_buffer, "%s/obsolescence_count_initialiser", PROC_NR_SYSCTL_DIR); - if ((fp = fopen(neigh_buffer, "r")) == NULL) { + fp = fopen(neigh_buffer, "r"); + if (fp == NULL) { if (logging) syslog(LOG_ERR, "netromr: cannot open %s\n", neigh_buffer); return; @@ -159,13 +161,15 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i fclose(fp); - if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) { + s = socket(AF_NETROM, SOCK_SEQPACKET, 0); + if (s < 0) { if (logging) syslog(LOG_ERR, "netromr: socket: %m"); return; } - if ((fp = fopen(PROC_NR_NEIGH_FILE, "r")) == NULL) { + fp = fopen(PROC_NR_NEIGH_FILE, "r"); + if (fp == NULL) { if (logging) syslog(LOG_ERR, "netromr: cannot open %s\n", PROC_NR_NEIGH_FILE); close(s); @@ -199,7 +203,8 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i memcpy(nr_node.mnemonic, buffer, MNEMONIC_LEN); nr_node.mnemonic[MNEMONIC_LEN] = '\0'; - if ((p = strchr(nr_node.mnemonic, ' ')) != NULL) + p = strchr(nr_node.mnemonic, ' '); + if (p != NULL) *p = '\0'; if (!validmnemonic(nr_node.mnemonic)) { diff --git a/netrom/netromt.c b/netrom/netromt.c index bd51682..4c98f43 100644 --- a/netrom/netromt.c +++ b/netrom/netromt.c @@ -42,14 +42,16 @@ static void build_mine(int s, struct full_sockaddr_ax25 *dest, int dlen, int loc len = build_header(message); - if ((fp = fopen(CONF_NRPORTS_FILE, "r")) == NULL) { + fp = fopen(CONF_NRPORTS_FILE, "r"); + if (fp == NULL) { if (logging) syslog(LOG_ERR, "netromt: cannot open nrports file\n"); return; } while (fgets(buffer, 255, fp) != NULL) { - if ((p = strchr(buffer, '\n')) != NULL) + p = strchr(buffer, '\n'); + if (p != NULL) *p = '\0'; if (strlen(buffer) == 0 || buffer[0] == '#') @@ -102,13 +104,15 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in int quality, neigh_no, obs_count; int olen, len; - if ((fpnodes = fopen(PROC_NR_NODES_FILE, "r")) == NULL) { + fpnodes = fopen(PROC_NR_NODES_FILE, "r"); + if (fpnodes == NULL) { if (logging) syslog(LOG_ERR, "netromt: cannot open %s\n", PROC_NR_NODES_FILE); return; } - if ((fpneigh = fopen(PROC_NR_NEIGH_FILE, "r")) == NULL) { + fpneigh = fopen(PROC_NR_NEIGH_FILE, "r"); + if (fpneigh == NULL) { if (logging) syslog(LOG_ERR, "netromt: cannot open %s\n", PROC_NR_NEIGH_FILE); fclose(fpnodes); @@ -232,7 +236,8 @@ void transmit_nodes(int localval, int pause) ax25_aton(path, &src); slen = sizeof(struct full_sockaddr_ax25); - if ((s = socket(AF_AX25, SOCK_DGRAM, NETROM_PID)) < 0) { + s = socket(AF_AX25, SOCK_DGRAM, NETROM_PID); + if (s < 0) { if (logging) syslog(LOG_ERR, "netromt: socket: %m"); continue; @@ -253,7 +258,8 @@ void transmit_nodes(int localval, int pause) close(s); } - if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) { + s = socket(AF_NETROM, SOCK_SEQPACKET, 0); + if (s < 0) { if (logging) syslog(LOG_ERR, "netromt: socket: %m"); exit(1); diff --git a/netrom/nodesave.c b/netrom/nodesave.c index c5f1487..4e8a7bf 100644 --- a/netrom/nodesave.c +++ b/netrom/nodesave.c @@ -61,7 +61,8 @@ int main(int argc, char **argv) } if ((argc - optind) == 1) { - if ((fp = fopen(argv[optind], "w")) == NULL) { + fp = fopen(argv[optind], "w"); + if (fp == NULL) { fprintf(stderr, "nodesave: cannot open file %s\n", argv[optind]); return 1; } diff --git a/netrom/nrattach.c b/netrom/nrattach.c index 66c85a0..3632836 100644 --- a/netrom/nrattach.c +++ b/netrom/nrattach.c @@ -37,7 +37,8 @@ static int readconfig(char *port) char buffer[90], *s; int n = 0; - if ((fp = fopen(CONF_NRPORTS_FILE, "r")) == NULL) { + fp = fopen(CONF_NRPORTS_FILE, "r"); + if (fp == NULL) { fprintf(stderr, "nrattach: cannot open nrports file\n"); return FALSE; } @@ -45,13 +46,15 @@ static int readconfig(char *port) while (fgets(buffer, 90, fp) != NULL) { n++; - if ((s = strchr(buffer, '\n')) != NULL) + s = strchr(buffer, '\n'); + if (s != NULL) *s = '\0'; if (strlen(buffer) > 0 && *buffer == '#') continue; - if ((s = strtok(buffer, " \t\r\n")) == NULL) { + s = strtok(buffer, " \t\r\n"); + if (s == NULL) { fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n); return FALSE; } @@ -59,25 +62,29 @@ static int readconfig(char *port) if (strcmp(s, port) != 0) continue; - if ((s = strtok(NULL, " \t\r\n")) == NULL) { + s = strtok(NULL, " \t\r\n"); + if (s == NULL) { fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n); return FALSE; } callsign = strdup(s); - if ((s = strtok(NULL, " \t\r\n")) == NULL) { + s = strtok(NULL, " \t\r\n"); + if (s == NULL) { fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n); return FALSE; } - if ((s = strtok(NULL, " \t\r\n")) == NULL) { + s = strtok(NULL, " \t\r\n"); + if (s == NULL) { fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n); return FALSE; } if (mtu == 0) { - if ((mtu = atoi(s)) <= 0) { + mtu = atoi(s); + if (mtu <= 0) { fprintf(stderr, "nrattach: invalid paclen setting\n"); return FALSE; } @@ -101,7 +108,8 @@ static int getfreedev(char *dev) int fd; int i; - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) { perror("nrattach: socket"); return FALSE; } @@ -132,7 +140,8 @@ static int startiface(char *dev, struct hostent *hp) char call[7]; int fd; - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + fd = socket(AF_INET, SOCK_DGRAM, 0); + if (fd < 0) { perror("nrattach: socket"); return FALSE; } @@ -203,13 +212,15 @@ int main(int argc, char *argv[]) while ((fd = getopt(argc, argv, "i:m:v")) != -1) { switch (fd) { case 'i': - if ((hp = gethostbyname(optarg)) == NULL) { + hp = gethostbyname(optarg); + if (hp == NULL) { fprintf(stderr, "nrattach: invalid internet name/address - %s\n", optarg); return 1; } break; case 'm': - if ((mtu = atoi(optarg)) <= 0) { + mtu = atoi(optarg); + if (mtu <= 0) { fprintf(stderr, "nrattach: invalid mtu size - %s\n", optarg); return 1; } diff --git a/netrom/nrparms.c b/netrom/nrparms.c index 5583dd8..9c6a5d2 100644 --- a/netrom/nrparms.c +++ b/netrom/nrparms.c @@ -98,7 +98,8 @@ static void nodes(int s, char *nodecall, char *op, char *ident, int quality, nr_node.ndigis++; } - if ((dev = ax25_config_get_dev(port)) == NULL) { + dev = ax25_config_get_dev(port); + if (dev == NULL) { fprintf(stderr, "nrparms: nodes: invalid port name - %s\n", port); close(s); exit(1); @@ -162,7 +163,8 @@ static void routes(int s, char *port, char *nodecall, char *rest[]) exit(1); } - if ((dev = ax25_config_get_dev(port)) == NULL) { + dev = ax25_config_get_dev(port); + if (dev == NULL) { fprintf(stderr, "nrparms: routes: invalid port name - %s\n", port); close(s); exit(1); @@ -207,7 +209,8 @@ int main(int argc, char *argv[]) return 0; } - if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) { + s = socket(AF_NETROM, SOCK_SEQPACKET, 0); + if (s < 0) { perror("nrparms: socket"); return 1; } diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index 90b7635..a026cb8 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -321,7 +321,8 @@ int main(int argc, char *argv[]) logging = TRUE; break; case 's': - if ((speed = atoi(optarg)) <= 0) { + speed = atoi(optarg); + if (speed <= 0) { fprintf(stderr, "nrsdrv: invalid speed %s\n", optarg); return 1; } @@ -359,12 +360,14 @@ int main(int argc, char *argv[]) return 1; } - if ((kissfd = open(kissdev, O_RDWR)) == -1) { + kissfd = open(kissdev, O_RDWR); + if (kissfd == -1) { perror("nrsdrv: open kiss device"); return 1; } - if ((nrsfd = open(nrsdev, O_RDWR)) == -1) { + nrsfd = open(nrsdev, O_RDWR); + if (nrsfd == -1) { perror("nrsdrv: open nrs device"); return 1; } @@ -429,7 +432,8 @@ int main(int argc, char *argv[]) n = select(c, &read_fd, NULL, NULL, NULL); if (FD_ISSET(kissfd, &read_fd)) { - if ((n = read(kissfd, buffer, 512)) <= 0) { + n = read(kissfd, buffer, 512); + if (n <= 0) { if (logging) { syslog(LOG_INFO, "terminating on KISS device closure\n"); closelog(); @@ -440,7 +444,8 @@ int main(int argc, char *argv[]) } if (FD_ISSET(nrsfd, &read_fd)) { - if ((n = read(nrsfd, buffer, 512)) <= 0) { + n = read(nrsfd, buffer, 512); + if (n <= 0) { if (logging) { syslog(LOG_INFO, "terminating on NRS device closure\n"); closelog(); |