ttymsg: fix compiler warnings and use EXIT_

[kzak@redhat.com: - remove 'register' storage class specifier]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/term-utils/ttymsg.c b/term-utils/ttymsg.c
index a4df59e6ce6bd217d7b6ba91913b8c82ce7f699a..b5c19732712fd0a110745dc31f9ced556731c9ed 100644 (file)
--- a/term-utils/ttymsg.c
+++ b/term-utils/ttymsg.c
@@ -64,12 +64,13 @@
  * ignored (exclusive-use, lack of permission, etc.).
  */
 char *
-ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout) {
+ttymsg(struct iovec *iov, size_t iovcnt, char *line, int tmout) {
        static char device[MAXNAMLEN];
        static char errbuf[MAXNAMLEN+1024];
-       register int cnt, fd, left, wret;
+       size_t cnt, left;
+       ssize_t wret;
        struct iovec localiov[6];
-       int forked = 0, errsv;
+       int fd, forked = 0, errsv;
 
        if (iovcnt > sizeof(localiov) / sizeof(localiov[0]))
                return (_("too many iov's (change code in wall/ttymsg.c)"));
@@ -106,7 +107,7 @@ ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout) {
 
        for (;;) {
                wret = writev(fd, iov, iovcnt);
-               if (wret >= left)
+               if (wret >= (ssize_t) left)
                        break;
                if (wret >= 0) {
                        left -= wret;
@@ -115,13 +116,13 @@ ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout) {
                                    iovcnt * sizeof(struct iovec));
                                iov = localiov;
                        }
-                       for (cnt = 0; wret >= iov->iov_len; ++cnt) {
+                       for (cnt = 0; wret >= (ssize_t) iov->iov_len; ++cnt) {
                                wret -= iov->iov_len;
                                ++iov;
                                --iovcnt;
                        }
                        if (wret) {
-                               iov->iov_base += wret;
+                               iov->iov_base = (char *) iov->iov_base + wret;
                                iov->iov_len -= wret;
                        }
                        continue;
@@ -132,7 +133,7 @@ ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout) {
 
                        if (forked) {
                                (void) close(fd);
-                               _exit(1);
+                               _exit(EXIT_FAILURE);
                        }
                        cpid = fork();
                        if (cpid < 0) {
@@ -169,7 +170,7 @@ ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout) {
                        break;
                (void) close(fd);
                if (forked)
-                       _exit(1);
+                       _exit(EXIT_FAILURE);
                if (strlen(strerror(errno)) > 1000)
                        (void) sprintf(errbuf, _("%s: BAD ERROR, message is "
                                                 "far too long"), device);
@@ -184,6 +185,6 @@ ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout) {
 
        (void) close(fd);
        if (forked)
-               _exit(0);
+               _exit(EXIT_SUCCESS);
        return (NULL);
 }

diff --git a/term-utils/ttymsg.h b/term-utils/ttymsg.h
index 5d27951977c92f50390b0f2895f5a5bca2b2ccb4..2cfa73027b6dcefd435cbf7a9d08e6188e1fb5a4 100644 (file)
--- a/term-utils/ttymsg.h
+++ b/term-utils/ttymsg.h
@@ -1,2 +1,2 @@
-char *ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout);
+char *ttymsg(struct iovec *iov, size_t iovcnt, char *line, int tmout);