From 4eb951133d9d301184ebd7b675598e11973b6ab8 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 02:34:19 +0200 Subject: Always have a space between if, for, switch, while and the following `('. Signed-off-by: Ralf Baechle --- ax25/ax25d.c | 4 ++-- ax25/axgetput/axgetput.c | 2 +- ax25/axgetput/proto_bin.c | 2 +- ax25/axspawn.c | 6 +++--- hdlcutil/sethdlc.c | 12 ++++++------ kiss/mkiss.c | 2 +- kiss/net2kiss.c | 8 ++++---- rose/rsmemsiz.c | 2 +- rose/rsparms.c | 2 +- tcpip/ttylinkd.c | 18 +++++++++--------- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ax25/ax25d.c b/ax25/ax25d.c index 472b461..5135e1d 100644 --- a/ax25/ax25d.c +++ b/ax25/ax25d.c @@ -675,7 +675,7 @@ static void WorkoutArgs(int af_type, char *shell, int *argc, char **argv) if (*cp == '%') { cp++; - switch(*cp) { + switch (*cp) { case 'd': /* portname */ for (sp = Port; *sp != '\0' && *sp != '-'; sp++) buffer[cnt++] = *sp; @@ -712,7 +712,7 @@ static void WorkoutArgs(int af_type, char *shell, int *argc, char **argv) case 'p': /* NODENAME IN lower */ if (af_type == AF_NETROM) { - for(sp = Node; *sp != '\0' && *sp != '-'; sp++) + for (sp = Node; *sp != '\0' && *sp != '-'; sp++) buffer[cnt++] = tolower(*sp); } else { buffer[cnt++] = '%'; diff --git a/ax25/axgetput/axgetput.c b/ax25/axgetput/axgetput.c index 595215c..dc077c5 100644 --- a/ax25/axgetput/axgetput.c +++ b/ax25/axgetput/axgetput.c @@ -281,7 +281,7 @@ int main(int argc, char *argv[]) } while ((c = getopt(argc, argv, (mode % 2) ? "ivh?" : "b:isvh?")) != EOF) { - switch(c) { + switch (c) { case 'b': if (((BLOCKSIZ = (unsigned ) atoi(optarg)) < BLOCKSIZ_MIN) || BLOCKSIZ > BLOCKSIZ_MAX) { fprintf(stderr, "error: invalid blocksize: %d\n", BLOCKSIZ); diff --git a/ax25/axgetput/proto_bin.c b/ax25/axgetput/proto_bin.c index b3e3420..78a6ccc 100644 --- a/ax25/axgetput/proto_bin.c +++ b/ax25/axgetput/proto_bin.c @@ -129,7 +129,7 @@ int bput(void) p_buf = buf; for (i = 0; (p = strsep(&p_buf, "#")); i++) { - switch(i) { + switch (i) { case 0: case 1: break; diff --git a/ax25/axspawn.c b/ax25/axspawn.c index f8afd66..34c2598 100644 --- a/ax25/axspawn.c +++ b/ax25/axspawn.c @@ -973,7 +973,7 @@ int get_assoc(struct sockaddr_ax25 *sax25) fgets(buf, sizeof(buf)-1, fp); - while(!feof(fp)) + while (!feof(fp)) { if (fscanf(fp, "%d %s", &uid, buf) == 2) if (sax25->sax25_uid == uid) @@ -1079,7 +1079,7 @@ retry: chdir("/"); - while(p) + while (p) { q = strchr(p, '/'); if (q) @@ -1817,7 +1817,7 @@ again: signal(SIGINT, signal_handler); signal(SIGQUIT, signal_handler); - while(1) + while (1) { FD_ZERO(&fds_read); FD_ZERO(&fds_err); diff --git a/hdlcutil/sethdlc.c b/hdlcutil/sethdlc.c index a9f16b3..657eed6 100644 --- a/hdlcutil/sethdlc.c +++ b/hdlcutil/sethdlc.c @@ -101,11 +101,11 @@ static void display_packet(unsigned char *bp, unsigned int len) cmd = (bp[6] & 0x80); } printf("fm "); - for(i = 7; i < 13; i++) + for (i = 7; i < 13; i++) if ((bp[i] &0xfe) != 0x40) printf("%c",bp[i] >> 1); printf("-%u to ",(bp[13] >> 1) & 0xf); - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) if ((bp[i] &0xfe) != 0x40) printf("%c", bp[i] >> 1); printf("-%u", (bp[6] >> 1) & 0xf); @@ -114,7 +114,7 @@ static void display_packet(unsigned char *bp, unsigned int len) if ((!(bp[-1] & 1)) && (len >= 7)) printf(" via "); while ((!(bp[-1] & 1)) && (len >= 7)) { - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) if ((bp[i] &0xfe) != 0x40) printf("%c",bp[i] >> 1); printf("-%u",(bp[6] >> 1) & 0xf); @@ -124,7 +124,7 @@ static void display_packet(unsigned char *bp, unsigned int len) printf(","); } } - if(!len) + if (!len) return; i = *bp++; len--; @@ -216,7 +216,7 @@ static void print_bits(int (*bitproc)(void)) char str[9]; char *cp; - for(;;) { + for (;;) { ret = bitproc(); if (ret < 0) { if (errno == EAGAIN) @@ -226,7 +226,7 @@ static void print_bits(int (*bitproc)(void)) return; } strcpy(cp = str, "00000000"); - for(i = 0; i < 8; i++, cp++, ret >>= 1) + for (i = 0; i < 8; i++, cp++, ret >>= 1) *cp += (ret & 1); printf("%s", str); } diff --git a/kiss/mkiss.c b/kiss/mkiss.c index fbb1e53..265bfeb 100644 --- a/kiss/mkiss.c +++ b/kiss/mkiss.c @@ -219,7 +219,7 @@ static int kiss_tx(int fd, int port, unsigned char *s, int len, int usecrc) * For each byte in the packet, send the appropriate * character sequence, according to the SLIP protocol. */ - for(i = 0; i < len - 1; i++) + for (i = 0; i < len - 1; i++) ptr += put_ubyte(ptr, &crc, s[i], usecrc); /* diff --git a/kiss/net2kiss.c b/kiss/net2kiss.c index 535d86c..a074648 100644 --- a/kiss/net2kiss.c +++ b/kiss/net2kiss.c @@ -132,11 +132,11 @@ static void display_packet(unsigned char *bp, unsigned int len) cmd = (bp[6] & 0x80); } printf("fm "); - for(i = 7; i < 13; i++) + for (i = 7; i < 13; i++) if ((bp[i] &0xfe) != 0x40) printf("%c",bp[i] >> 1); printf("-%u to ",(bp[13] >> 1) & 0xf); - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) if ((bp[i] &0xfe) != 0x40) printf("%c",bp[i] >> 1); printf("-%u",(bp[6] >> 1) & 0xf); @@ -144,7 +144,7 @@ static void display_packet(unsigned char *bp, unsigned int len) len -= 14; if ((!(bp[-1] & 1)) && (len >= 7)) printf(" via "); while ((!(bp[-1] & 1)) && (len >= 7)) { - for(i = 0; i < 6; i++) + for (i = 0; i < 6; i++) if ((bp[i] &0xfe) != 0x40) printf("%c",bp[i] >> 1); printf("-%u",(bp[6] >> 1) & 0xf); @@ -154,7 +154,7 @@ static void display_packet(unsigned char *bp, unsigned int len) printf(","); } } - if(!len) + if (!len) return; i = *bp++; len--; diff --git a/rose/rsmemsiz.c b/rose/rsmemsiz.c index 14abbfe..fc5e805 100644 --- a/rose/rsmemsiz.c +++ b/rose/rsmemsiz.c @@ -110,7 +110,7 @@ unsigned** meminfo(void) { for (j=0; j < MAX_COL; j++) row[i][j] = 0; for (i=0; i < MAX_ROW && *p; i++) { /* loop over rows */ - while(*p && !isdigit(*p)) p++; /* skip chars until a digit */ + while (*p && !isdigit(*p)) p++; /* skip chars until a digit */ for (j=0; j < MAX_COL && *p; j++) { /* scanf column-by-column */ l = sscanf(p, "%u%n", row[i] + j, &k); p += k; /* step over used buffer */ diff --git a/rose/rsparms.c b/rose/rsparms.c index a0c4786..e9266aa 100644 --- a/rose/rsparms.c +++ b/rose/rsparms.c @@ -89,7 +89,7 @@ void nodes(int s, int argc, char *argv[]) exit(1); } - while(fgets(buff,80,fn)) { + while (fgets(buff,80,fn)) { args=sscanf(buff,"%10s %4s %*s %9s %9s %9s",address, rmask, neigh1, neigh2, neigh3); if (strcmp(address,"address")==0) continue; diff --git a/tcpip/ttylinkd.c b/tcpip/ttylinkd.c index 86287d4..d6e8287 100644 --- a/tcpip/ttylinkd.c +++ b/tcpip/ttylinkd.c @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) memset(user, 0, NAME_SIZE); strcpy(sysop_addr, SYSOP_USER); strcpy(config_file, CONF_TTYLINKD_FILE); - for(i=1 ; i < argc ; i++) + for (i=1 ; i < argc ; i++) { if (argv[i][0] == '-') { @@ -174,7 +174,7 @@ int main(int argc, char *argv[]) return 0; } else { userfamily = sa.sa_family; - switch(sa.sa_family) { + switch (sa.sa_family) { case AF_INET: peer_sin = (struct sockaddr_in*)&sa; write(STDOUT_FILENO, buf, strlen(buf)); @@ -193,7 +193,7 @@ int main(int argc, char *argv[]) case AF_AX25: case AF_NETROM: peer_sax = (struct sockaddr_ax25*)&sa; - for(i=0 ; i < 6 ; i++) + for (i=0 ; i < 6 ; i++) { user[i] = tolower(((peer_sax->sax25_call.ax25_call[i]) >>1)&0x7f); if (user[i] == ' ') @@ -203,7 +203,7 @@ int main(int argc, char *argv[]) break; case AF_ROSE: peer_srose = (struct sockaddr_rose*)&sa; - for(i=0 ; i < 6 ; i++) + for (i=0 ; i < 6 ; i++) { user[i] = tolower(((peer_srose->srose_call.ax25_call[i]) >>1)&0x7f); if (user[i] == ' ') @@ -518,7 +518,7 @@ int send_control(int skt, struct in_addr addr, CTL_MSG msg, CTL_RESPONSE *resp) } /* Get the message */ - if(recv(skt, resp, sizeof(resp),0) ==0) + if (recv(skt, resp, sizeof(resp),0) ==0) syslog(LOG_DAEMON | LOG_ERR, "send_control(): recv failed. (%m)"); return resp->answer; @@ -531,7 +531,7 @@ int send_sysop_data(char *buf, int len) static char *bptr = outbuf; int i; - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { /* Check for erase character */ if (buf[i] == erasec) @@ -551,7 +551,7 @@ int send_sysop_data(char *buf, int len) /* Check for word-erase character */ if (buf[i] == werasec) { - while( (bptr > outbuf) && (*bptr != ' ') ) + while ( (bptr > outbuf) && (*bptr != ' ') ) bptr--; continue; } @@ -595,7 +595,7 @@ int send_user_data(int skt, char *buf, int len) char *bptr = outbuf; int i; - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { if (buf[i] == '\r') { @@ -639,7 +639,7 @@ void do_talk(int skt) int i; - while(1) + while (1) { FD_ZERO(&fdvar); FD_SET(skt, &fdvar); -- cgit v1.2.3