From: Andre Noll <maan@systemlinux.org>
Date: Mon, 11 Feb 2008 19:31:52 +0000 (+0100)
Subject: Remove duplicate error code.
X-Git-Tag: v0.3.1~20
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=bef59e08d8c68168b062aff513cf8dfacdaa25d3;ds=sidebyside

Remove duplicate error code.

We had AFS_SHORT_READ and SHORT_AFS_READ.
---

diff --git a/error.h b/error.h
index da17ff57..55bd3ba6 100644
--- 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 d74cec3c..8ca37d43 100644
--- 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)) {