BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

error.c: Simplify and shorten.

This commit is contained in:
Uwe Hermann 2013-06-22 17:12:38 +02:00
parent 45bb47a7f7
commit f05e7b7a9b
1 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
error.c
View File

@ -52,8 +52,6 @@
*/ */
SR_API const char *sr_strerror(int error_code) SR_API const char *sr_strerror(int error_code)
{ {
const char *str;
/* /*
* Note: All defined SR_* error macros from libsigrok.h must have * Note: All defined SR_* error macros from libsigrok.h must have
* an entry in this function, as well as in sr_strerror_name(). * an entry in this function, as well as in sr_strerror_name().
@ -61,38 +59,26 @@ SR_API const char *sr_strerror(int error_code)
switch (error_code) { switch (error_code) {
case SR_OK: case SR_OK:
str = "no error"; return "no error";
break;
case SR_ERR: case SR_ERR:
str = "generic/unspecified error"; return "generic/unspecified error";
break;
case SR_ERR_MALLOC: case SR_ERR_MALLOC:
str = "memory allocation error"; return "memory allocation error";
break;
case SR_ERR_ARG: case SR_ERR_ARG:
str = "invalid argument"; return "invalid argument";
break;
case SR_ERR_BUG: case SR_ERR_BUG:
str = "internal error"; return "internal error";
break;
case SR_ERR_SAMPLERATE: case SR_ERR_SAMPLERATE:
str = "invalid samplerate"; return "invalid samplerate";
break;
case SR_ERR_NA: case SR_ERR_NA:
str = "not applicable"; return "not applicable";
break;
case SR_ERR_DEV_CLOSED: case SR_ERR_DEV_CLOSED:
str = "device closed but should be open"; return "device closed but should be open";
break;
case SR_ERR_TIMEOUT: case SR_ERR_TIMEOUT:
str = "timeout occurred"; return "timeout occurred";
break;
default: default:
str = "unknown error"; return "unknown error";
break;
} }
return str;
} }
/** /**
@ -115,8 +101,6 @@ SR_API const char *sr_strerror(int error_code)
*/ */
SR_API const char *sr_strerror_name(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 must have * Note: All defined SR_* error macros from libsigrok.h must have
* an entry in this function, as well as in sr_strerror(). * an entry in this function, as well as in sr_strerror().
@ -124,38 +108,26 @@ SR_API const char *sr_strerror_name(int error_code)
switch (error_code) { switch (error_code) {
case SR_OK: case SR_OK:
str = "SR_OK"; return "SR_OK";
break;
case SR_ERR: case SR_ERR:
str = "SR_ERR"; return "SR_ERR";
break;
case SR_ERR_MALLOC: case SR_ERR_MALLOC:
str = "SR_ERR_MALLOC"; return "SR_ERR_MALLOC";
break;
case SR_ERR_ARG: case SR_ERR_ARG:
str = "SR_ERR_ARG"; return "SR_ERR_ARG";
break;
case SR_ERR_BUG: case SR_ERR_BUG:
str = "SR_ERR_BUG"; return "SR_ERR_BUG";
break;
case SR_ERR_SAMPLERATE: case SR_ERR_SAMPLERATE:
str = "SR_ERR_SAMPLERATE"; return "SR_ERR_SAMPLERATE";
break;
case SR_ERR_NA: case SR_ERR_NA:
str = "SR_ERR_NA"; return "SR_ERR_NA";
break;
case SR_ERR_DEV_CLOSED: case SR_ERR_DEV_CLOSED:
str = "SR_ERR_DEV_CLOSED"; return "SR_ERR_DEV_CLOSED";
break;
case SR_ERR_TIMEOUT: case SR_ERR_TIMEOUT:
str = "SR_ERR_TIMEOUT"; return "SR_ERR_TIMEOUT";
break;
default: default:
str = "unknown error code"; return "unknown error code";
break;
} }
return str;
} }
/** @} */ /** @} */