From afa8313f928dadd74dba812bef6038ba0d144370 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 02:20:24 +0200 Subject: Remove parenthesis around arguments of return statements. Signed-off-by: Ralf Baechle --- ax25ipd/ax25ipd.c | 2 +- ax25ipd/crc.c | 4 ++-- ax25ipd/routing.c | 6 +++--- call/call.c | 40 ++++++++++++++++++++-------------------- call/dostime.c | 2 +- call/yapp.c | 32 ++++++++++++++++---------------- listen/ax25dump.c | 2 +- listen/listen.c | 4 ++-- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/ax25ipd/ax25ipd.c b/ax25ipd/ax25ipd.c index b1786f5..f664e2e 100644 --- a/ax25ipd/ax25ipd.c +++ b/ax25ipd/ax25ipd.c @@ -166,7 +166,7 @@ int main(int argc, char **argv) /* and let the games begin */ io_start(); - return (0); + return 0; } diff --git a/ax25ipd/crc.c b/ax25ipd/crc.c index d132968..c6d8eea 100644 --- a/ax25ipd/crc.c +++ b/ax25ipd/crc.c @@ -77,7 +77,7 @@ u16 pppfcs(u16 fcs, unsigned char *cp, int len) while (len--) fcs = (fcs >> 8) ^ fcstab[(fcs ^ *cp++) & 0xff]; - return (fcs); + return fcs; } /* @@ -108,7 +108,7 @@ int ok_crc(unsigned char *buf, int l) fcs = PPPINITFCS; fcs = pppfcs(fcs, buf, l); - return (fcs == PPPGOODFCS); + return fcs == PPPGOODFCS; } /* diff --git a/ax25ipd/routing.c b/ax25ipd/routing.c index 4c3faed..1aca2b0 100644 --- a/ax25ipd/routing.c +++ b/ax25ipd/routing.c @@ -195,7 +195,7 @@ int is_call_bcast(unsigned char *call) int i; if (call == NULL) - return (FALSE); + return FALSE; for (i = 0; i < 6; i++) bccall[i] = call[i] & 0xfe; @@ -209,11 +209,11 @@ int is_call_bcast(unsigned char *call) if (addrmatch(bccall, bp->callsign)) { LOGL4("found broadcast %s\n", call_to_a(bp->callsign)); - return (TRUE); + return TRUE; } bp = bp->next; } - return (FALSE); + return FALSE; } /* Traverse the routing table, transmitting the packet to each bcast route */ diff --git a/call/call.c b/call/call.c index 28baec6..9ad8e41 100644 --- a/call/call.c +++ b/call/call.c @@ -225,11 +225,11 @@ static int connect_to(char *address[]) if (address[0] == NULL || address[1] == NULL) { fprintf(stderr, "call: too few arguments for Rose\n"); - return (-1); + return -1; } if ((fd = socket(AF_ROSE, SOCK_SEQPACKET, 0)) < 0) { perror("socket"); - return (-1); + return -1; } break; @@ -237,11 +237,11 @@ static int connect_to(char *address[]) if (address[0] == NULL) { fprintf(stderr, "call: too few arguments for NET/ROM\n"); - return (-1); + return -1; } if ((fd = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) { perror("socket"); - return (-1); + return -1; } ax25_aton(nr_config_get_addr(port), &sockaddr.ax25); sockaddr.ax25.fsa_ax25.sax25_family = AF_NETROM; @@ -252,11 +252,11 @@ static int connect_to(char *address[]) if (address[0] == NULL) { fprintf(stderr, "call: too few arguments for AX.25\n"); - return (-1); + return -1; } if ((fd = socket(AF_AX25, SOCK_SEQPACKET, 0)) < 0) { perror("socket"); - return (-1); + return -1; } ax25_aton(ax25_config_get_addr(port), &sockaddr.ax25); if (sockaddr.ax25.fsa_ax25.sax25_ndigis == 0) { @@ -276,7 +276,7 @@ static int connect_to(char *address[]) perror("AX25_WINDOW"); close(fd); fd = -1; - return (-1); + return -1; } if (setsockopt (fd, SOL_AX25, AX25_PACLEN, &paclen, @@ -284,7 +284,7 @@ static int connect_to(char *address[]) perror("AX25_PACLEN"); close(fd); fd = -1; - return (-1); + return -1; } if (backoff != -1) { if (setsockopt @@ -293,7 +293,7 @@ static int connect_to(char *address[]) perror("AX25_BACKOFF"); close(fd); fd = -1; - return (-1); + return -1; } } if (ax25mode != -1) { @@ -303,7 +303,7 @@ static int connect_to(char *address[]) perror("AX25_EXTSEQ"); close(fd); fd = -1; - return (-1); + return -1; } } break; @@ -315,14 +315,14 @@ static int connect_to(char *address[]) perror("SO_DEBUG"); close(fd); fd = -1; - return (-1); + return -1; } if (af_mode != AF_ROSE) { /* Let Rose autobind */ if (bind(fd, (struct sockaddr *) &sockaddr, addrlen) == -1) { perror("bind"); close(fd); fd = -1; - return (-1); + return -1; } } switch (af_mode) { @@ -334,14 +334,14 @@ static int connect_to(char *address[]) sockaddr.rose.srose_call.ax25_call) == -1) { close(fd); fd = -1; - return (-1); + return -1; } if (rose_aton (address[1], sockaddr.rose.srose_addr.rose_addr) == -1) { close(fd); fd = -1; - return (-1); + return -1; } if (address[2] != NULL) { digi = address[2]; @@ -351,7 +351,7 @@ static int connect_to(char *address[]) "call: callsign must follow 'via'\n"); close(fd); fd = -1; - return (-1); + return -1; } digi = address[3]; } @@ -360,7 +360,7 @@ static int connect_to(char *address[]) sockaddr.rose.srose_digi.ax25_call) == -1) { close(fd); fd = -1; - return (-1); + return -1; } sockaddr.rose.srose_ndigis = 1; } @@ -372,7 +372,7 @@ static int connect_to(char *address[]) if (nr_convert_call(address[0], &sockaddr.ax25) == -1) { close(fd); fd = -1; - return (-1); + return -1; } sockaddr.rose.srose_family = AF_NETROM; addrlen = sizeof(struct sockaddr_ax25); @@ -383,7 +383,7 @@ static int connect_to(char *address[]) ((const char **) address, &sockaddr.ax25) == -1) { close(fd); fd = -1; - return (-1); + return -1; } sockaddr.rose.srose_family = AF_AX25; addrlen = sizeof(struct full_sockaddr_ax25); @@ -401,14 +401,14 @@ static int connect_to(char *address[]) perror("connect"); close(fd); fd = -1; - return (-1); + return -1; } if (!be_silent) { printf("*** Connected to %s\n", address[0]); fflush(stdout); } - return (fd); + return fd; } void cmd_intr(int sig) diff --git a/call/dostime.c b/call/dostime.c index ea266a4..0a73af0 100644 --- a/call/dostime.c +++ b/call/dostime.c @@ -78,7 +78,7 @@ int yapp2unix(char *ytime) time = strtoul(ytime + 4, (char **) NULL, 16); ytime[4] = 0; date = strtoul(ytime, (char **) NULL, 16); - return (date_dos2unix(time, date)); + return date_dos2unix(time, date); } diff --git a/call/yapp.c b/call/yapp.c index f96d604..3d7bf45 100644 --- a/call/yapp.c +++ b/call/yapp.c @@ -269,7 +269,7 @@ static int yapp_download_data(int *filefd, unsigned char *buffer) if (buffer[0] == CAN || buffer[0] == NAK) { Write_Status("RcdABORT"); - return (FALSE); + return FALSE; } switch (state) { @@ -283,7 +283,7 @@ static int yapp_download_data(int *filefd, unsigned char *buffer) Send_CN("Unknown code"); Write_Status("SndABORT"); - return (FALSE); + return FALSE; case STATE_RH: if (buffer[0] == SOH) { @@ -315,7 +315,7 @@ static int yapp_download_data(int *filefd, unsigned char *buffer) printf("\n[Unable to open %s]\n", hfield[0]); Send_NR("Invalid filename"); - return (FALSE); + return FALSE; } } @@ -345,12 +345,12 @@ static int yapp_download_data(int *filefd, unsigned char *buffer) if (buffer[0] == EOT && buffer[1] == 0x01) { Send_AT(); Write_Status("RcvEOT"); - return (FALSE); + return FALSE; } Send_CN("Unknown code"); Write_Status("SndABORT"); - return (FALSE); + return FALSE; case STATE_RD: if (buffer[0] == STX) { @@ -372,7 +372,7 @@ static int yapp_download_data(int *filefd, unsigned char *buffer) Send_CN("Bad Checksum"); Write_Status ("SndABORT: Bad Checksum"); - return (FALSE); + return FALSE; } } @@ -391,10 +391,10 @@ static int yapp_download_data(int *filefd, unsigned char *buffer) Send_CN("Unknown code"); Write_Status("SndABORT"); - return (FALSE); + return FALSE; } - return (TRUE); + return TRUE; } static void yapp_download(int filefd) @@ -500,7 +500,7 @@ static int yapp_upload_data(int filefd, char *filename, int filelength, if (buffer[0] == CAN || buffer[0] == NAK) { Write_Status("RcvABORT"); - return (FALSE); + return FALSE; } switch (state) { @@ -534,7 +534,7 @@ static int yapp_upload_data(int filefd, char *filename, int filelength, Send_CN("Unknown code"); Write_Status("SndABORT"); - return (FALSE); + return FALSE; case STATE_SH: /* Could get three replies here: @@ -579,12 +579,12 @@ static int yapp_upload_data(int filefd, char *filename, int filelength, Send_CN("Unknown code"); Write_Status("SndABORT"); - return (FALSE); + return FALSE; case STATE_SD: Send_CN("Unknown code"); Write_Status("SndABORT"); - return (FALSE); + return FALSE; case STATE_SE: if (buffer[0] == ACK && buffer[1] == 0x03) { @@ -596,19 +596,19 @@ static int yapp_upload_data(int filefd, char *filename, int filelength, Send_CN("Unknown code"); Write_Status("SndABORT"); - return (FALSE); + return FALSE; case STATE_ST: if (buffer[0] == ACK && buffer[1] == 0x04) { - return (FALSE); + return FALSE; } Send_CN("Unknown code"); Write_Status("SndABORT"); - return (FALSE); + return FALSE; } - return (TRUE); + return TRUE; } static void yapp_upload(int filefd, char *filename, long filelength) diff --git a/listen/ax25dump.c b/listen/ax25dump.c index 6342dd4..a9a7360 100644 --- a/listen/ax25dump.c +++ b/listen/ax25dump.c @@ -367,7 +367,7 @@ char *pax25(char *buf, unsigned char *data) else *s = '\0'; - return (buf); + return buf; } static int ftype(unsigned char *data, int *type, int *ns, int *nr, int *pf, diff --git a/listen/listen.c b/listen/listen.c index 04be3f1..11f365e 100644 --- a/listen/listen.c +++ b/listen/listen.c @@ -332,7 +332,7 @@ int get16(unsigned char *cp) x <<= 8; x |= *cp++; - return (x); + return x; } int get32(unsigned char *cp) @@ -347,5 +347,5 @@ int get32(unsigned char *cp) x <<= 8; x |= *cp; - return (x); + return x; } -- cgit v1.2.3