summaryrefslogtreecommitdiff
path: root/src/skaembutils/s6-echo.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-03-11 12:16:25 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-03-11 12:16:25 +0000
commit1b5312d5c01fd5e12b938cfe65cda562e822619d (patch)
tree60f086613e97aae5cb2635b8b9e3251c7b3c55cf /src/skaembutils/s6-echo.c
parentac77200b30d6c8bbe9093655dd0f8d8bf6e88feb (diff)
downloads6-portable-utils-1b5312d5c01fd5e12b938cfe65cda562e822619d.tar.xz
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/skaembutils/s6-echo.c')
-rw-r--r--src/skaembutils/s6-echo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/skaembutils/s6-echo.c b/src/skaembutils/s6-echo.c
index 6d30576..5d8f665 100644
--- a/src/skaembutils/s6-echo.c
+++ b/src/skaembutils/s6-echo.c
@@ -15,7 +15,7 @@ int main (int argc, char const *const *argv)
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
- register int opt = subgetopt_r(argc, argv, "ns:", &l) ;
+ int opt = subgetopt_r(argc, argv, "ns:", &l) ;
if (opt == -1) break ;
switch (opt)
{
@@ -28,9 +28,9 @@ int main (int argc, char const *const *argv)
}
for ( ; *argv ; argv++)
if ((buffer_puts(buffer_1small, *argv) < 0)
- || (argv[1] && (buffer_put(buffer_1small, &sep, 1) == -1)))
+ || (argv[1] && (buffer_put(buffer_1small, &sep, 1) < 0)))
goto err ;
- if (donl && (buffer_put(buffer_1small, "\n", 1) == -1)) goto err ;
+ if (donl && (buffer_put(buffer_1small, "\n", 1) < 0)) goto err ;
if (!buffer_flush(buffer_1small)) goto err ;
return 0 ;
err: