summaryrefslogtreecommitdiff
path: root/archivers/pax/files/ar_subs.c
diff options
context:
space:
mode:
authorrillig <rillig>2007-03-08 17:18:18 +0000
committerrillig <rillig>2007-03-08 17:18:18 +0000
commit48e9e44e2477477396ffb21745527916d6001199 (patch)
tree0ea276d3776872ac7a982d1304b3929322a50bfd /archivers/pax/files/ar_subs.c
parent6accf4de21e5378d171cc5a0fbc4b62071766cee (diff)
downloadpkgsrc-48e9e44e2477477396ffb21745527916d6001199.tar.gz
Removed extra parentheses around simple return statements, to align with
the current NetBSD version.
Diffstat (limited to 'archivers/pax/files/ar_subs.c')
-rw-r--r--archivers/pax/files/ar_subs.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/archivers/pax/files/ar_subs.c b/archivers/pax/files/ar_subs.c
index 8d086311168..504b3049d51 100644
--- a/archivers/pax/files/ar_subs.c
+++ b/archivers/pax/files/ar_subs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_subs.c,v 1.10 2007/03/08 17:11:46 rillig Exp $ */
+/* $NetBSD: ar_subs.c,v 1.11 2007/03/08 17:18:18 rillig Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -48,7 +48,7 @@
#if 0
static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_subs.c,v 1.10 2007/03/08 17:11:46 rillig Exp $");
+__RCSID("$NetBSD: ar_subs.c,v 1.11 2007/03/08 17:18:18 rillig Exp $");
#endif
#endif /* not lint */
@@ -1219,7 +1219,7 @@ next_head(ARCHD *arcn)
* them, so exit gracefully.
*/
if (first && ret == 0)
- return(-1);
+ return -1;
first = 0;
/*
@@ -1229,13 +1229,13 @@ next_head(ARCHD *arcn)
if ((ret == 0) || (rd_sync() < 0)) {
tty_warn(1,
"Premature end of file on archive read");
- return(-1);
+ return -1;
}
if (!in_resync) {
if (act == APPND) {
tty_warn(1,
"Archive I/O error, cannot continue");
- return(-1);
+ return -1;
}
tty_warn(1,
"Archive I/O error. Trying to recover.");
@@ -1273,7 +1273,7 @@ next_head(ARCHD *arcn)
* valid trailer found, drain input as required
*/
ar_drain();
- return(-1);
+ return -1;
}
if (ret == 1) {
@@ -1301,7 +1301,7 @@ next_head(ARCHD *arcn)
if (act == APPND) {
tty_warn(1,
"Unable to append, archive header flaw");
- return(-1);
+ return -1;
}
tty_warn(1,
"Invalid header, starting valid header search.");
@@ -1322,11 +1322,11 @@ next_head(ARCHD *arcn)
* valid trailer found, drain input as required
*/
ar_drain();
- return(-1);
+ return -1;
}
++flcnt;
- return(0);
+ return 0;
}
/*
@@ -1358,7 +1358,7 @@ get_arc(void)
minhd = fsub[ford[i]].hsz;
}
if (rd_start() < 0)
- return(-1);
+ return -1;
res = BLKMULT;
hdsz = 0;
hdend = hdbuf;
@@ -1390,7 +1390,7 @@ get_arc(void)
hdend = hdbuf;
if (!notice) {
if (act == APPND)
- return(-1);
+ return -1;
tty_warn(1,
"Cannot identify format. Searching...");
++notice;
@@ -1417,7 +1417,7 @@ get_arc(void)
* adding all the special case code is far worse.
*/
pback(hdbuf, hdsz);
- return(0);
+ return 0;
}
/*
@@ -1426,7 +1426,7 @@ get_arc(void)
*/
if (!notice) {
if (act == APPND)
- return(-1);
+ return -1;
tty_warn(1, "Cannot identify format. Searching...");
++notice;
}
@@ -1453,5 +1453,5 @@ get_arc(void)
* we cannot find a header, bow, apologize and quit
*/
tty_warn(1, "Sorry, unable to determine archive format.");
- return(-1);
+ return -1;
}