From 528c8b904a1da81934ac8d8d7dcbf97f220a7228 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 23 Jan 2007 13:40:01 +0000 Subject: Fix warnings about // style comment. And remove some of the most pointless comments. --- ax25/axgetput/axgetput.c | 20 +++++++------- ax25/axgetput/axgetput.h | 6 ++--- ax25/axgetput/proto_bin.c | 66 +++++++++++++++++++++++++++-------------------- ax25/axgetput/util.c | 12 +++++---- 4 files changed, 58 insertions(+), 46 deletions(-) (limited to 'ax25/axgetput') diff --git a/ax25/axgetput/axgetput.c b/ax25/axgetput/axgetput.c index 1e0a908..6a425ca 100644 --- a/ax25/axgetput/axgetput.c +++ b/ax25/axgetput/axgetput.c @@ -1,4 +1,4 @@ -static const char rcsid[] = "@(#) $Id: axgetput.c,v 1.1 2006/12/10 19:12:59 dl9sau Exp $"; +static const char rcsid[] = "@(#) $Id: axgetput.c,v 1.2 2007/01/23 13:40:01 ralf Exp $"; /* * This is axgetput @@ -70,13 +70,13 @@ static void set_tty_flags() if (fdin_is_pipe) return; - // mesg no + /* mesg no */ if (!fstat(fdin, &statbuf)) { - // save old mode + /* save old mode */ mode_tty = statbuf.st_mode; fchmod(fdin, 0600); } - // make tty 8bit clean + /* make tty 8bit clean */ if (tcgetattr(fdin, &prev_termios) != -1) prev_termios_stored = 1; memset((char *) &termios, 0, sizeof(termios)); @@ -108,12 +108,12 @@ static void restore_tty_flags() static void eol_convention(int state_should) { - // need patched axspawn + /* need patched axspawn */ #define BIN_ON "//BIN ON\r" #define BIN_OFF "//BIN OFF\r" static int state_is = 0; - // already in correct state? + /* already in correct state? */ if ((state_is && state_should) || (!state_is && !state_should)) return; @@ -205,7 +205,7 @@ static void usage(int all) { /*---------------------------------------------------------------------------*/ -// not implemented +/* not implemented */ static int yput(void) { strcpy(err_msg, "yapp: not implementet yet\n"); return 1; } static int yget(void) { strcpy(err_msg, "yapp: not implementet yet\n"); return 1; } static int rget(void) { strcpy(err_msg, "yapp: not implementet yet\n"); return 1; } @@ -230,9 +230,9 @@ int main(int argc, char *argv[]) revision.author, revision.state); - // determine what to so in the way how we are called + /* determine what to so in the way how we are called */ if ((p = strrchr(argv[0], '/'))) - p++; // skip '/' + p++; /* skip '/' */ else p = argv[0]; len = strlen(p); @@ -282,7 +282,7 @@ int main(int argc, char *argv[]) signal(SIGTERM, signal_handler); signal(SIGINT, signal_handler); -// for difference betreen "bput -f file" and "bget file" +/* for difference betreen "bput -f file" and "bget file" */ #define get_filename(f) { \ if (!strcmp(f, "-")) { \ if (mode % 2) \ diff --git a/ax25/axgetput/axgetput.h b/ax25/axgetput/axgetput.h index 410c77d..59f1c74 100644 --- a/ax25/axgetput/axgetput.h +++ b/ax25/axgetput/axgetput.h @@ -1,4 +1,4 @@ -/* @(#) $Id: axgetput.h,v 1.1 2006/12/10 19:12:59 dl9sau Exp $ */ +/* @(#) $Id: axgetput.h,v 1.2 2007/01/23 13:40:01 ralf Exp $ */ /* * (c) 2002 Thomas Osterried DL9SAU @@ -27,7 +27,7 @@ extern int do_crc_only; extern char c_eol; extern char *send_on_signal; -// modes +/* modes */ #define RECV_BIN 1 /* #BIN# protocol: receive */ #define SEND_BIN 2 /* #BIN# protocol: send */ #define RECV_YAPP 3 /* yapp protocol: receive */ @@ -36,7 +36,7 @@ extern char *send_on_signal; #define SEND_DIDADIT 6 /* didadit protocol: send */ -// block sizes +/* block sizes */ extern unsigned int BLOCKSIZ; diff --git a/ax25/axgetput/proto_bin.c b/ax25/axgetput/proto_bin.c index c826ec3..f436933 100644 --- a/ax25/axgetput/proto_bin.c +++ b/ax25/axgetput/proto_bin.c @@ -1,4 +1,4 @@ -/* @(#) $Id: proto_bin.c,v 1.1 2006/12/10 19:12:59 dl9sau Exp $ */ +/* @(#) $Id: proto_bin.c,v 1.2 2007/01/23 13:40:01 ralf Exp $ */ /* * (c) 2002 Thomas Osterried DL9SAU @@ -102,8 +102,10 @@ int bput(void) return 1; } if (buf[len-1] == '\n') { - //p = "warning: received. not 8bit clean?\r"; - //secure_write(fdout, p, strlen(p)); +#if 0 + p = "warning: received. not 8bit clean?\r"; + secure_write(fdout, p, strlen(p)); +#endif sprintf(err_msg, "bad EOL: \n"); return 1; } @@ -119,7 +121,7 @@ int bput(void) return 1; } } - buf[len-1] = 0; // without trailing \r. and: string termination + buf[len-1] = 0; /* without trailing \r. and: string termination */ send_on_signal = bin_send_no_on_sig; @@ -140,14 +142,14 @@ int bput(void) filename_given[sizeof(filename_given)-1] = 0; if (!fdout_is_pipe) { - // normal mode: store in given filename + /* normal mode: store in given filename */ if (!*filename) { p = get_fixed_filename(filename_given, len_read_expected, msg_crc, 1); strncpy(filename, p, sizeof(filename)-1); filename[sizeof(filename)-1] = 0; } if (!stat(filename, &statbuf)) { - // file exist + /* file exist */ if (unlink(filename)) { sprintf(err_msg, "error: cannot unlink %s (%s)\n", filename, strerror(errno)); goto abort; @@ -165,13 +167,13 @@ int bput(void) len_termline = strlen(term_line); } - // say helo + /* say helo */ send_on_signal = bin_send_abort_on_sig; write(fderr, "\r#OK#\r", 6); len_read_left = len_read_expected; - // #bin# chechsum initialization + /* #bin# chechsum initialization */ init_crc(); for (;;) { @@ -199,16 +201,16 @@ int bput(void) if (buf[len-1] == '\r') { if (last_line_had_CR) { if (IS_BIN_ABORT(buf, len)) { - // "\r#ABORT#\r" was sent + /* "\r#ABORT#\r" was sent */ if (!fdout_is_pipe) { close(fddata); - // clean up + /* clean up */ unlink(filename); } return 1; } if (term_line && len == len_termline && !memcmp(buf, term_line, len_termline)) { - // sucessfully read until termination string + /* sucessfully read until termination string */ break; } } @@ -225,7 +227,7 @@ int bput(void) goto abort; } - // nothing left? + /* nothing left? */ if (!term_line && len_read_left == 0L) break; if (is_eof) { @@ -238,7 +240,7 @@ int bput(void) } if (crc != msg_crc) { sprintf(err_msg, "Invalid crc: computed %d, expected %d.\n", crc, msg_crc); - // don't unlink + /* don't unlink */ save_close(fddata); return 1; } @@ -322,7 +324,7 @@ int bget(void) { else file_time = time(0); - // compute crc + /* compute crc */ while ((len = read(fddata, buf, BLOCKSIZ)) > 0) { int i; for (i = 0; i < len; i++) @@ -334,7 +336,7 @@ int bget(void) { close(fddata); return 1; } - // rewind + /* rewind */ if (lseek(fddata, 0L, SEEK_SET) != 0L) { sprintf(err_msg, "error: file io failed on lseek() (%s)\n", strerror(errno)); close(fddata); @@ -363,9 +365,11 @@ int bget(void) { } else { sprintf(buf, "\r#BIN###$%s#%s\r", unix_to_sfbin_date_string(file_time), get_fixed_filename(filename, 0, 0, 1)); } - // hack: check for #ABORT# from fdout (fd 1), because fddata (fd 0) is - // our pipe we read the data from, which we actually tx. - // believe me, it does work. + /* + * hack: check for #ABORT# from fdout (fd 1), because fddata (fd 0) is + * our pipe we read the data from, which we actually tx. + * believe me, it does work. + */ fdin = fdout; } @@ -382,10 +386,12 @@ int bget(void) { return 1; } - // wait for answer + /* wait for answer */ for (;;) { - // . make sure we do not read from a pipe. fdout is also - // | assigned to the tty + /* + * make sure we do not read from a pipe. fdout is also + * assigned to the tty + */ len = my_read(fdout, buf, sizeof(buf), &is_eof, "\r\n"); if (is_eof || len < 1) { sprintf(err_msg, "error: read failed (%s)\n", strerror(errno)); @@ -393,8 +399,10 @@ int bget(void) { return 1; } if (buf[len-1] == '\n') { - //char *p = "warning: received. not 8bit clean?\r"; - //secure_write(fdout, p, strlen(p)); +#if 0 + char *p = "warning: received. not 8bit clean?\r"; + secure_write(fdout, p, strlen(p)); +#endif sprintf(err_msg, "bad EOL: \n"); goto abort; } else if (buf[len-1] != '\r') { @@ -421,7 +429,7 @@ int bget(void) { for (;;) { char *p_buf; - // check for user \r#ABORT#\r on tty stream + /* check for user \r#ABORT#\r on tty stream */ FD_ZERO(&readfds); FD_SET(fdin, &readfds); if (select(fdin+1, &readfds, 0, 0, &timeout) && FD_ISSET(fdin, &readfds)) { @@ -436,7 +444,7 @@ int bget(void) { return 1; } } - // read data + /* read data */ if (!fdin_is_pipe || is_stream) { p_buf = buf; if ((len = my_read(fddata, buf, ((len_remains > BLOCKSIZ || is_stream) ? BLOCKSIZ : len_remains), &is_eof, 0)) < 1) { @@ -452,7 +460,7 @@ int bget(void) { p_buf = stored_file->data; len = stored_file->len; } - // write to client + /* write to client */ if (secure_write(fdout, p_buf, len) == -1) { sprintf(err_msg, "error: write failed (%s)\n", strerror(errno)); save_close(fddata); @@ -471,8 +479,10 @@ int bget(void) { is_eof = 1; break; } - // need this because my_read may returned lenth != 0 (data to be written) - // but also has detected EOF. + /* + * need this because my_read may returned lenth != 0 (data to be written) + * but also has detected EOF. + */ if (is_eof) break; } diff --git a/ax25/axgetput/util.c b/ax25/axgetput/util.c index 160647f..b1d4cd3 100644 --- a/ax25/axgetput/util.c +++ b/ax25/axgetput/util.c @@ -1,4 +1,4 @@ -/* @(#) $Id: util.c,v 1.1 2006/12/10 19:12:59 dl9sau Exp $ */ +/* @(#) $Id: util.c,v 1.2 2007/01/23 13:40:01 ralf Exp $ */ /* * (c) 2002 Thomas Osterried DL9SAU @@ -60,13 +60,15 @@ int my_read(int fd, char *s, int len_max, int *eof, char *p_break) continue; } *eof = 1; - // len = 0: normal eof. if we're looking for a string, return -1 since - // we have'nt found + /* + * len = 0: normal eof. if we're looking for a string, return -1 since + * we have'nt found + */ return (len == 0 && p_break ? -1 : (len_got ? len_got : len)); } len_got += len; - // read once? or char in p_break found? + /* read once? or char in p_break found? */ if (!p_break || strchr(p_break, *s_curr)) break; } @@ -95,7 +97,7 @@ int secure_write(int fd, char *s, int len_write) { return -1; } if (len != len_write_left_curr) { - // queue busy.. + /* queue busy.. */ sleep(10); } s += len; -- cgit v1.2.3