X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=error.c;h=7d991fdbc11857f1b78986993552abde501097f1;hb=a0dc461d7b2a345bd0e28e87e7bbf343825f0182;hp=e3947a2f6409c0372521d7e024918361be4a1405;hpb=0223135bfb6771d7749fa39cff64a78c7a84a674;p=libsigrok.git

diff --git a/error.c b/error.c
index e3947a2f..7d991fdb 100644
--- a/error.c
+++ b/error.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -52,41 +52,33 @@
  */
 SR_API const char *sr_strerror(int error_code)
 {
-	const char *str;
-
 	/*
-	 * Note: All defined SR_* error macros from libsigrok.h should have
+	 * Note: All defined SR_* error macros from libsigrok.h must have
 	 * an entry in this function, as well as in sr_strerror_name().
 	 */
 
 	switch (error_code) {
 	case SR_OK:
-		str = "no error";
-		break;
+		return "no error";
 	case SR_ERR:
-		str = "generic/unspecified error";
-		break;
+		return "generic/unspecified error";
 	case SR_ERR_MALLOC:
-		str = "memory allocation error";
-		break;
+		return "memory allocation error";
 	case SR_ERR_ARG:
-		str = "invalid argument";
-		break;
+		return "invalid argument";
 	case SR_ERR_BUG:
-		str = "internal error";
-		break;
+		return "internal error";
 	case SR_ERR_SAMPLERATE:
-		str = "invalid samplerate";
-		break;
+		return "invalid samplerate";
 	case SR_ERR_NA:
-		str = "not applicable";
-		break;
+		return "not applicable";
+	case SR_ERR_DEV_CLOSED:
+		return "device closed but should be open";
+	case SR_ERR_TIMEOUT:
+		return "timeout occurred";
 	default:
-		str = "unknown error";
-		break;
+		return "unknown error";
 	}
-
-	return str;
 }
 
 /**
@@ -109,41 +101,33 @@ SR_API const char *sr_strerror(int error_code)
  */
 SR_API const char *sr_strerror_name(int error_code)
 {
-	const char *str;
-
 	/*
-	 * Note: All defined SR_* error macros from libsigrok.h should have
+	 * Note: All defined SR_* error macros from libsigrok.h must have
 	 * an entry in this function, as well as in sr_strerror().
 	 */
 
 	switch (error_code) {
 	case SR_OK:
-		str = "SR_OK";
-		break;
+		return "SR_OK";
 	case SR_ERR:
-		str = "SR_ERR";
-		break;
+		return "SR_ERR";
 	case SR_ERR_MALLOC:
-		str = "SR_ERR_MALLOC";
-		break;
+		return "SR_ERR_MALLOC";
 	case SR_ERR_ARG:
-		str = "SR_ERR_ARG";
-		break;
+		return "SR_ERR_ARG";
 	case SR_ERR_BUG:
-		str = "SR_ERR_BUG";
-		break;
+		return "SR_ERR_BUG";
 	case SR_ERR_SAMPLERATE:
-		str = "SR_ERR_SAMPLERATE";
-		break;
+		return "SR_ERR_SAMPLERATE";
 	case SR_ERR_NA:
-		str = "SR_ERR_NA";
-		break;
+		return "SR_ERR_NA";
+	case SR_ERR_DEV_CLOSED:
+		return "SR_ERR_DEV_CLOSED";
+	case SR_ERR_TIMEOUT:
+		return "SR_ERR_TIMEOUT";
 	default:
-		str = "unknown error code";
-		break;
+		return "unknown error code";
 	}
-
-	return str;
 }
 
 /** @} */