From f76e0b330f0be28f9f3af3073904ede3a34d48f5 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 15:34:56 +0200 Subject: Reformat consistently. Strictly whitespace changes only. Indentation by tabs only. Move case labels in switches are on the same level as the switch keyword. Signed-off-by: Ralf Baechle --- netrom/netromd.c | 78 +++++++++--------- netrom/netromt.c | 16 ++-- netrom/nodesave.c | 22 ++--- netrom/nrattach.c | 36 ++++----- netrom/nrsdrv.c | 238 +++++++++++++++++++++++++++--------------------------- 5 files changed, 195 insertions(+), 195 deletions(-) (limited to 'netrom') diff --git a/netrom/netromd.c b/netrom/netromd.c index bd2b69c..fbad930 100644 --- a/netrom/netromd.c +++ b/netrom/netromd.c @@ -138,46 +138,46 @@ int main(int argc, char **argv) while ((i = getopt(argc, argv, "cdilp:q:t:v")) != -1) { switch (i) { - case 'c': - compliant = TRUE; - break; - case 'd': - debug++; - break; - case 'i': - timelast = 0; - break; - case 'l': - logging = TRUE; - break; - case 'p': - pause = atoi(optarg); - if (pause < 1 || pause > 120) { - fprintf(stderr, "netromd: invalid pause value\n"); - return 1; - } - break; - case 'q': - localval = atoi(optarg); - if (localval < 10 || localval > 255) { - fprintf(stderr, "netromd: invalid local quality\n"); - return 1; - } - break; - case 't': - interval = atoi(optarg) * 60; - if (interval < 60 || interval > 7200) { - fprintf(stderr, "netromd: invalid time interval\n"); - return 1; - } - break; - case 'v': - printf("netromd: %s\n", VERSION); - return 0; - case '?': - case ':': - fprintf(stderr, "usage: netromd [-d] [-i] [-l] [-q quality] [-t interval] [-v]\n"); + case 'c': + compliant = TRUE; + break; + case 'd': + debug++; + break; + case 'i': + timelast = 0; + break; + case 'l': + logging = TRUE; + break; + case 'p': + pause = atoi(optarg); + if (pause < 1 || pause > 120) { + fprintf(stderr, "netromd: invalid pause value\n"); + return 1; + } + break; + case 'q': + localval = atoi(optarg); + if (localval < 10 || localval > 255) { + fprintf(stderr, "netromd: invalid local quality\n"); + return 1; + } + break; + case 't': + interval = atoi(optarg) * 60; + if (interval < 60 || interval > 7200) { + fprintf(stderr, "netromd: invalid time interval\n"); return 1; + } + break; + case 'v': + printf("netromd: %s\n", VERSION); + return 0; + case '?': + case ':': + fprintf(stderr, "usage: netromd [-d] [-i] [-l] [-q quality] [-t interval] [-v]\n"); + return 1; } } diff --git a/netrom/netromt.c b/netrom/netromt.c index d74b091..2a5bc3c 100644 --- a/netrom/netromt.c +++ b/netrom/netromt.c @@ -206,14 +206,14 @@ void transmit_nodes(int localval, int pause) int i; switch (fork()) { - case 0: - break; - case -1: - if (logging) - syslog(LOG_ERR, "netromt: fork: %m\n"); - return; - default: - return; + case 0: + break; + case -1: + if (logging) + syslog(LOG_ERR, "netromt: fork: %m\n"); + return; + default: + return; } dlen = ax25_aton("NODES", &dest); diff --git a/netrom/nodesave.c b/netrom/nodesave.c index 1258c36..ce6c106 100644 --- a/netrom/nodesave.c +++ b/netrom/nodesave.c @@ -40,17 +40,17 @@ int main(int argc, char **argv) while ((s = getopt(argc, argv, "p:v")) != -1) { switch (s) { - case 'p': - sprintf(buf, "%s/nrparms", optarg); - Nrparms = strdup(buf); - break; - case 'v': - printf("nodesave: %s\n", VERSION); - return 0; - case ':': - case '?': - fputs(Usage, stderr); - return 1; + case 'p': + sprintf(buf, "%s/nrparms", optarg); + Nrparms = strdup(buf); + break; + case 'v': + printf("nodesave: %s\n", VERSION); + return 0; + case ':': + case '?': + fputs(Usage, stderr); + return 1; } } diff --git a/netrom/nrattach.c b/netrom/nrattach.c index 87ff5aa..d2209aa 100644 --- a/netrom/nrattach.c +++ b/netrom/nrattach.c @@ -200,25 +200,25 @@ int main(int argc, char *argv[]) while ((fd = getopt(argc, argv, "i:m:v")) != -1) { switch (fd) { - case 'i': - if ((hp = gethostbyname(optarg)) == NULL) { - fprintf(stderr, "nrattach: invalid internet name/address - %s\n", optarg); - return 1; - } - break; - case 'm': - if ((mtu = atoi(optarg)) <= 0) { - fprintf(stderr, "nrattach: invalid mtu size - %s\n", optarg); - return 1; - } - break; - case 'v': - printf("nrattach: %s\n", VERSION); - return 0; - case ':': - case '?': - fprintf(stderr, "usage: nrattach [-i inetaddr] [-m mtu] [-v] port\n"); + case 'i': + if ((hp = gethostbyname(optarg)) == NULL) { + fprintf(stderr, "nrattach: invalid internet name/address - %s\n", optarg); return 1; + } + break; + case 'm': + if ((mtu = atoi(optarg)) <= 0) { + fprintf(stderr, "nrattach: invalid mtu size - %s\n", optarg); + return 1; + } + break; + case 'v': + printf("nrattach: %s\n", VERSION); + return 0; + case ':': + case '?': + fprintf(stderr, "usage: nrattach [-i inetaddr] [-m mtu] [-v] port\n"); + return 1; } } diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c index 52ad0a4..d5979d2 100644 --- a/netrom/nrsdrv.c +++ b/netrom/nrsdrv.c @@ -136,14 +136,14 @@ static void nrs_esc(unsigned char *s, int len) while (len-- > 0) { switch (c = *s++) { - case STX: - case ETX: - case DLE: - *ptr++ = DLE; - /* Fall through */ - default: - *ptr++ = c; - break; + case STX: + case ETX: + case DLE: + *ptr++ = DLE; + /* Fall through */ + default: + *ptr++ = c; + break; } csum += c; @@ -170,17 +170,17 @@ static void kiss_esc(unsigned char *s, int len) while (len-- > 0) { switch (c = *s++) { - case FESC: - *ptr++ = FESC; - *ptr++ = FESCESC; - break; - case FEND: - *ptr++ = FESC; - *ptr++ = FESCEND; - break; - default: - *ptr++ = c; - break; + case FESC: + *ptr++ = FESC; + *ptr++ = FESCESC; + break; + case FEND: + *ptr++ = FESC; + *ptr++ = FESCEND; + break; + default: + *ptr++ = c; + break; } } @@ -195,50 +195,50 @@ static void nrs_unesc(unsigned char *buffer, int len) for (i = 0; i < len; i++) { switch (nrs_state) { - case NRS_WAIT: - if (buffer[i] == STX) { - nrs_state = NRS_DATA; - nrs_rxcount = 0; - nrs_cksum = 0; - } - break; + case NRS_WAIT: + if (buffer[i] == STX) { + nrs_state = NRS_DATA; + nrs_rxcount = 0; + nrs_cksum = 0; + } + break; - case NRS_DATA: - switch (buffer[i]) { - case STX: /* !! */ - nrs_rxcount = 0; - nrs_cksum = 0; - break; - case DLE: - nrs_state = NRS_ESCAPE; - break; - case ETX: - nrs_state = NRS_CKSUM; - break; - default: - if (nrs_rxcount < 512) { - nrs_cksum += buffer[i]; - nrs_rxbuffer[nrs_rxcount++] = buffer[i]; - } - break; - } + case NRS_DATA: + switch (buffer[i]) { + case STX: /* !! */ + nrs_rxcount = 0; + nrs_cksum = 0; break; - - case NRS_ESCAPE: - nrs_state = NRS_DATA; + case DLE: + nrs_state = NRS_ESCAPE; + break; + case ETX: + nrs_state = NRS_CKSUM; + break; + default: if (nrs_rxcount < 512) { nrs_cksum += buffer[i]; nrs_rxbuffer[nrs_rxcount++] = buffer[i]; } break; + } + break; - case NRS_CKSUM: - if (buffer[i] == nrs_cksum) - kiss_esc(nrs_rxbuffer, nrs_rxcount); - nrs_state = NRS_WAIT; - nrs_cksum = 0; - nrs_rxcount = 0; - break; + case NRS_ESCAPE: + nrs_state = NRS_DATA; + if (nrs_rxcount < 512) { + nrs_cksum += buffer[i]; + nrs_rxbuffer[nrs_rxcount++] = buffer[i]; + } + break; + + case NRS_CKSUM: + if (buffer[i] == nrs_cksum) + kiss_esc(nrs_rxbuffer, nrs_rxcount); + nrs_state = NRS_WAIT; + nrs_cksum = 0; + nrs_rxcount = 0; + break; } } } @@ -249,54 +249,54 @@ static void kiss_unesc(unsigned char *buffer, int len) for (i = 0; i < len; i++) { switch (kiss_state) { - case KISS_WAIT: - if (buffer[i] == FEND) { - kiss_state = KISS_CTRL; - kiss_rxcount = 0; - } - break; + case KISS_WAIT: + if (buffer[i] == FEND) { + kiss_state = KISS_CTRL; + kiss_rxcount = 0; + } + break; - case KISS_CTRL: - if ((buffer[i] & 0x0F) == 0x00) { - kiss_state = KISS_DATA; - kiss_rxcount = 0; - } else { - kiss_state = KISS_WAIT; - kiss_rxcount = 0; - } - break; + case KISS_CTRL: + if ((buffer[i] & 0x0F) == 0x00) { + kiss_state = KISS_DATA; + kiss_rxcount = 0; + } else { + kiss_state = KISS_WAIT; + kiss_rxcount = 0; + } + break; - case KISS_DATA: - switch (buffer[i]) { - case FEND: - if (kiss_rxcount > 2) - nrs_esc(kiss_rxbuffer, kiss_rxcount); - kiss_state = KISS_WAIT; - kiss_rxcount = 0; - break; - case FESC: - kiss_state = KISS_ESCAPE; - break; - default: - if (kiss_rxcount < 512) - kiss_rxbuffer[kiss_rxcount++] = buffer[i]; - break; - } + case KISS_DATA: + switch (buffer[i]) { + case FEND: + if (kiss_rxcount > 2) + nrs_esc(kiss_rxbuffer, kiss_rxcount); + kiss_state = KISS_WAIT; + kiss_rxcount = 0; + break; + case FESC: + kiss_state = KISS_ESCAPE; + break; + default: + if (kiss_rxcount < 512) + kiss_rxbuffer[kiss_rxcount++] = buffer[i]; break; + } + break; - case KISS_ESCAPE: - kiss_state = KISS_DATA; - switch (buffer[i]) { - case FESCESC: - if (kiss_rxcount < 512) - kiss_rxbuffer[kiss_rxcount++] = FESC; - break; - case FESCEND: - if (kiss_rxcount < 512) - kiss_rxbuffer[kiss_rxcount++] = FEND; - break; - } + case KISS_ESCAPE: + kiss_state = KISS_DATA; + switch (buffer[i]) { + case FESCESC: + if (kiss_rxcount < 512) + kiss_rxbuffer[kiss_rxcount++] = FESC; + break; + case FESCEND: + if (kiss_rxcount < 512) + kiss_rxbuffer[kiss_rxcount++] = FEND; break; + } + break; } } } @@ -310,28 +310,28 @@ int main(int argc, char *argv[]) while ((c = getopt(argc, argv, "dfls:v")) != -1) { switch (c) { - case 'd': - debugging = TRUE; - break; - case 'f': - flowcontrol = TRUE; - break; - case 'l': - logging = TRUE; - break; - case 's': - if ((speed = atoi(optarg)) <= 0) { - fprintf(stderr, "nrsdrv: invalid speed %s\n", optarg); - return 1; - } - break; - case 'v': - printf("kissattach: %s\n", VERSION); - return 0; - case ':': - case '?': - fprintf(stderr, "usage: nrsdrv [-f] [-l] [-s speed] [-v] kisstty nrstty\n"); + case 'd': + debugging = TRUE; + break; + case 'f': + flowcontrol = TRUE; + break; + case 'l': + logging = TRUE; + break; + case 's': + if ((speed = atoi(optarg)) <= 0) { + fprintf(stderr, "nrsdrv: invalid speed %s\n", optarg); return 1; + } + break; + case 'v': + printf("kissattach: %s\n", VERSION); + return 0; + case ':': + case '?': + fprintf(stderr, "usage: nrsdrv [-f] [-l] [-s speed] [-v] kisstty nrstty\n"); + return 1; } } -- cgit v1.2.3