[Sheepdog] [PATCH 7/6] Tidy up sheepdog error textual representations

[Chris Webb]

Signed-off-by: Chris Webb <chris at arachsys.com>
---
One more patch which I forgot to include in the series I posted!

 include/sheep.h |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/sheep.h b/include/sheep.h
index 8526975..662d5fc 100644
--- a/include/sheep.h
+++ b/include/sheep.h
@@ -244,30 +244,30 @@ static inline const char *sd_strerror(int err)
 		{SD_RES_INVALID_PARMS, "Invalid parameters"},
 		{SD_RES_SYSTEM_ERROR, "System error"},
 		{SD_RES_VDI_LOCKED, "VDI is already locked"},
-		{SD_RES_NO_VDI, "No vdi found"},
+		{SD_RES_NO_VDI, "No VDI found"},
 		{SD_RES_NO_BASE_VDI, "No base VDI found"},
-		{SD_RES_VDI_READ, "Failed read the requested VDI"},
-		{SD_RES_VDI_WRITE, "Failed to write the requested VDI"},
-		{SD_RES_BASE_VDI_READ, "Failed to read the base VDI"},
-		{SD_RES_BASE_VDI_WRITE, "Failed to write the base VDI"},
-		{SD_RES_NO_TAG, "Failed to find the requested tag"},
-		{SD_RES_STARTUP, "The system is still booting"},
-		{SD_RES_VDI_NOT_LOCKED, "VDI isn't locked"},
-		{SD_RES_SHUTDOWN, "The system is shutting down"},
-		{SD_RES_NO_MEM, "Out of memory on the server"},
-		{SD_RES_FULL_VDI, "We already have the maximum vdis"},
+		{SD_RES_VDI_READ, "Failed to read from requested VDI"},
+		{SD_RES_VDI_WRITE, "Failed to write to requested VDI"},
+		{SD_RES_BASE_VDI_READ, "Failed to read from base VDI"},
+		{SD_RES_BASE_VDI_WRITE, "Failed to write to base VDI"},
+		{SD_RES_NO_TAG, "Failed to find requested tag"},
+		{SD_RES_STARTUP, "System is still booting"},
+		{SD_RES_VDI_NOT_LOCKED, "VDI is not locked"},
+		{SD_RES_SHUTDOWN, "System is shutting down"},
+		{SD_RES_NO_MEM, "Out of memory on server"},
+		{SD_RES_FULL_VDI, "Maximum number of VDIs reached"},
 		{SD_RES_VER_MISMATCH, "Protocol version mismatch"},
 		{SD_RES_NO_SPACE, "Server has no space for new objects"},
-		{SD_RES_WAIT_FOR_FORMAT, "Waiting for a format operation"},
-		{SD_RES_WAIT_FOR_JOIN, "Waiting for other nodes joining"},
-		{SD_RES_JOIN_FAILED, "The node had failed to join sheepdog"},
-		{SD_RES_HALT, "The sheepdog is stopped doing IO, short of living nodes"},
-		{SD_RES_MANUAL_RECOVER, "We should not maunally recover the running/halted cluster"},
+		{SD_RES_WAIT_FOR_FORMAT, "Waiting for cluster to be formatted"},
+		{SD_RES_WAIT_FOR_JOIN, "Waiting for other nodes to join cluster"},
+		{SD_RES_JOIN_FAILED, "Node has failed to join cluster"},
+		{SD_RES_HALT, "IO has halted as there are too few living nodes"},
+		{SD_RES_MANUAL_RECOVER, "Cluster is running/halted and cannot be manually recovered"},
 
 		{SD_RES_OLD_NODE_VER, "Remote node has an old epoch"},
 		{SD_RES_NEW_NODE_VER, "Remote node has a new epoch"},
-		{SD_RES_NOT_FORMATTED, "Not formatted yet"},
-		{SD_RES_INVALID_CTIME, "Creation time is different"},
+		{SD_RES_NOT_FORMATTED, "Cluster has not been formatted"},
+		{SD_RES_INVALID_CTIME, "Creation times differ"},
 		{SD_RES_INVALID_EPOCH, "Invalid epoch"},
 	};
 
-- 
1.7.5.4