summaryrefslogtreecommitdiffstats
path: root/text-utils/more.c
diff options
context:
space:
mode:
authorSami Kerola2012-10-08 09:08:18 +0200
committerKarel Zak2012-10-15 16:53:59 +0200
commit1ee762370d0669fe1c5d4fdf76fd6d148286737a (patch)
treefdd7139e5dbe17af4b26d2cdb191502de4621d26 /text-utils/more.c
parentmore: fix coding style (diff)
downloadkernel-qcow2-util-linux-1ee762370d0669fe1c5d4fdf76fd6d148286737a.tar.gz
kernel-qcow2-util-linux-1ee762370d0669fe1c5d4fdf76fd6d148286737a.tar.xz
kernel-qcow2-util-linux-1ee762370d0669fe1c5d4fdf76fd6d148286737a.zip
more: align void in functions with prototypes, and remove void casts
If there is void in argument list at function prototype it is reasonable to expect to see it also where the function is wrote. This change also removes unnecessary return value void casting. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'text-utils/more.c')
-rw-r--r--text-utils/more.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/text-utils/more.c b/text-utils/more.c
index d05639384..2ecb218f1 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -582,7 +582,7 @@ FILE *checkf(register char *fs, int *clearfirst)
int c;
if (stat(fs, &stbuf) == -1) {
- (void)fflush(stdout);
+ fflush(stdout);
if (clreol)
cleareol();
perror(fs);
@@ -593,7 +593,7 @@ FILE *checkf(register char *fs, int *clearfirst)
return ((FILE *)NULL);
}
if ((f = Fopen(fs, "r")) == NULL) {
- (void)fflush(stdout);
+ fflush(stdout);
perror(fs);
return ((FILE *)NULL);
}
@@ -631,11 +631,11 @@ static int magic(FILE *f, char *fs)
case 0x457f: /* simple ELF detection */
printf(_("\n******** %s: Not a text file ********\n\n"),
fs);
- (void)fclose(f);
+ fclose(f);
return 1;
}
}
- (void)fseek(f, 0L, SEEK_SET); /* rewind() not necessary */
+ fseek(f, 0L, SEEK_SET); /* rewind() not necessary */
return 0;
}
@@ -749,7 +749,7 @@ void chgwinsz(int dummy __attribute__((__unused__)))
if (win.ws_col != 0)
Mcol = win.ws_col;
}
- (void)signal(SIGWINCH, chgwinsz);
+ signal(SIGWINCH, chgwinsz);
}
#endif /* SIGWINCH */
@@ -1056,7 +1056,7 @@ void erasep(register int col)
}
/* Erase the current line entirely */
-void kill_line()
+void kill_line(void)
{
erasep(0);
if (!eraseln || dumb)
@@ -1064,12 +1064,12 @@ void kill_line()
}
/* force clear to end of line */
-void cleareol()
+void cleareol(void)
{
my_putstring(eraseln);
}
-void clreos()
+void clreos(void)
{
my_putstring(EodClr);
}
@@ -1133,7 +1133,7 @@ void prbuf(register char *s, register int n)
}
/* Clear the screen */
-void doclear()
+void doclear(void)
{
if (Clear && !hard) {
my_putstring(Clear);
@@ -1145,7 +1145,7 @@ void doclear()
}
/* Go to home position */
-void home()
+void home(void)
{
my_putstring(Home);
}
@@ -1743,7 +1743,7 @@ void skipf(register int nskip)
}
/*----------------------------- Terminal I/O -------------------------------*/
-void initterm()
+void initterm(void)
{
int ret;
char *padstr;
@@ -1874,7 +1874,7 @@ void initterm()
}
}
-int readch()
+int readch(void)
{
unsigned char c;
@@ -2101,7 +2101,7 @@ void more_error(char *mess)
siglongjmp(restore, 1);
}
-void set_tty()
+void set_tty(void)
{
otty.c_lflag &= ~(ICANON | ECHO);
otty.c_cc[VMIN] = 1; /* read at least 1 char */
@@ -2114,7 +2114,7 @@ static int ourputch(int c)
return putc(c, stdout);
}
-void reset_tty()
+void reset_tty(void)
{
if (no_tty)
return;