From 1245fbd2a8d60bab7b16b8a1d3c0122fee72f53f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 00:57:38 +0200 Subject: Nuke trailing whitespace. Signed-off-by: Ralf Baechle --- netrom/Makefile.am | 6 +++--- netrom/netrom.4 | 2 +- netrom/netromd.c | 26 +++++++++++++------------- netrom/netromr.c | 6 +++--- netrom/netromt.c | 14 +++++++------- netrom/nrattach.c | 40 ++++++++++++++++++++-------------------- netrom/nrparms.c | 16 ++++++++-------- netrom/nrsdrv.c | 20 ++++++++++---------- 8 files changed, 65 insertions(+), 65 deletions(-) (limited to 'netrom') diff --git a/netrom/Makefile.am b/netrom/Makefile.am index ffc3984..97e1741 100644 --- a/netrom/Makefile.am +++ b/netrom/Makefile.am @@ -1,5 +1,5 @@ -etcfiles = nrbroadcast +etcfiles = nrbroadcast installconf: $(mkinstalldirs) $(DESTDIR)$(AX25_SYSCONFDIR) @@ -22,11 +22,11 @@ netromd_SOURCES = \ netromd.c \ netromd.h \ netromr.c \ - netromt.c + netromt.c INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=${sysconfdir}/ax25/ AX25_LOCALSTATEDIR=${localstatedir}/ax25/ diff --git a/netrom/netrom.4 b/netrom/netrom.4 index cceae77..a472972 100644 --- a/netrom/netrom.4 +++ b/netrom/netrom.4 @@ -27,7 +27,7 @@ NET/ROM has some unusual properties. Notably in a multi-user system an AX.25 address is often associated with a user, and some users may not have such an association. a set of ioctl calls are provided to manage an association table. -.LP +.LP NET/ROM supports the following socket options for SOL_NETROM. NETROM_T1 is the T1 timer in 1/10ths of a second, NETROM_T2 is the T2 timer in 1/10ths of a second. NETROM_N2, the retry counter is also configurable. There is no 'infinite diff --git a/netrom/netromd.c b/netrom/netromd.c index e7a0362..a78db4b 100644 --- a/netrom/netromd.c +++ b/netrom/netromd.c @@ -17,7 +17,7 @@ #include -#ifdef __GLIBC__ +#ifdef __GLIBC__ #include #else #include @@ -51,7 +51,7 @@ static void terminate(int sig) syslog(LOG_INFO, "terminating on SIGTERM\n"); closelog(); } - + exit(0); } @@ -59,12 +59,12 @@ static int bcast_config_load_ports(void) { char buffer[255], port[32], *s; FILE *fp; - + if ((fp = fopen(CONF_NETROMD_FILE, "r")) == NULL) { fprintf(stderr, "netromd: cannot open config file\n"); return -1; } - + while (fgets(buffer, 255, fp) != NULL) { if ((s = strchr(buffer, '\n')) != NULL) *s = '\0'; @@ -109,16 +109,16 @@ static int bcast_config_load_ports(void) fprintf(stderr, "netromd: invalid verbose setting\n"); return -1; } - + port_count++; } - + fclose(fp); if (port_count == 0) return -1; - - return 0; + + return 0; } int main(int argc, char **argv) @@ -187,7 +187,7 @@ int main(int argc, char **argv) fprintf(stderr, "netromd: no AX.25 ports defined\n"); return 1; } - + if (nr_config_load_ports() == 0) { fprintf(stderr, "netromd: no NET/ROM ports defined\n"); return 1; @@ -200,7 +200,7 @@ 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) { perror("netromd: socket"); return 1; @@ -210,7 +210,7 @@ int main(int argc, char **argv) fprintf(stderr, "netromd: cannot become a daemon\n"); return 1; } - + if (logging) { openlog("netromd", LOG_PID, LOG_DAEMON); syslog(LOG_INFO, "starting"); @@ -222,7 +222,7 @@ int main(int argc, char **argv) timeout.tv_sec = 30; timeout.tv_usec = 0; - + if (select(s + 1, &fdset, NULL, NULL, &timeout) == -1) continue; /* Signal received ? */ @@ -238,7 +238,7 @@ int main(int argc, char **argv) } if (ax25_cmp((ax25_address *)(buffer + 1), &node_call) == 0 && - ax25_cmp((ax25_address *)(buffer + 8), &my_call) != 0 && + ax25_cmp((ax25_address *)(buffer + 8), &my_call) != 0 && buffer[16] == NETROM_PID && buffer[17] == NODES_SIG) { for (i = 0; i < port_count; i++) { if (strcmp(port_list[i].device, sa.sa_data) == 0) { diff --git a/netrom/netromr.c b/netrom/netromr.c index 9ed716f..3cbaeb4 100644 --- a/netrom/netromr.c +++ b/netrom/netromr.c @@ -14,7 +14,7 @@ #include #include -#ifdef __GLIBC__ +#ifdef __GLIBC__ #include #else #include @@ -160,7 +160,7 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i } fgets(neigh_buffer, 90, fp); - + obs_count = atoi(neigh_buffer); fclose(fp); @@ -179,7 +179,7 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i } fgets(neigh_buffer, 90, fp); - + portcall = ax25_ntoa(neighbour); quality = port_list[index].default_qual; diff --git a/netrom/netromt.c b/netrom/netromt.c index b3f99b3..d74b091 100644 --- a/netrom/netromt.c +++ b/netrom/netromt.c @@ -26,7 +26,7 @@ static int build_header(unsigned char *message) { message[0] = NODES_SIG; - + strcpy(message + 1, nr_config_get_alias(NULL)); strncat(message + 1, " ", MNEMONIC_LEN - strlen(message + 1)); @@ -83,12 +83,12 @@ static void build_mine(int s, struct full_sockaddr_ax25 *dest, int dlen, int loc } fclose(fp); - + if (sendto(s, message, len, 0, (struct sockaddr *)dest, dlen) == -1) { if (logging) syslog(LOG_ERR, "netromt: sendto: %m"); } - + sleep(pause); } @@ -129,7 +129,7 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in obs_count = atoi(strtok(NULL, " ")); neigh_no = atoi(strtok(NULL, " ")); neighbour = NULL; - + if (obs_count < min_obs || quality == 0) continue; /* "Blank" mnemonic */ @@ -139,7 +139,7 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in fseek(fpneigh, 0L, SEEK_SET); fgets(neigh_buffer, 90, fpneigh); - + while (fgets(neigh_buffer, 90, fpneigh) != NULL) { if (atoi(strtok(neigh_buffer, " ")) == neigh_no) { neighbour = strtok(NULL, " "); @@ -172,7 +172,7 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in } len += CALLSIGN_LEN; - message[len] = quality; + message[len] = quality; len += QUALITY_LEN; /* No room for another entry? */ @@ -186,7 +186,7 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in if (logging) syslog(LOG_ERR, "netromt: sendto: %m"); } - + sleep(pause); } diff --git a/netrom/nrattach.c b/netrom/nrattach.c index 49c5553..0f8055e 100644 --- a/netrom/nrattach.c +++ b/netrom/nrattach.c @@ -34,7 +34,7 @@ int readconfig(char *port) FILE *fp; char buffer[90], *s; int n = 0; - + if ((fp = fopen(CONF_NRPORTS_FILE, "r")) == NULL) { fprintf(stderr, "nrattach: cannot open nrports file\n"); return FALSE; @@ -42,7 +42,7 @@ int readconfig(char *port) while (fgets(buffer, 90, fp) != NULL) { n++; - + if ((s = strchr(buffer, '\n')) != NULL) *s = '\0'; @@ -53,10 +53,10 @@ int readconfig(char *port) fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n); return FALSE; } - + if (strcmp(s, port) != 0) continue; - + if ((s = strtok(NULL, " \t\r\n")) == NULL) { fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n); return FALSE; @@ -82,14 +82,14 @@ int readconfig(char *port) } fclose(fp); - + return TRUE; } - + fclose(fp); fprintf(stderr, "nrattach: cannot find port %s in nrports\n", port); - + return FALSE; } @@ -98,7 +98,7 @@ int getfreedev(char *dev) struct ifreq ifr; int fd; int i; - + if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { perror("nrattach: socket"); return FALSE; @@ -107,7 +107,7 @@ int getfreedev(char *dev) for (i = 0; i < 4; i++) { sprintf(dev, "nr%d", i); strcpy(ifr.ifr_name, dev); - + if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) { perror("nrattach: SIOCGIFFLAGS"); return FALSE; @@ -129,17 +129,17 @@ int startiface(char *dev, struct hostent *hp) struct ifreq ifr; char call[7]; int fd; - + if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { perror("nrattach: socket"); return FALSE; } strcpy(ifr.ifr_name, dev); - + if (hp != NULL) { ifr.ifr_addr.sa_family = AF_INET; - + ifr.ifr_addr.sa_data[0] = 0; ifr.ifr_addr.sa_data[1] = 0; ifr.ifr_addr.sa_data[2] = hp->h_addr_list[0][0]; @@ -159,7 +159,7 @@ int startiface(char *dev, struct hostent *hp) ifr.ifr_hwaddr.sa_family = ARPHRD_NETROM; memcpy(ifr.ifr_hwaddr.sa_data, call, 7); - + if (ioctl(fd, SIOCSIFHWADDR, &ifr) != 0) { perror("nrattach: SIOCSIFHWADDR"); return FALSE; @@ -185,12 +185,12 @@ int startiface(char *dev, struct hostent *hp) perror("nrattach: SIOCSIFFLAGS"); return FALSE; } - + close(fd); - + return TRUE; } - + int main(int argc, char *argv[]) { @@ -221,7 +221,7 @@ int main(int argc, char *argv[]) return 1; } } - + if ((argc - optind) != 1) { fprintf(stderr, "usage: nrattach [-i inetaddr] [-m mtu] [-v] port\n"); return 1; @@ -234,11 +234,11 @@ int main(int argc, char *argv[]) fprintf(stderr, "nrattach: cannot find free NET/ROM device\n"); return 1; } - + if (!startiface(dev, hp)) - return 1; + return 1; printf("NET/ROM port %s bound to device %s\n", argv[optind], dev); - + return 0; } diff --git a/netrom/nrparms.c b/netrom/nrparms.c index ff8b60e..b179416 100644 --- a/netrom/nrparms.c +++ b/netrom/nrparms.c @@ -64,12 +64,12 @@ void nodes(int s, char *nodecall, char *op, char *ident, int quality, int count, close(s); exit(1); } - + if (strcmp(ident, "*") != 0) { for (p = ident, q = nr_node.mnemonic; *p != '\0'; p++, q++) *q = toupper(*p); *q = '\0'; - + if (strspn(nr_node.mnemonic, "&#-_/ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") != strlen(nr_node.mnemonic)) { fprintf(stderr, "nrparms: nodes: invalid ident %s\n", ident); close(s); @@ -101,7 +101,7 @@ void nodes(int s, char *nodecall, char *op, char *ident, int quality, int count, } strcpy(nr_node.device, dev); - + nr_node.quality = quality; nr_node.obs_count = count; @@ -192,7 +192,7 @@ void routes(int s, char *port, char *nodecall, char *rest[]) int main(int argc, char *argv[]) { int s; - + if (argc == 1) { fprintf(stderr, "usage: nrparms -nodes|-routes|-version ...\n"); return 1; @@ -202,12 +202,12 @@ int main(int argc, char *argv[]) printf("nrparms: %s\n", VERSION); return 0; } - + if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) { perror("nrparms: socket"); return 1; } - + if (strncmp(argv[1], "-n", 2) == 0) { if (argc < 9) { fprintf(stderr, nodes_usage); @@ -231,8 +231,8 @@ int main(int argc, char *argv[]) } fprintf(stderr, "usage: nrparms -nodes|-routes|-version ...\n"); - + close(s); - + return 1; } diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index 92b3d6a..4383f84 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -145,7 +145,7 @@ static void nrs_esc(unsigned char *s, int len) *ptr++ = c; break; } - + csum += c; } @@ -192,7 +192,7 @@ static void kiss_esc(unsigned char *s, int len) static void nrs_unesc(unsigned char *buffer, int len) { int i; - + for (i = 0; i < len; i++) { switch (nrs_state) { case NRS_WAIT: @@ -204,7 +204,7 @@ static void nrs_unesc(unsigned char *buffer, int len) break; case NRS_DATA: - switch (buffer[i]) { + switch (buffer[i]) { case STX: /* !! */ nrs_rxcount = 0; nrs_cksum = 0; @@ -225,7 +225,7 @@ static void nrs_unesc(unsigned char *buffer, int len) break; case NRS_ESCAPE: - nrs_state = NRS_DATA; + nrs_state = NRS_DATA; if (nrs_rxcount < 512) { nrs_cksum += buffer[i]; nrs_rxbuffer[nrs_rxcount++] = buffer[i]; @@ -246,7 +246,7 @@ static void nrs_unesc(unsigned char *buffer, int len) static void kiss_unesc(unsigned char *buffer, int len) { int i; - + for (i = 0; i < len; i++) { switch (kiss_state) { case KISS_WAIT: @@ -267,7 +267,7 @@ static void kiss_unesc(unsigned char *buffer, int len) break; case KISS_DATA: - switch (buffer[i]) { + switch (buffer[i]) { case FEND: if (kiss_rxcount > 2) nrs_esc(kiss_rxbuffer, kiss_rxcount); @@ -336,7 +336,7 @@ int main(int argc, char *argv[]) } if (debugging) { - fprintf(stderr,"Flow control %s\n", + fprintf(stderr,"Flow control %s\n", flowcontrol ? "enabled" : "disabled"); } @@ -399,7 +399,7 @@ int main(int argc, char *argv[]) openlog("nrsdrv", LOG_PID, LOG_DAEMON); syslog(LOG_INFO, "KISS device %s connected to NRS device %s\n", argv[optind + 0], argv[optind + 1]); } - + signal(SIGHUP, SIG_IGN); signal(SIGTERM, terminate); @@ -421,7 +421,7 @@ int main(int argc, char *argv[]) for (;;) { FD_ZERO(&read_fd); - + FD_SET(kissfd, &read_fd); FD_SET(nrsfd, &read_fd); @@ -437,7 +437,7 @@ int main(int argc, char *argv[]) } kiss_unesc(buffer, n); } - + if (FD_ISSET(nrsfd, &read_fd)) { if ((n = read(nrsfd, buffer, 512)) <= 0) { if (logging) { -- cgit v1.2.3