[DRBD-cvs] svn commit by phil - r2650 - in trunk: drbd user - Fixed a few error strings...

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2007-01-02 14:47:28 +0100 (Tue, 02 Jan 2007)
New Revision: 2650

Modified:
   trunk/drbd/drbd_strings.c
   trunk/user/drbdsetup.c
Log:
Fixed a few error strings...


Modified: trunk/drbd/drbd_strings.c
===================================================================
--- trunk/drbd/drbd_strings.c	2006-12-28 15:54:28 UTC (rev 2649)
+++ trunk/drbd/drbd_strings.c	2007-01-02 13:47:28 UTC (rev 2650)
@@ -75,7 +75,7 @@
 	[-SS_AlreadyStandAlone] = "Can not disconnect a StandAlone device",
 	[-SS_CW_FailedByPeer] = "State changed was refused by peer node",
 	[-SS_CanNotOutdateDL] = "Can not outdate a diskless device",
-	[-SS_DeviceInUse] = "Device is help open by someone"
+	[-SS_DeviceInUse] = "Device is held open by someone"
 };
 
 const char* conns_to_name(drbd_conns_t s) {
@@ -95,7 +95,7 @@
 }
 
 const char* set_st_err_name(set_st_err_t err) {
-	return err < SS_CW_FailedByPeer ? "TOO_SMALL" :
+	return err < SS_DeviceInUse ? "TOO_SMALL" :
 	       err > SS_TwoPrimaries ? "TOO_LARGE"
 		        : drbd_state_sw_errors[-err];
 }

Modified: trunk/user/drbdsetup.c
===================================================================
--- trunk/user/drbdsetup.c	2006-12-28 15:54:28 UTC (rev 2649)
+++ trunk/user/drbdsetup.c	2007-01-02 13:47:28 UTC (rev 2650)
@@ -364,21 +364,21 @@
 	EM(CRAMAlgNotDigest) = "The 'cram-hmac-alg' you specified is not a digest.",
 	EM(KMallocFailed) = "kmalloc() failed. Out of memory?",
 	EM(DiscardNotAllowed) = "--discard-my-data not allowed when primary.",
-	EM(HaveDiskConfig) = "HaveDiskConfig",
-	EM(HaveNetConfig) = "HaveNetConfig",
+	EM(HaveDiskConfig) = "Device is attached to a disk (use detach first)",
+	EM(HaveNetConfig) = "Device has a net-config (use disconnect first)",
 	EM(UnknownMandatoryTag) = "UnknownMandatoryTag",
-	EM(MinorNotKnown) = "MinorNotKnown",
-	EM(StateNotAllowed) = "StateNotAllowed",
-	EM(GotSignal) = "GotSignal",
+	EM(MinorNotKnown) = "Device minor not allocated",
+	EM(StateNotAllowed) = "Resulting device state would be invalid",
+	EM(GotSignal) = "Interrupted by Signal",
 	EM(NoResizeDuringResync) = "Resize not allowed during resync.",
 	EM(APrimaryNodeNeeded) = "Need the a primary node to resize.",
 	EM(SyncAfterInvalid) = "The sync after minor number is invalid",
 	EM(SyncAfterCycle) = "This would cause a sync-after dependency cycle",
-	EM(PauseFlagAlreadySet) = "PauseFlagAlreadySet",
-	EM(PauseFlagAlreadyClear) = "PauseFlagAlreadyClear",
-	EM(DiskLowerThanOutdated) = "DiskLowerThanOutdated",
-	EM(HaveNoDiskConfig) = "HaveNoDiskConfig",
-	EM(ProtocolCRequired) = "ProtocolCRequired"
+	EM(PauseFlagAlreadySet) = "Sync-pause flag is already set",
+	EM(PauseFlagAlreadyClear) = "Sync-pause flag is already cleared",
+	EM(DiskLowerThanOutdated) = "Disk state is lower than outdated",
+	EM(HaveNoDiskConfig) = "Device does not have a disk-config",
+	EM(ProtocolCRequired) = "Protocol C required"
 };
 #define MAX_ERROR (sizeof(error_messages)/sizeof(*error_messages))
 const char * error_to_string(int err_no)