Remove duplicate error code.
authorAndre Noll <maan@systemlinux.org>
Mon, 11 Feb 2008 19:31:52 +0000 (20:31 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 11 Feb 2008 19:31:52 +0000 (20:31 +0100)
We had AFS_SHORT_READ and SHORT_AFS_READ.

error.h
vss.c

diff --git a/error.h b/error.h
index da17ff5..55bd3ba 100644 (file)
--- a/error.h
+++ b/error.h
@@ -305,7 +305,6 @@ extern const char **para_errlist[];
        PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \
        PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \
        PARA_ERROR(CHUNK, "unable to get chunk"), \
-       PARA_ERROR(SHORT_AFS_READ, "short read from afs socket"), \
        PARA_ERROR(NOFD, "did not receive open fd from afs"), \
 
 
diff --git a/vss.c b/vss.c
index d74cec3..8ca37d4 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -363,7 +363,7 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
                return -ERRNO_TO_PARA_ERROR(errno);
        afsss = AFS_SOCKET_READY;
        if (iov.iov_len != sizeof(buf))
-               return -E_SHORT_AFS_READ;
+               return -E_AFS_SHORT_READ;
        *code = *(uint32_t*)buf;
        *data =  *(uint32_t*)(buf + 4);
        for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {